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

1 files changed, 4 insertions, 4 deletions

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index b483fbcff414..d00ff3529f90 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3642,7 +3642,7 @@ void WW8RStyle::ImportSprms(sal_uInt8 *pSprms, short nLen, bool bPap)
     nSprmsLen = 0;
 }
 
-void WW8RStyle::ImportSprms(sal_Size nPosFc, short nLen, bool bPap)
+void WW8RStyle::ImportSprms(std::size_t nPosFc, short nLen, bool bPap)
 {
     if (!nLen)
         return;
@@ -3706,7 +3706,7 @@ short WW8RStyle::ImportUPX(short nLen, bool bPAP, bool bOdd)
 
             if( 0 < cbUPX )
             {
-                sal_Size nPos = pStStrm->Tell(); // if something is interpreted wrong,
+                sal_uInt64 const nPos = pStStrm->Tell(); // if something is interpreted wrong,
                                                  // this should make it work again
                 ImportSprms( nPos, cbUPX, bPAP );
 
@@ -4146,7 +4146,7 @@ std::vector<sal_uInt8> ChpxToSprms(const Word2CHPX &rChpx)
     return aRet;
 }
 
-Word2CHPX ReadWord2Chpx(SvStream &rSt, sal_Size nOffset, sal_uInt8 nSize)
+Word2CHPX ReadWord2Chpx(SvStream &rSt, std::size_t nOffset, sal_uInt8 nSize)
 {
     Word2CHPX aChpx;
 
@@ -4266,7 +4266,7 @@ Word2CHPX ReadWord2Chpx(SvStream &rSt, sal_Size nOffset, sal_uInt8 nSize)
 
 namespace
 {
-    struct pxoffset { sal_Size mnOffset; sal_uInt8 mnSize; };
+    struct pxoffset { std::size_t mnOffset; sal_uInt8 mnSize; };
 }
 
 void WW8RStyle::ImportOldFormatStyles()