mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS warnings01 (1.32.10); FILE MERGED

Browse Source 
2006/05/23 15:28:41 sb 1.32.10.3: RESYNC: (1.33-1.34); FILE MERGED
2006/01/25 17:09:54 sb 1.32.10.2: RESYNC: (1.32-1.33); FILE MERGED
2005/10/28 10:53:44 pl 1.32.10.1: #i55991# removed warnings for solaris platform
This commit is contained in:
Jens-Heiner Rechtien
2006-06-19 09:56:44 +00:00
parent 34d1242aa1
commit 9431b714eb
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
psprint/source/printergfx/printerjob.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: printerjob.cxx,v $ * $RCSfile: printerjob.cxx,v $
* *
* $Revision: 1.36 $ * $Revision: 1.37 $
* *
* last change: $Author: hr $ $Date: 2006-06-09 12:16:58 $ * last change: $Author: hr $ $Date: 2006-06-19 10:56:44 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -94,7 +94,7 @@ namespace psp
sal_Bool sal_Bool
AppendPS (FILE* pDst, osl::File* pSrc, sal_uChar* pBuffer, AppendPS (FILE* pDst, osl::File* pSrc, sal_uChar* pBuffer,
sal_uInt64 nBlockSize = nBLOCKSIZE) sal_uInt32 nBlockSize = nBLOCKSIZE)
{ {
if ((pDst == NULL) || (pSrc == NULL)) if ((pDst == NULL) || (pSrc == NULL))
return sal_False; return sal_False;
@@ -112,7 +112,7 @@ AppendPS (FILE* pDst, osl::File* pSrc, sal_uChar* pBuffer,
{ {
pSrc->read (pBuffer, nBlockSize, nIn); pSrc->read (pBuffer, nBlockSize, nIn);
if (nIn > 0) if (nIn > 0)
nOut = fwrite (pBuffer, 1, nIn, pDst); nOut = fwrite (pBuffer, 1, sal::static_int_cast<sal_uInt32>(nIn), pDst);
} }
while ((nIn > 0) && (nIn == nOut)); while ((nIn > 0) && (nIn == nOut));
@@ -377,7 +377,7 @@ namespace psp
// get locale invariant, 7bit clean current local time string // get locale invariant, 7bit clean current local time string
sal_Char* sal_Char*
getLocalTime(sal_Char* pBuffer, sal_uInt32 nBufSize) getLocalTime(sal_Char* pBuffer)
{ {
time_t nTime = time (NULL); time_t nTime = time (NULL);
struct tm aTime; struct tm aTime;
@@ -439,7 +439,7 @@ PrinterJob::StartJob (
// Creation Date (locale independent local time) // Creation Date (locale independent local time)
sal_Char pCreationDate [256]; sal_Char pCreationDate [256];
WritePS (mpJobHeader, "%%CreationDate: "); WritePS (mpJobHeader, "%%CreationDate: ");
WritePS (mpJobHeader, getLocalTime(pCreationDate, sizeof(pCreationDate))); WritePS (mpJobHeader, getLocalTime(pCreationDate));
// Document Title // Document Title
aFilterWS = WhitespaceToSpace( rJobName, FALSE ); aFilterWS = WhitespaceToSpace( rJobName, FALSE );
@@ -637,7 +637,7 @@ PrinterJob::InitPaperSize (const JobData& rJobSetup)
sal_Bool sal_Bool
PrinterJob::StartPage (const JobData& rJobSetup, sal_Bool bNewJobData) PrinterJob::StartPage (const JobData& rJobSetup)
{ {
InitPaperSize (rJobSetup); InitPaperSize (rJobSetup);