summaryrefslogtreecommitdiff
path: root/vcl/source/gdi/jobset.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 18:25:54 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 18:25:54 +0000
commit2638d1a0544c06473d9619cca87a77a2337772fb (patch)
tree5d4d7a627913b57eae3abdab50ef5265206f4500 /vcl/source/gdi/jobset.cxx
parent51cee346ffdc283549af9a5aa6161d69de4c9d4e (diff)
INTEGRATION: CWS warnings01 (1.9.70); FILE MERGED
2006/05/23 19:48:19 sb 1.9.70.4: RESYNC: (1.9-1.10); FILE MERGED 2006/03/17 16:12:48 pl 1.9.70.3: #i55991# removed warnings for windows platform 2005/11/04 17:25:00 pl 1.9.70.2: #i55991# removed warnings for linux/solaris 2005/10/21 17:31:16 pl 1.9.70.1: #i55991# removed warnings for linux platform
Diffstat (limited to 'vcl/source/gdi/jobset.cxx')
-rw-r--r--vcl/source/gdi/jobset.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index d6a49d5d03cc..b0df63edbd53 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: jobset.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: hr $ $Date: 2006-04-19 13:55:15 $
+ * last change: $Author: hr $ $Date: 2006-06-19 19:25:54 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -52,7 +52,7 @@
// =======================================================================
-DBG_NAME( JobSetup );
+DBG_NAME( JobSetup )
#define JOBSET_FILEFORMAT2 3780
#define JOBSET_FILE364_SYSTEM ((USHORT)0xFFFF)
@@ -313,7 +313,7 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup )
{
USHORT nLen;
USHORT nSystem;
- int nFirstPos = rIStream.Tell();
+ sal_Size nFirstPos = rIStream.Tell();
rIStream >> nLen;
if ( !nLen )
return rIStream;
@@ -433,7 +433,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
rOStream.WriteByteString( it->first, RTL_TEXTENCODING_UTF8 );
rOStream.WriteByteString( it->second, RTL_TEXTENCODING_UTF8 );
}
- nLen = rOStream.Tell() - nPos;
+ nLen = sal::static_int_cast<USHORT>(rOStream.Tell() - nPos);
rOStream.Seek( nPos );
rOStream << nLen;
rOStream.Seek( nPos + nLen );