summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/filter/msfilter/dffrecordheader.hxx4
-rw-r--r--include/filter/msfilter/mscodec.hxx20
-rw-r--r--include/oox/dump/dumperbase.hxx4
-rw-r--r--include/oox/ole/vbaexport.hxx4
-rw-r--r--include/sot/storage.hxx4
-rw-r--r--include/svl/instrm.hxx4
-rw-r--r--include/svl/outstrm.hxx4
-rw-r--r--include/tools/pstm.hxx4
-rw-r--r--include/tools/stream.hxx82
9 files changed, 65 insertions, 65 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.
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index c8927d6cb3d7..f1358c6e9cf1 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -961,7 +961,7 @@ public:
void writeChar( sal_Unicode cChar, sal_Int32 nCount = 1 );
void writeAscii( const sal_Char* pcStr );
void writeString( const OUString& rStr );
- void writeArray( const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
+ void writeArray( const sal_uInt8* pnData, std::size_t nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
void writeBool( bool bData );
void writeDateTime( const css::util::DateTime& rDateTime );
@@ -1217,7 +1217,7 @@ protected:
void writeInfoItem( const String& rName, const String& rData );
void writeCharItem( const String& rName, sal_Unicode cData );
void writeStringItem( const String& rName, const OUString& rData );
- void writeArrayItem( const String& rName, const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
+ void writeArrayItem( const String& rName, const sal_uInt8* pnData, std::size_t nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
void writeDateTimeItem( const String& rName, const css::util::DateTime& rDateTime );
void writeGuidItem( const String& rName, const OUString& rGuid );
diff --git a/include/oox/ole/vbaexport.hxx b/include/oox/ole/vbaexport.hxx
index 071b23bccf27..fed4b797c7a7 100644
--- a/include/oox/ole/vbaexport.hxx
+++ b/include/oox/ole/vbaexport.hxx
@@ -53,7 +53,7 @@ class VBACompressionChunk
{
public:
- VBACompressionChunk(SvStream& rCompressedStream, const sal_uInt8* pData, sal_Size nChunkSize);
+ VBACompressionChunk(SvStream& rCompressedStream, const sal_uInt8* pData, std::size_t nChunkSize);
void write();
@@ -63,7 +63,7 @@ private:
sal_uInt8* mpCompressedChunkStream;
// same as DecompressedChunkEnd in the spec
- sal_Size mnChunkSize;
+ std::size_t mnChunkSize;
// CompressedCurrent according to the spec
sal_uInt64 mnCompressedCurrent;
diff --git a/include/sot/storage.hxx b/include/sot/storage.hxx
index 92134c20f821..fc0d4240fc1b 100644
--- a/include/sot/storage.hxx
+++ b/include/sot/storage.hxx
@@ -38,8 +38,8 @@ class SOT_DLLPUBLIC SotStorageStream : virtual public SotObject, public SvStream
friend class SotStorage;
BaseStorageStream * pOwnStm; // pointer to the own stream
protected:
- virtual sal_uLong GetData( void* pData, sal_uLong nSize ) override;
- virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) override;
+ virtual std::size_t GetData(void* pData, std::size_t nSize) override;
+ virtual std::size_t PutData(const void* pData, std::size_t nSize) override;
virtual sal_uInt64 SeekPos(sal_uInt64 nPos) override;
virtual void FlushData() override;
virtual ~SotStorageStream() override;
diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx
index 65d24f37d169..c8c914546e45 100644
--- a/include/svl/instrm.hxx
+++ b/include/svl/instrm.hxx
@@ -41,9 +41,9 @@ class SVL_DLLPUBLIC SvInputStream: public SvStream
SVL_DLLPRIVATE bool open();
- SVL_DLLPRIVATE virtual sal_uLong GetData(void * pData, sal_uLong nSize) override;
+ SVL_DLLPRIVATE virtual std::size_t GetData(void * pData, std::size_t nSize) override;
- SVL_DLLPRIVATE virtual sal_uLong PutData(void const *, sal_uLong) override;
+ SVL_DLLPRIVATE virtual std::size_t PutData(void const *, std::size_t) override;
SVL_DLLPRIVATE virtual sal_uInt64 SeekPos(sal_uInt64 nPos) override;
diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx
index d512d46ba51d..d212bfba3ccd 100644
--- a/include/svl/outstrm.hxx
+++ b/include/svl/outstrm.hxx
@@ -33,9 +33,9 @@ class SVL_DLLPUBLIC SvOutputStream: public SvStream
{
css::uno::Reference< css::io::XOutputStream > m_xStream;
- SVL_DLLPRIVATE virtual sal_uLong GetData(void *, sal_uLong) override;
+ SVL_DLLPRIVATE virtual std::size_t GetData(void *, std::size_t) override;
- SVL_DLLPRIVATE virtual sal_uLong PutData(void const * pData, sal_uLong nSize) override;
+ SVL_DLLPRIVATE virtual std::size_t PutData(void const * pData, std::size_t nSize) override;
SVL_DLLPRIVATE virtual sal_uInt64 SeekPos(sal_uInt64) override;
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index b0cbd3b9f445..ec82cf59aa1f 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -139,8 +139,8 @@ private:
Index nStartIdx;
const SvPersistStream * pRefStm;
- virtual sal_uIntPtr GetData( void* pData, sal_uIntPtr nSize ) override;
- virtual sal_uIntPtr PutData( const void* pData, sal_uIntPtr nSize ) override;
+ virtual std::size_t GetData(void* pData, std::size_t nSize) override;
+ virtual std::size_t PutData(const void* pData, std::size_t nSize) override;
virtual sal_uInt64 SeekPos(sal_uInt64 nPos) override;
virtual void FlushData() override;
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 5f8b9388dba5..6a37b265a03a 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -93,7 +93,7 @@ enum LockType {};
struct SvLockBytesStat
{
- sal_Size nSize;
+ std::size_t nSize;
SvLockBytesStat() : nSize(0) {}
};
@@ -123,10 +123,10 @@ public:
void SetSynchronMode(bool bTheSync = true) { m_bSync = bTheSync; }
bool IsSynchronMode() const { return m_bSync; }
- virtual ErrCode ReadAt(sal_uInt64 nPos, void * pBuffer, sal_Size nCount,
- sal_Size * pRead) const;
- virtual ErrCode WriteAt(sal_uInt64 nPos, const void * pBuffer, sal_Size nCount,
- sal_Size * pWritten);
+ virtual ErrCode ReadAt(sal_uInt64 nPos, void * pBuffer, std::size_t nCount,
+ std::size_t * pRead) const;
+ virtual ErrCode WriteAt(sal_uInt64 nPos, const void * pBuffer, std::size_t nCount,
+ std::size_t * pWritten);
virtual ErrCode Flush() const;
@@ -188,8 +188,8 @@ protected:
StreamMode m_eStreamMode;
bool m_isWritable;
- virtual sal_Size GetData( void* pData, sal_Size nSize );
- virtual sal_Size PutData( const void* pData, sal_Size nSize );
+ virtual std::size_t GetData( void* pData, std::size_t nSize );
+ virtual std::size_t PutData( const void* pData, std::size_t nSize );
virtual sal_uInt64 SeekPos( sal_uInt64 nPos );
virtual void FlushData();
virtual void SetSize(sal_uInt64 nSize);
@@ -198,10 +198,10 @@ protected:
void ClearBuffer();
// encrypt and write in blocks
- sal_Size CryptAndWriteBuffer( const void* pStart, sal_Size nLen );
- bool EncryptBuffer( void* pStart, sal_Size nLen );
+ std::size_t CryptAndWriteBuffer( const void* pStart, std::size_t nLen );
+ bool EncryptBuffer( void* pStart, std::size_t nLen );
- void SyncSvStream( sal_Size nNewStreamPos ); ///< SvStream <- Medium
+ void SyncSvStream( std::size_t nNewStreamPos ); ///< SvStream <- Medium
void SyncSysStream(); ///< SvStream -> Medium
public:
@@ -275,8 +275,8 @@ public:
SvStream& WriteUInt32AsString( sal_uInt32 nUInt32 );
SvStream& WriteInt32AsString( sal_Int32 nInt32 );
- sal_Size ReadBytes( void* pData, sal_Size nSize );
- sal_Size WriteBytes( const void* pData, sal_Size nSize );
+ std::size_t ReadBytes( void* pData, std::size_t nSize );
+ std::size_t WriteBytes( const void* pData, std::size_t nSize );
sal_uInt64 Seek( sal_uInt64 nPos );
sal_uInt64 SeekRel( sal_Int64 nPos );
sal_uInt64 Tell() const { return m_nBufFilePos + m_nBufActualPos; }
@@ -435,11 +435,11 @@ TOOLS_DLLPUBLIC SvStream& endlub( SvStream& rStr );
/// Attempt to read nUnits 8bit units to an OString, returned OString's
/// length is number of units successfully read
TOOLS_DLLPUBLIC OString read_uInt8s_ToOString(SvStream& rStrm,
- sal_Size nUnits);
+ std::size_t nUnits);
/// Attempt to read nUnits 8bit units to an OUString
inline OUString read_uInt8s_ToOUString(SvStream& rStrm,
- sal_Size nUnits, rtl_TextEncoding eEnc)
+ std::size_t nUnits, rtl_TextEncoding eEnc)
{
return OStringToOUString(read_uInt8s_ToOString(rStrm, nUnits), eEnc);
}
@@ -447,7 +447,7 @@ inline OUString read_uInt8s_ToOUString(SvStream& rStrm,
/// Attempt to read nUnits 16bit units to an OUString, returned
/// OUString's length is number of units successfully read
TOOLS_DLLPUBLIC OUString read_uInt16s_ToOUString(SvStream& rStrm,
- sal_Size nUnits);
+ std::size_t nUnits);
/// Attempt to read a pascal-style length (of type prefix) prefixed sequence of
/// 16bit units to an OUString, returned OString's length is number of
@@ -468,10 +468,10 @@ inline OUString read_uInt32_lenPrefixed_uInt16s_ToOUString(SvStream& rStrm)
/// Attempt to write a prefixed sequence of nUnits 16bit units from an OUString,
/// returned value is number of bytes written
-TOOLS_DLLPUBLIC sal_Size write_uInt16s_FromOUString(SvStream& rStrm,
- const OUString& rStr, sal_Size nUnits);
+TOOLS_DLLPUBLIC std::size_t write_uInt16s_FromOUString(SvStream& rStrm,
+ const OUString& rStr, std::size_t nUnits);
-inline sal_Size write_uInt16s_FromOUString(SvStream& rStrm,
+inline std::size_t write_uInt16s_FromOUString(SvStream& rStrm,
const OUString& rStr)
{
return write_uInt16s_FromOUString(rStrm, rStr, rStr.getLength());
@@ -480,13 +480,13 @@ inline sal_Size write_uInt16s_FromOUString(SvStream& rStrm,
/// Attempt to write a pascal-style length (of type prefix) prefixed sequence
/// of 16bit units from an OUString, returned value is number of bytes written
/// (including byte-count of prefix)
-TOOLS_DLLPUBLIC sal_Size write_uInt32_lenPrefixed_uInt16s_FromOUString(SvStream& rStrm,
+TOOLS_DLLPUBLIC std::size_t write_uInt32_lenPrefixed_uInt16s_FromOUString(SvStream& rStrm,
const OUString &rStr);
/// Attempt to write a pascal-style length (of type prefix) prefixed sequence
/// of 16bit units from an OUString, returned value is number of bytes written
/// (including byte-count of prefix)
-TOOLS_DLLPUBLIC sal_Size write_uInt16_lenPrefixed_uInt16s_FromOUString(SvStream& rStrm,
+TOOLS_DLLPUBLIC std::size_t write_uInt16_lenPrefixed_uInt16s_FromOUString(SvStream& rStrm,
const OUString &rStr);
/// Attempt to read 8bit units to an OString until a zero terminator is
@@ -533,13 +533,13 @@ inline OUString read_uInt8_lenPrefixed_uInt8s_ToOUString(SvStream& rStrm,
/// Attempt to write a prefixed sequence of nUnits 8bit units from an OString,
/// returned value is number of bytes written
-inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const OString& rStr,
- sal_Size nUnits)
+inline std::size_t write_uInt8s_FromOString(SvStream& rStrm, const OString& rStr,
+ std::size_t nUnits)
{
return rStrm.WriteBytes(rStr.getStr(), nUnits);
}
-inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const OString& rStr)
+inline std::size_t write_uInt8s_FromOString(SvStream& rStrm, const OString& rStr)
{
return write_uInt8s_FromOString(rStrm, rStr, rStr.getLength());
}
@@ -547,13 +547,13 @@ inline sal_Size write_uInt8s_FromOString(SvStream& rStrm, const OString& rStr)
/// Attempt to write a pascal-style length (of type prefix) prefixed
/// sequence of units from a string-type, returned value is number of bytes
/// written (including byte-count of prefix)
-TOOLS_DLLPUBLIC sal_Size write_uInt16_lenPrefixed_uInt8s_FromOString(SvStream& rStrm,
+TOOLS_DLLPUBLIC std::size_t write_uInt16_lenPrefixed_uInt8s_FromOString(SvStream& rStrm,
const OString &rStr);
/// Attempt to write a pascal-style length (of type prefix) prefixed sequence
/// of 8bit units from an OUString, returned value is number of bytes written
/// (including byte-count of prefix)
-inline sal_Size write_uInt16_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm,
+inline std::size_t write_uInt16_lenPrefixed_uInt8s_FromOUString(SvStream& rStrm,
const OUString &rStr,
rtl_TextEncoding eEnc)
{
@@ -573,14 +573,14 @@ private:
SvFileStream (const SvFileStream&) = delete;
SvFileStream & operator= (const SvFileStream&) = delete;
- bool LockRange( sal_Size nByteOffset, sal_Size nBytes );
- bool UnlockRange( sal_Size nByteOffset, sal_Size nBytes );
+ bool LockRange( std::size_t nByteOffset, std::size_t nBytes );
+ bool UnlockRange( std::size_t nByteOffset, std::size_t nBytes );
bool LockFile();
void UnlockFile();
protected:
- virtual sal_Size GetData( void* pData, sal_Size nSize ) override;
- virtual sal_Size PutData( const void* pData, sal_Size nSize ) override;
+ virtual std::size_t GetData( void* pData, std::size_t nSize ) override;
+ virtual std::size_t PutData( const void* pData, std::size_t nSize ) override;
virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override;
virtual void SetSize( sal_uInt64 nSize ) override;
virtual void FlushData() override;
@@ -608,22 +608,22 @@ class TOOLS_DLLPUBLIC SvMemoryStream : public SvStream
SvMemoryStream & operator= (const SvMemoryStream&) = delete;
protected:
- sal_Size nSize;
- sal_Size nResize;
- sal_Size nPos;
- sal_Size nEndOfData;
+ std::size_t nSize;
+ std::size_t nResize;
+ std::size_t nPos;
+ std::size_t nEndOfData;
sal_uInt8* pBuf;
bool bOwnsData;
- virtual sal_Size GetData( void* pData, sal_Size nSize ) override;
- virtual sal_Size PutData( const void* pData, sal_Size nSize ) override;
+ virtual std::size_t GetData( void* pData, std::size_t nSize ) override;
+ virtual std::size_t PutData( const void* pData, std::size_t nSize ) override;
virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override;
virtual void SetSize( sal_uInt64 nSize ) override;
virtual void FlushData() override;
/// AllocateMemory must update pBuf accordingly
/// - pBuf: Address of new block
- bool AllocateMemory( sal_Size nSize );
+ bool AllocateMemory( std::size_t nSize );
/// ReAllocateMemory must update the following variables:
/// - pBuf: Address of new block
@@ -638,23 +638,23 @@ protected:
void FreeMemory();
public:
- SvMemoryStream( void* pBuf, sal_Size nSize, StreamMode eMode);
- SvMemoryStream( sal_Size nInitSize=512, sal_Size nResize=64 );
+ SvMemoryStream( void* pBuf, std::size_t nSize, StreamMode eMode);
+ SvMemoryStream( std::size_t nInitSize=512, std::size_t nResize=64 );
virtual ~SvMemoryStream() override;
virtual void ResetError() override;
const void* GetBuffer();
sal_uInt64 GetSize();
- sal_Size GetEndOfData() const { return nEndOfData; }
+ std::size_t GetEndOfData() const { return nEndOfData; }
const void* GetData() { Flush(); return pBuf; }
void* SwitchBuffer();
// the buffer is not owned by this class
- void SetBuffer( void* pBuf, sal_Size nSize, sal_Size nEOF );
+ void SetBuffer( void* pBuf, std::size_t nSize, std::size_t nEOF );
void ObjectOwnsMemory( bool bOwn ) { bOwnsData = bOwn; }
- void SetResizeOffset( sal_Size nNewResize ) { nResize = nNewResize; }
+ void SetResizeOffset( std::size_t nNewResize ) { nResize = nNewResize; }
virtual sal_uInt64 remainingSize() override { return GetEndOfData() - Tell(); }
};
generated by cgit (git 2.34.1) at 2025-03-24 05:47:09 +0000