commit 5b04eed4d22c9e3caa76e195582b15862e9261b6
author Michael Weghorn <m.weghorn@posteo.de> Fri Jul 22 13:45:53 2022 +0100
committer Michael Weghorn <m.weghorn@posteo.de> Fri Jul 22 16:50:02 2022 +0200
tree d29e5cc329d34ea3140a03c474cb8cb579e38519
parent 4be04385c5e9838687ecade94dae9e59fcc30621

tdf#147021 Use std::size in {Read,Write}JobSetup

Change-Id: I6db569b8c5fb94dcd0e7ad629738ded8ba53e80c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137359
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>

vcl/source/gdi/jobset.cxx

diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 04ba708..04bc9da 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -259,9 +259,9 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup )

            ImplJobSetup& rJobData = rJobSetup.ImplGetData();

            pData->cPrinterName[SAL_N_ELEMENTS(pData->cPrinterName) - 1] = 0;
            pData->cPrinterName[std::size(pData->cPrinterName) - 1] = 0;
            rJobData.SetPrinterName( OStringToOUString(pData->cPrinterName, aStreamEncoding) );
            pData->cDriverName[SAL_N_ELEMENTS(pData->cDriverName) - 1] = 0;
            pData->cDriverName[std::size(pData->cDriverName) - 1] = 0;
            rJobData.SetDriver( OStringToOUString(pData->cDriverName, aStreamEncoding) );

            // Are these our new JobSetup files?
@@ -363,9 +363,9 @@ SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup )

            ImplOldJobSetupData aOldData = {};
            OString aPrnByteName(OUStringToOString(rJobData.GetPrinterName(), RTL_TEXTENCODING_UTF8));
            strncpy(aOldData.cPrinterName, aPrnByteName.getStr(), SAL_N_ELEMENTS(aOldData.cPrinterName) - 1);
            strncpy(aOldData.cPrinterName, aPrnByteName.getStr(), std::size(aOldData.cPrinterName) - 1);
            OString aDriverByteName(OUStringToOString(rJobData.GetDriver(), RTL_TEXTENCODING_UTF8));
            strncpy(aOldData.cDriverName, aDriverByteName.getStr(), SAL_N_ELEMENTS(aOldData.cDriverName) - 1);
            strncpy(aOldData.cDriverName, aDriverByteName.getStr(), std::size(aOldData.cDriverName) - 1);
            int nPos = rOStream.Tell();
            rOStream.WriteUInt16( 0 );
            rOStream.WriteUInt16( JOBSET_FILE605_SYSTEM );