From b647996a9babbee7b33cf45192e57df6a124628b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 14 Sep 2016 17:01:50 +0200 Subject: replace sal_Size with std::size_t (or sal_uInt64 for SvStream pos) ... except in include/rtl, include/sal, include/uno, where sal_Size is retained for compatibility, and where callers of rtl functions pass in pointers that are incompatible on MSVC. Change-Id: I8344453780689f5120ba0870e44965b6d292450c --- rsc/source/rsc/rsc.cxx | 4 ++-- rsc/source/tools/rscchar.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'rsc') diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index a26084b16e3a..049d1b70f510 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -867,7 +867,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, if (aLine.indexOf(';') == -1) { - const sal_Size nImgListStartPos = aIStm.Tell(); + const sal_uInt64 nImgListStartPos = aIStm.Tell(); do { @@ -913,7 +913,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, } } - const sal_Size nImgListEndPos = aIStm.Tell(); + const sal_uInt64 nImgListEndPos = aIStm.Tell(); aIStm.Seek( nImgListStartPos ); while( aIStm.Tell() < nImgListEndPos ) { diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx index dbe096e24a4c..a41310af27ac 100644 --- a/rsc/source/tools/rscchar.cxx +++ b/rsc/source/tools/rscchar.cxx @@ -30,7 +30,7 @@ char * RscChar::MakeUTF8( char * pStr, sal_uInt16 nTextEncoding ) { - sal_Size nMaxUniCodeBuf = strlen( pStr ) + 1; + std::size_t nMaxUniCodeBuf = strlen( pStr ) + 1; if( nMaxUniCodeBuf * 6 > 0x0FFFFF ) RscExit( 10 ); -- cgit