diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-09-14 17:01:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-09-15 12:01:11 +0200 |
| commit | b647996a9babbee7b33cf45192e57df6a124628b (patch) | |
| tree | ddc6dfe8a62ec53fbacc4eeccfeb20019f3ef4f0 /cppcanvas | |
| parent | a19a67e20e847a42063559694ec5beec71abcfb3 (diff) | |
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
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/source/mtfrenderer/emfplus.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 3fda67848ee6..e16fe7c2217d 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -584,7 +584,7 @@ namespace cppcanvas s.ReadInt32( pathLength ); SAL_INFO("cppcanvas.emf", "EMF+\tpath length: " << pathLength); - sal_Size pos = s.Tell (); + sal_uInt64 const pos = s.Tell (); sal_uInt32 pathHeader; sal_Int32 pathPoints, pathFlags; @@ -1068,7 +1068,7 @@ namespace cppcanvas { s.ReadInt32( customStartCapLen ); SAL_INFO("cppcanvas.emf", "EMF+\t\tcustomStartCapLen: " << customStartCapLen); - sal_Size pos = s.Tell(); + sal_uInt64 const pos = s.Tell(); customStartCap = new EMFPCustomLineCap(); customStartCap->Read(s, rR); @@ -1083,7 +1083,7 @@ namespace cppcanvas { s.ReadInt32( customEndCapLen ); SAL_INFO("cppcanvas.emf", "EMF+\t\tcustomEndCapLen: " << customEndCapLen); - sal_Size pos = s.Tell(); + sal_uInt64 const pos = s.Tell(); customEndCap = new EMFPCustomLineCap(); customEndCap->Read(s, rR); @@ -1822,7 +1822,7 @@ namespace cppcanvas while (length >= 12) { sal_uInt16 type, flags; sal_uInt32 size, dataSize; - sal_Size next; + sal_uInt64 next; rMF.ReadUInt16( type ).ReadUInt16( flags ).ReadUInt32( size ).ReadUInt32( dataSize ); |