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 /include/filter | |
| 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 'include/filter')
| -rw-r--r-- | include/filter/msfilter/dffrecordheader.hxx | 4 | ||||
| -rw-r--r-- | include/filter/msfilter/mscodec.hxx | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/filter/msfilter/dffrecordheader.hxx b/include/filter/msfilter/dffrecordheader.hxx index ade236c4ab8e..3ad5c4837055 100644 --- a/include/filter/msfilter/dffrecordheader.hxx +++ b/include/filter/msfilter/dffrecordheader.hxx @@ -44,12 +44,12 @@ public: { return nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen; } bool SeekToEndOfRecord(SvStream& rIn) const { - sal_Size nPos = nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen; + sal_uInt64 const nPos = nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen; return nPos == rIn.Seek(nPos); } bool SeekToContent(SvStream& rIn) const { - sal_Size nPos = nFilePos + DFF_COMMON_RECORD_HEADER_SIZE; + sal_uInt64 const nPos = nFilePos + DFF_COMMON_RECORD_HEADER_SIZE; return nPos == rIn.Seek(nPos); } bool SeekToBegOfRecord(SvStream& rIn) const diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx index 4e0e67aea79b..1b91df68b33d 100644 --- a/include/filter/msfilter/mscodec.hxx +++ b/include/filter/msfilter/mscodec.hxx @@ -103,7 +103,7 @@ public: @param nBytes Size of the passed data block. */ - virtual void Decode( sal_uInt8* pnData, sal_Size nBytes )=0; + virtual void Decode( sal_uInt8* pnData, std::size_t nBytes )=0; /** Lets the cipher skip a specific amount of bytes. @@ -117,11 +117,11 @@ public: @param nBytes Number of bytes to be skipped (cipher "seeks" forward). */ - void Skip( sal_Size nBytes ); + void Skip( std::size_t nBytes ); protected: sal_uInt8 mpnKey[ 16 ]; /// Encryption key. - sal_Size mnOffset; /// Key offset. + std::size_t mnOffset; /// Key offset. private: MSCodec_Xor95( const MSCodec_Xor95& ) = delete; @@ -150,7 +150,7 @@ public: @param nBytes Size of the passed data block. */ - virtual void Decode( sal_uInt8* pnData, sal_Size nBytes ) override; + virtual void Decode( sal_uInt8* pnData, std::size_t nBytes ) override; }; /** Encodes and decodes data from protected MSO Word 95- documents. @@ -171,7 +171,7 @@ public: @param nBytes Size of the passed data block. */ - virtual void Decode( sal_uInt8* pnData, sal_Size nBytes ) override; + virtual void Decode( sal_uInt8* pnData, std::size_t nBytes ) override; }; @@ -278,8 +278,8 @@ public: true = Encoding was successful (no error occurred). */ bool Encode( - const void* pData, sal_Size nDatLen, - sal_uInt8* pBuffer, sal_Size nBufLen ); + const void* pData, std::size_t nDatLen, + sal_uInt8* pBuffer, std::size_t nBufLen ); /** Decodes a block of memory. @@ -304,8 +304,8 @@ public: true = Decoding was successful (no error occurred). */ bool Decode( - const void* pData, sal_Size nDatLen, - sal_uInt8* pBuffer, sal_Size nBufLen ); + const void* pData, std::size_t nDatLen, + sal_uInt8* pBuffer, std::size_t nBufLen ); /** Lets the cipher skip a specific amount of bytes. @@ -319,7 +319,7 @@ public: @param nDatLen Number of bytes to be skipped (cipher "seeks" forward). */ - bool Skip( sal_Size nDatLen ); + bool Skip( std::size_t nDatLen ); /** Gets salt data and salt digest. |