diff options
Diffstat (limited to 'sc/source/filter/inc')
| -rw-r--r-- | sc/source/filter/inc/XclExpChangeTrack.hxx | 46 | ||||
| -rw-r--r-- | sc/source/filter/inc/excform.hxx | 16 | ||||
| -rw-r--r-- | sc/source/filter/inc/excrecds.hxx | 32 | ||||
| -rw-r--r-- | sc/source/filter/inc/formel.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/inc/fprogressbar.hxx | 32 | ||||
| -rw-r--r-- | sc/source/filter/inc/xcl97rec.hxx | 24 | ||||
| -rw-r--r-- | sc/source/filter/inc/xechart.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/inc/xehelper.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/inc/xepivot.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/inc/xerecord.hxx | 20 | ||||
| -rw-r--r-- | sc/source/filter/inc/xestream.hxx | 20 | ||||
| -rw-r--r-- | sc/source/filter/inc/xestring.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/inc/xetable.hxx | 16 | ||||
| -rw-r--r-- | sc/source/filter/inc/xichart.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/inc/xiescher.hxx | 30 | ||||
| -rw-r--r-- | sc/source/filter/inc/xiname.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/inc/xistream.hxx | 58 | ||||
| -rw-r--r-- | sc/source/filter/inc/xlchart.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/inc/xlstream.hxx | 4 |
19 files changed, 163 insertions, 163 deletions
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 6da99a5969d9..eedb6fc64560 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -32,7 +32,7 @@ class ExcXmlRecord : public ExcRecord { public: - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; virtual sal_uInt16 GetNum() const override; virtual void Save( XclExpStream& rStrm ) override; }; @@ -53,7 +53,7 @@ public: inline const sal_uInt8* GetGUID() const { return aGUID; } virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // XclExpUserBViewList - list of UserBView records @@ -90,7 +90,7 @@ private: public: XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 nTab ); virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // XclExpUsersViewEnd - end of view block (one per sheet) @@ -102,7 +102,7 @@ private: public: virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // dummy record for "User Names" stream @@ -114,7 +114,7 @@ private: public: virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // dummy record for "User Names" stream @@ -126,7 +126,7 @@ private: public: virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // dummy record for "User Names" stream @@ -138,7 +138,7 @@ private: public: virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // dummy record for "User Names" stream @@ -150,7 +150,7 @@ private: public: virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // dummy record without content @@ -165,7 +165,7 @@ public: virtual ~XclExpChTrEmpty() override; virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // dummy record for "Revision Log" stream @@ -179,7 +179,7 @@ public: virtual ~XclExpChTr0x0195() override; virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // dummy record for "Revision Log" stream @@ -197,7 +197,7 @@ public: virtual ~XclExpChTr0x0194() override; virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; inline XclExpChTr0x0194::XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ) : @@ -224,7 +224,7 @@ public: inline void SetCount( sal_uInt32 nNew ) { nCount = nNew; } virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; @@ -281,7 +281,7 @@ public: virtual ~XclExpChTrInfo() override; virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // XclExpChTrTabIdBuffer - buffer for tab id's @@ -332,7 +332,7 @@ public: void Copy( const XclExpChTrTabIdBuffer& rBuffer ); virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // XclExpChTrAction - base class for action records @@ -368,12 +368,12 @@ protected: // save header data, call SaveActionData() virtual void SaveCont( XclExpStream& rStrm ) override; - static inline sal_Size GetHeaderByteCount() { return 12; } + static inline std::size_t GetHeaderByteCount() { return 12; } // override to save action data without header, called by SaveCont() virtual void SaveActionData( XclExpStream& rStrm ) const = 0; // override to get action size without header, called by GetLen() - virtual sal_Size GetActionByteCount() const = 0; + virtual std::size_t GetActionByteCount() const = 0; // do something before writing the record virtual void PrepareSaveAction( XclExpStream& rStrm ) const; @@ -400,7 +400,7 @@ public: void SetIndex( sal_uInt32& rIndex ); virtual void Save( XclExpStream& rStrm ) override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; inline XclExpChTrAction* GetAddAction() { return pAddAction; } inline sal_uInt32 GetActionNumber() const { return nIndex; } @@ -442,7 +442,7 @@ struct XclExpChTrData double fValue; sal_Int32 nRKValue; sal_uInt16 nType; - sal_Size nSize; + std::size_t nSize; XclExpChTrData(); ~XclExpChTrData(); @@ -484,7 +484,7 @@ public: virtual ~XclExpChTrCellContent() override; virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetActionByteCount() const override; + virtual std::size_t GetActionByteCount() const override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; @@ -513,7 +513,7 @@ public: virtual ~XclExpChTrInsert() override; virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetActionByteCount() const override; + virtual std::size_t GetActionByteCount() const override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; @@ -536,7 +536,7 @@ public: virtual ~XclExpChTrInsertTab() override; virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetActionByteCount() const override; + virtual std::size_t GetActionByteCount() const override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; @@ -562,7 +562,7 @@ public: virtual ~XclExpChTrMoveRange() override; virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetActionByteCount() const override; + virtual std::size_t GetActionByteCount() const override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; @@ -579,7 +579,7 @@ public: virtual ~XclExpChTr0x014A() override; virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetActionByteCount() const override; + virtual std::size_t GetActionByteCount() const override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 05bed91bbef8..9a64b40afec0 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -47,15 +47,15 @@ protected: public: ExcelToSc( XclImpRoot& rRoot ); virtual ~ExcelToSc() override; - virtual ConvErr Convert( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen, + virtual ConvErr Convert( const ScTokenArray*&, XclImpStream& rStrm, std::size_t nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) override; - virtual ConvErr Convert( ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ) override; + virtual ConvErr Convert( ScRangeListTabs&, XclImpStream& rStrm, std::size_t nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ) override; - virtual void ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen, + virtual void ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, std::size_t nFormulaLen, const OUString& rUrl, const ::std::vector<OUString>& rTabNames ); - virtual void GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ); + virtual void GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, std::size_t nLen ); void GetDummy( const ScTokenArray*& ); const ScTokenArray* GetBoolErr( XclBoolError ); @@ -121,16 +121,16 @@ public: ExcelToSc8( XclImpRoot& rRoot ); virtual ~ExcelToSc8() override; - virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) override; + virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, std::size_t nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) override; - virtual ConvErr Convert( ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ) override; + virtual ConvErr Convert( ScRangeListTabs&, XclImpStream& rStrm, std::size_t nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ) override; - virtual void ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen, + virtual void ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, std::size_t nFormulaLen, const OUString& rUrl, const ::std::vector<OUString>& rTabNames ) override; static inline bool IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 ); - virtual void GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ) override; + virtual void GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, std::size_t nLen ) override; }; inline bool ExcelToSc8::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 ) diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 4223adcea0d5..514310075cac 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -53,7 +53,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) override; virtual sal_uInt16 GetNum() const = 0; - virtual sal_Size GetLen() const = 0; + virtual std::size_t GetLen() const = 0; protected: virtual void SaveCont( XclExpStream& rStrm ); @@ -72,7 +72,7 @@ protected: public: virtual void Save( XclExpStream& rStrm ) override; virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; //--------------------------------------------------------- class ExcDummyRec - @@ -100,7 +100,7 @@ protected: inline ExcBoolRecord() : bVal( false ) {} public: - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; //--------------------------------------------------------- class ExcBof_Base - @@ -128,7 +128,7 @@ public: ExcBof(); virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; //------------------------------------------------------------- class ExcBofW - @@ -142,7 +142,7 @@ public: ExcBofW(); virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; //-------------------------------------------------------------- class ExcEof - @@ -152,7 +152,7 @@ class ExcEof : public ExcRecord private: public: virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; //--------------------------------------------------------- class ExcDummy_00 - @@ -162,9 +162,9 @@ class ExcDummy_00 : public ExcDummyRec { private: static const sal_uInt8 pMyData[]; - static const sal_Size nMyLen; + static const std::size_t nMyLen; public: - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; virtual const sal_uInt8* GetData() const override; }; @@ -212,9 +212,9 @@ class ExcDummy_040 : public ExcDummyRec { private: static const sal_uInt8 pMyData[]; - static const sal_Size nMyLen; + static const std::size_t nMyLen; public: - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; virtual const sal_uInt8* GetData() const override; }; @@ -222,9 +222,9 @@ class ExcDummy_041 : public ExcDummyRec { private: static const sal_uInt8 pMyData[]; - static const sal_Size nMyLen; + static const std::size_t nMyLen; public: - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; virtual const sal_uInt8* GetData() const override; }; @@ -271,7 +271,7 @@ private: public: ExcBundlesheet( RootData& rRootData, SCTAB nTab ); - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; //--------------------------------------------------------- class ExcDummy_02 - @@ -281,9 +281,9 @@ class ExcDummy_02a : public ExcDummyRec { private: static const sal_uInt8 pMyData[]; - static const sal_Size nMyLen; + static const std::size_t nMyLen; public: - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; virtual const sal_uInt8* GetData() const override; }; @@ -359,7 +359,7 @@ public: ~ExcFilterCondition(); inline bool IsEmpty() const { return (nType == EXC_AFTYPE_NOTUSED); } - sal_uLong GetTextBytes() const; + std::size_t GetTextBytes() const; void SetCondition( sal_uInt8 nTp, sal_uInt8 nOp, double fV, OUString* pT ); diff --git a/sc/source/filter/inc/formel.hxx b/sc/source/filter/inc/formel.hxx index 4a63dbdf0d45..494cd0a164ca 100644 --- a/sc/source/filter/inc/formel.hxx +++ b/sc/source/filter/inc/formel.hxx @@ -104,9 +104,9 @@ public: void Reset(); void Reset( const ScAddress& rEingPos ); - virtual ConvErr Convert( const ScTokenArray*& rpErg, XclImpStream& rStrm, sal_Size nFormulaLen, + virtual ConvErr Convert( const ScTokenArray*& rpErg, XclImpStream& rStrm, std::size_t nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) = 0; - virtual ConvErr Convert( ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, + virtual ConvErr Convert( ScRangeListTabs&, XclImpStream& rStrm, std::size_t nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ) = 0; }; diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index 8df4e74ac492..dc2fd81a6a3d 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -112,7 +112,7 @@ public: /** Adds a new segment to the progress bar. @return the identifier of the segment. */ - sal_Int32 AddSegment( sal_Size nSize ); + sal_Int32 AddSegment( std::size_t nSize ); /** Returns a complete progress bar for the specified segment. @descr The progress bar can be used to create sub segments inside of the segment. Do not delete it (done by root progress bar)! @@ -127,9 +127,9 @@ public: /** Starts the progress bar (with first segment). */ inline void Activate() { ActivateSegment( 0 ); } /** Set current segment to the specified absolute position. */ - void ProgressAbs( sal_Size nPos ); + void ProgressAbs( std::size_t nPos ); /** Increase current segment by the passed value. */ - void Progress( sal_Size nDelta = 1 ); + void Progress( std::size_t nDelta = 1 ); private: struct ScfProgressSegment; @@ -147,7 +147,7 @@ private: /** Activates progress bar and sets current segment. */ void SetCurrSegment( ScfProgressSegment* pSegment ); /** Increases mnTotalPos and calls the system progress bar. */ - void IncreaseProgressBar( sal_Size nDelta ); + void IncreaseProgressBar( std::size_t nDelta ); private: /** Contains all data of a segment of the progress bar. */ @@ -156,10 +156,10 @@ private: typedef ::std::unique_ptr< ScfProgressBar > ScfProgressBarPtr; ScfProgressBarPtr mxProgress; /// Pointer to sub progress bar for this segment. - sal_Size mnSize; /// Size of this segment. - sal_Size mnPos; /// Current position of this segment. + std::size_t mnSize; /// Size of this segment. + std::size_t mnPos; /// Current position of this segment. - explicit ScfProgressSegment( sal_Size nSize ); + explicit ScfProgressSegment( std::size_t nSize ); ~ScfProgressSegment(); }; @@ -175,11 +175,11 @@ private: ScfProgressSegment* mpParentSegment; /// Parent segment, if this is a segment progress bar. ScfProgressSegment* mpCurrSegment; /// Current segment for progress. - sal_Size mnTotalSize; /// Total size of all segments. - sal_Size mnTotalPos; /// Sum of positions of all segments. - sal_Size mnUnitSize; /// Size between two calls of system progress. - sal_Size mnNextUnitPos; /// Limit for next system progress call. - sal_Size mnSysProgressScale; /// Additionally scaling factor for system progress. + std::size_t mnTotalSize; /// Total size of all segments. + std::size_t mnTotalPos; /// Sum of positions of all segments. + std::size_t mnUnitSize; /// Size between two calls of system progress. + std::size_t mnNextUnitPos; /// Limit for next system progress call. + std::size_t mnSysProgressScale; /// Additionally scaling factor for system progress. bool mbInProgress; /// true = progress bar started. }; @@ -187,15 +187,15 @@ private: class ScfSimpleProgressBar { public: - explicit ScfSimpleProgressBar( sal_Size nSize, SfxObjectShell* pDocShell, const OUString& rText ); - explicit ScfSimpleProgressBar( sal_Size nSize, SfxObjectShell* pDocShell, sal_uInt16 nResId ); + explicit ScfSimpleProgressBar( std::size_t nSize, SfxObjectShell* pDocShell, const OUString& rText ); + explicit ScfSimpleProgressBar( std::size_t nSize, SfxObjectShell* pDocShell, sal_uInt16 nResId ); /** Set progress bar to the specified position. */ - inline void ProgressAbs( sal_Size nPos ) { maProgress.ProgressAbs( nPos ); } + inline void ProgressAbs( std::size_t nPos ) { maProgress.ProgressAbs( nPos ); } private: /** Initializes and starts the progress bar. */ - void Init( sal_Size nSize ); + void Init( std::size_t nSize ); private: ScfProgressBar maProgress; /// The used progress bar. diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index 51f9fcd572d4..0c8dc964af2e 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -209,7 +209,7 @@ public: virtual void Save( XclExpStream& rStrm ) override; virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; private: virtual void SaveCont( XclExpStream& rStrm ) override; @@ -279,7 +279,7 @@ public: ExcBof8_Base(); virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // --- class ExcBofW8 ------------------------------------------------ @@ -314,7 +314,7 @@ public: ExcBundlesheet8( RootData& rRootData, SCTAB nTab ); ExcBundlesheet8( const OUString& rString ); - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; @@ -325,7 +325,7 @@ class XclObproj : public ExcRecord { public: virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // ---- class XclCodename -------------------------------------------- @@ -339,7 +339,7 @@ public: XclCodename( const OUString& ); virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; // ---- Scenarios ---------------------------------------------------- @@ -358,7 +358,7 @@ protected: public: ExcEScenarioCell( sal_uInt16 nC, sal_uInt16 nR, const OUString& rTxt ); - inline sal_Size GetStringBytes() const + inline std::size_t GetStringBytes() const { return sText.GetSize(); } void WriteAddress( XclExpStream& rStrm ) const ; @@ -370,7 +370,7 @@ public: class ExcEScenario : public ExcRecord { private: - sal_Size nRecLen; + std::size_t nRecLen; XclExpString sName; XclExpString sComment; XclExpString sUserName; @@ -388,7 +388,7 @@ public: virtual ~ExcEScenario() override; virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; @@ -410,7 +410,7 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) override; virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; }; /** Represents a FEATHDR (SHEETPROTECTION) record that stores sheet protection @@ -453,7 +453,7 @@ public: XclCalccount( const ScDocument& ); virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; @@ -468,7 +468,7 @@ public: XclIteration( const ScDocument& ); virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; @@ -483,7 +483,7 @@ public: XclDelta( const ScDocument& ); virtual sal_uInt16 GetNum() const override; - virtual sal_Size GetLen() const override; + virtual std::size_t GetLen() const override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; }; diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 7fc0d18c1502..365256cb00c9 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -164,7 +164,7 @@ class XclExpChGroupBase : public XclExpRecord, protected XclExpChRoot public: explicit XclExpChGroupBase( const XclExpChRoot& rRoot, sal_uInt16 nFrType, - sal_uInt16 nRecId, sal_Size nRecSize = 0 ); + sal_uInt16 nRecId, std::size_t nRecSize = 0 ); virtual ~XclExpChGroupBase() override; /** Saves the header record. Calls WriteSubRecords() to let derived classes write sub records. */ @@ -190,7 +190,7 @@ class XclExpChFutureRecordBase : public XclExpFutureRecord, protected XclExpChRo { public: explicit XclExpChFutureRecordBase( const XclExpChRoot& rRoot, - XclFutureRecType eRecType, sal_uInt16 nRecId, sal_Size nRecSize = 0 ); + XclFutureRecType eRecType, sal_uInt16 nRecId, std::size_t nRecSize = 0 ); /** Writes missing CHFRBLOCKBEGIN records and this record. */ virtual void Save( XclExpStream& rStrm ) override; diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index 81f89463c40e..477adc9218c0 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -69,7 +69,7 @@ private: ScfProgressBar* mpSubRowFinal; /// Sub progress bar for finalizing ROW records. sal_Int32 mnSegRowFinal; /// Progress segment for finalizing ROW records. - sal_Size mnRowCount; /// Number of created ROW records. + std::size_t mnRowCount; /// Number of created ROW records. }; // Calc->Excel cell address/range conversion ================================== @@ -426,7 +426,7 @@ public: ~XclExpCachedMatrix(); /** Returns the byte count of all contained data. */ - sal_Size GetSize() const; + std::size_t GetSize() const; /** Writes the complete matrix to stream. */ void Save( XclExpStream& rStrm ) const; diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index dd94d57ccd95..c8c1fbbf02dc 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -89,7 +89,7 @@ public: sal_uInt16 GetItemIndex( const OUString& rItemName ) const; /** Returns the size an item index needs to write out. */ - sal_Size GetIndexSize() const; + std::size_t GetIndexSize() const; /** Writes the item index at the passed source row position as part of the SXINDEXLIST record. */ void WriteIndex( XclExpStream& rStrm, sal_uInt32 nSrcRow ) const; diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index 8cf66e174dd7..69b7bbf4c171 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -120,23 +120,23 @@ public: @param nRecSize The predicted record size. May be set later with SetRecSize(). */ explicit XclExpRecord( sal_uInt16 nRecId = EXC_ID_UNKNOWN, - sal_Size nRecSize = 0 ); + std::size_t nRecSize = 0 ); virtual ~XclExpRecord() override; /** Returns the current record ID. */ inline sal_uInt16 GetRecId() const { return mnRecId; } /** Returns the current record size prediction. */ - inline sal_Size GetRecSize() const { return mnRecSize; } + inline std::size_t GetRecSize() const { return mnRecSize; } /** Sets a new record ID. */ inline void SetRecId( sal_uInt16 nRecId ) { mnRecId = nRecId; } /** Sets a new record size prediction. */ - inline void SetRecSize( sal_Size nRecSize ) { mnRecSize = nRecSize; } + inline void SetRecSize( std::size_t nRecSize ) { mnRecSize = nRecSize; } /** Adds a size value to the record size prediction. */ - inline void AddRecSize( sal_Size nRecSize ) { mnRecSize += nRecSize; } + inline void AddRecSize( std::size_t nRecSize ) { mnRecSize += nRecSize; } /** Sets record ID and size with one call. */ - void SetRecHeader( sal_uInt16 nRecId, sal_Size nRecSize ); + void SetRecHeader( sal_uInt16 nRecId, std::size_t nRecSize ); /** Writes the record header and calls WriteBody(). */ virtual void Save( XclExpStream& rStrm ) override; @@ -147,7 +147,7 @@ protected: virtual void WriteBody( XclExpStream& rStrm ); private: - sal_Size mnRecSize; /// The predicted record size. + std::size_t mnRecSize; /// The predicted record size. sal_uInt16 mnRecId; /// The record ID. }; @@ -173,7 +173,7 @@ public: /** @param nRecId The record ID of this record. @param rValue The value for the record body. @param nSize Record size. Uses sizeof( Type ), if this parameter is omitted. */ - inline explicit XclExpValueRecord( sal_uInt16 nRecId, const Type& rValue, sal_Size nSize = sizeof( Type ) ) : + inline explicit XclExpValueRecord( sal_uInt16 nRecId, const Type& rValue, std::size_t nSize = sizeof( Type ) ) : XclExpRecord( nRecId, nSize ), maValue( rValue ), mnAttribute( -1 ) {} /** Returns the value of the record. */ @@ -255,10 +255,10 @@ public: @param pRecData Pointer to the data array representing the record body. @param nRecSize Size of the data array. */ explicit XclExpDummyRecord( - sal_uInt16 nRecId, const void* pRecData, sal_Size nRecSize ); + sal_uInt16 nRecId, const void* pRecData, std::size_t nRecSize ); /** Sets a data array. */ - void SetData( const void* pRecData, sal_Size nRecSize ); + void SetData( const void* pRecData, std::size_t nRecSize ); private: /** Writes the body of the record. */ @@ -274,7 +274,7 @@ class XclExpFutureRecord : public XclExpRecord { public: explicit XclExpFutureRecord( XclFutureRecType eRecType, - sal_uInt16 nRecId, sal_Size nRecSize = 0 ); + sal_uInt16 nRecId, std::size_t nRecSize = 0 ); /** Writes the extended record header and calls WriteBody(). */ virtual void Save( XclExpStream& rStrm ) override; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 25193d8cab2f..81c3f43c2f3a 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -87,7 +87,7 @@ public: inline const XclExpRoot& GetRoot() const { return mrRoot; } /** Starts a new record: writes header data, stores calculated record size. */ - void StartRecord( sal_uInt16 nRecId, sal_Size nRecSize ); + void StartRecord( sal_uInt16 nRecId, std::size_t nRecSize ); /** Checks and corrects real record length. Must be called every time a record is finished. */ void EndRecord(); @@ -107,11 +107,11 @@ public: XclExpStream& operator<<( double fValue ); /** Writes nBytes bytes from memory. */ - sal_Size Write( const void* pData, sal_Size nBytes ); + std::size_t Write( const void* pData, std::size_t nBytes ); /** Writes a sequence of nBytes zero bytes (respects slice setting). */ - void WriteZeroBytes( sal_Size nBytes ); + void WriteZeroBytes( std::size_t nBytes ); - void WriteZeroBytesToRecord( sal_Size nBytes ); + void WriteZeroBytesToRecord( std::size_t nBytes ); /** Copies nBytes bytes from current position of the stream rInStrm. @descr Omitting the second parameter means: read to end of stream. */ @@ -153,7 +153,7 @@ private: /** Rewrites correct record length, if different from calculated. */ void UpdateRecSize(); /** Recalculates mnCurrSize and mnSliceSize. */ - void UpdateSizeVars( sal_Size nSize ); + void UpdateSizeVars( std::size_t nSize ); /** Writes CONTINUE header, internal setup. */ void StartContinue(); /** Refreshes counter vars, creates CONTINUE records. */ @@ -163,7 +163,7 @@ private: sal_uInt16 PrepareWrite(); /** Writes a raw sequence of zero bytes. */ - void WriteRawZeroBytes( sal_Size nBytes ); + void WriteRawZeroBytes( std::size_t nBytes ); private: SvStream& mrStrm; /// Reference to the system output stream. @@ -180,10 +180,10 @@ private: sal_uInt16 mnHeaderSize; /// Record size written in last record header. sal_uInt16 mnCurrSize; /// Count of bytes already written in current record. sal_uInt16 mnSliceSize; /// Count of bytes already written in current slice. - sal_Size mnPredictSize; /// Predicted size received from calling function. + std::size_t mnPredictSize; /// Predicted size received from calling function. // stream position data - sal_Size mnLastSizePos; /// Stream position of size field in current header. + std::size_t mnLastSizePos; /// Stream position of size field in current header. bool mbInRec; /// true = currently writing inside of a record. }; @@ -215,8 +215,8 @@ public: private: void Init( const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ); - static sal_uInt32 GetBlockPos( sal_Size nStrmPos ); - static sal_uInt16 GetOffsetInBlock( sal_Size nStrmPos ); + static sal_uInt32 GetBlockPos( std::size_t nStrmPos ); + static sal_uInt16 GetOffsetInBlock( std::size_t nStrmPos ); private: ::msfilter::MSCodec_Std97 maCodec; /// Crypto algorithm implementation. diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index 60956b6014c3..570a3f0e25a7 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -133,9 +133,9 @@ public: /** Returns the byte count the header will take on export. */ sal_uInt16 GetHeaderSize() const; /** Returns the byte count the character buffer will take on export. */ - sal_Size GetBufferSize() const; + std::size_t GetBufferSize() const; /** Returns the byte count the whole string will take on export. */ - sal_Size GetSize() const; + std::size_t GetSize() const; /** Returns the specified character from the (already encoded) string. */ sal_uInt16 GetChar( sal_uInt16 nCharIdx ) const; diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 5137de6eca27..4eaea1511b78 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -305,7 +305,7 @@ public: protected: explicit XclExpCellBase( - sal_uInt16 nRecId, sal_Size nContSize, const XclAddress& rXclPos ); + sal_uInt16 nRecId, std::size_t nContSize, const XclAddress& rXclPos ); /** Sets this record to a new column position. */ inline void SetXclCol( sal_uInt16 nXclCol ) { maXclPos.mnCol = nXclCol; } @@ -334,15 +334,15 @@ public: virtual void Save( XclExpStream& rStrm ) override; protected: - explicit XclExpSingleCellBase( sal_uInt16 nRecId, sal_Size nContSize, + explicit XclExpSingleCellBase( sal_uInt16 nRecId, std::size_t nContSize, const XclAddress& rXclPos, sal_uInt32 nXFId ); explicit XclExpSingleCellBase( const XclExpRoot& rRoot, - sal_uInt16 nRecId, sal_Size nContSize, const XclAddress& rXclPos, + sal_uInt16 nRecId, std::size_t nContSize, const XclAddress& rXclPos, const ScPatternAttr* pPattern, sal_Int16 nScript, sal_uInt32 nForcedXFId ); - inline void SetContSize( sal_Size nContSize ) { mnContSize = nContSize; } - inline sal_Size GetContSize() const { return mnContSize; } + inline void SetContSize( std::size_t nContSize ) { mnContSize = nContSize; } + inline std::size_t GetContSize() const { return mnContSize; } inline void SetXFId( sal_uInt32 nXFId ) { maXFId.mnXFId = nXFId; } inline sal_uInt32 GetXFId() const { return maXFId.mnXFId; } @@ -355,7 +355,7 @@ private: private: XclExpXFId maXFId; /// The XF identifier of the cell formatting. - sal_Size mnContSize; /// The size of the cell contents. + std::size_t mnContSize; /// The size of the cell contents. }; /** Represents a NUMBER record that describes a cell with a double value. */ @@ -494,7 +494,7 @@ public: protected: explicit XclExpMultiCellBase( sal_uInt16 nRecId, sal_uInt16 nMulRecId, - sal_Size nContSize, const XclAddress& rXclPos ); + std::size_t nContSize, const XclAddress& rXclPos ); /** Returns the number of cells this record represents. */ sal_uInt16 GetCellCount() const; @@ -525,7 +525,7 @@ private: typedef ::std::vector< XclExpMultiXFId > XclExpMultiXFIdDeq; sal_uInt16 mnMulRecId; /// Record ID for multiple record variant. - sal_Size mnContSize; /// Data size of contents for one cell + std::size_t mnContSize; /// Data size of contents for one cell XclExpMultiXFIdDeq maXFIds; /// The XF identifiers of the cell formatting. }; diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 6d26ed2bdb46..d97c722d387a 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -1301,7 +1301,7 @@ public: /** Returns true, if the plot area has benn moved and/or resized manually. */ bool IsManualPlotArea() const; /** Returns the number of units on the progress bar needed for the chart. */ - static inline sal_Size GetProgressSize() { return 2 * EXC_CHART_PROGRESS_SIZE; } + static inline std::size_t GetProgressSize() { return 2 * EXC_CHART_PROGRESS_SIZE; } /** Converts and writes all properties to the passed chart. */ void Convert( @@ -1391,7 +1391,7 @@ public: void UpdateObjFrame( const XclObjLineData& rLineData, const XclObjFillData& rFillData ); /** Returns the number of units on the progress bar needed for the chart. */ - sal_Size GetProgressSize() const; + std::size_t GetProgressSize() const; /** Returns true, if the chart is based on a pivot table. */ inline bool IsPivotChart() const { return mbIsPivotChart; } diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index f69770332cfe..6c0552d31677 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -125,7 +125,7 @@ public: inline bool IsInsertSdrObj() const { return mbInsertSdr; } /** Returns the needed size on the progress bar (calls virtual DoGetProgressSize() function). */ - sal_Size GetProgressSize() const; + std::size_t GetProgressSize() const; /** Creates and returns an SdrObject from the contained data. Caller takes ownership! */ SdrObjectPtr CreateSdrObject( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect, bool bIsDff ) const; /** Additional processing for the passed SdrObject before insertion into @@ -170,7 +170,7 @@ protected: virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); /** Derived classes may return a progress bar size different from 1. */ - virtual sal_Size DoGetProgressSize() const; + virtual std::size_t DoGetProgressSize() const; /** Derived classes create and return a new SdrObject from the contained data. Caller takes ownership! */ virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; /** Derived classes may perform additional processing for the passed SdrObject before insertion. */ @@ -225,7 +225,7 @@ public: void InsertGrouped( XclImpDrawObjRef const & xDrawObj ); /** Returns the needed size on the progress bar for all contained objects. */ - sal_Size GetProgressSize() const; + std::size_t GetProgressSize() const; }; /** A placeholder object for unknown object types. */ @@ -252,7 +252,7 @@ protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; /** Returns a progress bar size that takes all group children into account. */ - virtual sal_Size DoGetProgressSize() const override; + virtual std::size_t DoGetProgressSize() const override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; @@ -424,7 +424,7 @@ protected: /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) override; /** Returns the needed size on the progress bar. */ - virtual sal_Size DoGetProgressSize() const override; + virtual std::size_t DoGetProgressSize() const override; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const override; /** Converts the chart document. */ @@ -761,7 +761,7 @@ public: protected: /** Reads listbox settings and selection. */ - void ReadFullLbsData( XclImpStream& rStrm, sal_Size nRecLeft ); + void ReadFullLbsData( XclImpStream& rStrm, std::size_t nRecLeft ); /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; @@ -833,9 +833,9 @@ public: /** Returns true, if this object is an OCX form control. */ inline bool IsOcxControl() const { return mbEmbedded && mbControl && mbUseCtlsStrm; } /** Returns the position in the 'Ctls' stream for additional form control data. */ - inline sal_Size GetCtlsStreamPos() const { return mnCtlsStrmPos; } + inline std::size_t GetCtlsStreamPos() const { return mnCtlsStrmPos; } /** Returns the size in the 'Ctls' stream for additional form control data. */ - inline sal_Size GetCtlsStreamSize() const { return mnCtlsStrmSize; } + inline std::size_t GetCtlsStreamSize() const { return mnCtlsStrmSize; } protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ @@ -864,8 +864,8 @@ private: Rectangle maVisArea; /// Size of graphic. OUString maClassName; /// Class name of embedded OLE object. sal_uInt32 mnStorageId; /// Identifier of the storage for this object. - sal_Size mnCtlsStrmPos; /// Position in 'Ctls' stream for this control. - sal_Size mnCtlsStrmSize; /// Size in 'Ctls' stream for this control. + std::size_t mnCtlsStrmPos; /// Position in 'Ctls' stream for this control. + std::size_t mnCtlsStrmSize; /// Size in 'Ctls' stream for this control. bool mbEmbedded; /// true = Embedded OLE object. bool mbLinked; /// true = Linked OLE object. bool mbSymbol; /// true = Show as symbol. @@ -939,9 +939,9 @@ public: virtual ~XclImpDffConverter() override; /** Initializes the internal progress bar with the passed size and starts it. */ - void StartProgressBar( sal_Size nProgressSize ); + void StartProgressBar( std::size_t nProgressSize ); /** Increase the progress bar by the passed value. */ - void Progress( sal_Size nDelta = 1 ); + void Progress( std::size_t nDelta = 1 ); /** Initially called before the objects of the passed drawing manager are converted. */ void InitializeDrawing( XclImpDrawing& rDrawing, SdrModel& rSdrModel, SdrPage& rSdrPage ); @@ -1079,7 +1079,7 @@ public: /** Sets the object with the passed identification to be skipped on import. */ void SetSkipObj( sal_uInt16 nObjId ); /** Returns the size of the progress bar shown while processing all objects. */ - sal_Size GetProgressSize() const; + std::size_t GetProgressSize() const; /** Derived classes calculate the resulting rectangle of the passed anchor. */ virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const = 0; @@ -1106,10 +1106,10 @@ private: void ReadTxo( XclImpStream& rStrm ); private: - typedef std::map< sal_Size, XclImpDrawObjRef > XclImpObjMap; + typedef std::map< std::size_t, XclImpDrawObjRef > XclImpObjMap; typedef std::map< sal_uInt16, XclImpDrawObjRef > XclImpObjMapById; typedef std::shared_ptr< XclImpObjTextData > XclImpObjTextRef; - typedef std::map< sal_Size, XclImpObjTextRef > XclImpObjTextMap; + typedef std::map< std::size_t, XclImpObjTextRef > XclImpObjTextMap; XclImpDrawObjVector maRawObjs; /// BIFF5 objects without DFF data. SvMemoryStream maDffStrm; /// Copy of the DFF page stream in memory. diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index 969fdae70520..a7e686c5556d 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -39,8 +39,8 @@ class XclImpName : protected XclImpRoot { XclImpStream& mrStrm; XclImpStreamPos maStrmPos; - sal_Size mnStrmPos; - sal_Size mnStrmSize; + std::size_t mnStrmPos; + std::size_t mnStrmSize; TokenStrmData( XclImpStream& rStrm ); }; diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index c0bc09bf36b4..4e0e63bd84e5 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -78,7 +78,7 @@ private: virtual bool OnVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) = 0; /** Implementation of updating the decrypter. */ - virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) = 0; + virtual void OnUpdate( std::size_t nOldStrmPos, std::size_t nNewStrmPos, sal_uInt16 nRecSize ) = 0; /** Implementation of the decryption. */ virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) = 0; @@ -105,7 +105,7 @@ private: OnVerifyPassword( const OUString& rPassword ) override; virtual bool OnVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override; /** Implementation of updating the decrypter. */ - virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) override; + virtual void OnUpdate( std::size_t nOldStrmPos, std::size_t nNewStrmPos, sal_uInt16 nRecSize ) override; /** Implementation of the decryption. */ virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) override; @@ -134,14 +134,14 @@ private: OnVerifyPassword( const OUString& rPassword ) override; virtual bool OnVerifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& rEncryptionData ) override; /** Implementation of updating the decrypter. */ - virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) override; + virtual void OnUpdate( std::size_t nOldStrmPos, std::size_t nNewStrmPos, sal_uInt16 nRecSize ) override; /** Implementation of the decryption. */ virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) override; /** Returns the block number corresponding to the passed stream position. */ - static sal_uInt32 GetBlock( sal_Size nStrmPos ); + static sal_uInt32 GetBlock( std::size_t nStrmPos ); /** Returns the block offset corresponding to the passed stream position. */ - static sal_uInt16 GetOffset( sal_Size nStrmPos ); + static sal_uInt16 GetOffset( std::size_t nStrmPos ); private: ::msfilter::MSCodec_Std97 maCodec; /// Crypto algorithm implementation. @@ -163,22 +163,22 @@ public: explicit XclImpStreamPos(); /** Sets the stream position data to the passed values. */ - void Set( const SvStream& rStrm, sal_Size nNextPos, sal_Size nCurrSize, + void Set( const SvStream& rStrm, std::size_t nNextPos, std::size_t nCurrSize, sal_uInt16 nRawRecId, sal_uInt16 nRawRecSize, sal_uInt16 nRawRecLeft, bool bValid ); /** Writes the contained stream position data to the given variables. */ - void Get( SvStream& rStrm, sal_Size& rnNextPos, sal_Size& rnCurrSize, + void Get( SvStream& rStrm, std::size_t& rnNextPos, std::size_t& rnCurrSize, sal_uInt16& rnRawRecId, sal_uInt16& rnRawRecSize, sal_uInt16& rnRawRecLeft, bool& rbValid ) const; /** Returns the stored stream position. */ - inline sal_Size GetPos() const { return mnPos; } + inline std::size_t GetPos() const { return mnPos; } private: - sal_Size mnPos; /// Absolute position of the stream. - sal_Size mnNextPos; /// Absolute position of next record. - sal_Size mnCurrSize; /// Current calculated size of the record. + std::size_t mnPos; /// Absolute position of the stream. + std::size_t mnNextPos; /// Absolute position of next record. + std::size_t mnCurrSize; /// Current calculated size of the record. sal_uInt16 mnRawRecId; /// Current raw record ID (including CONTINUEs). sal_uInt16 mnRawRecSize; /// Current raw record size (without following CONTINUEs). sal_uInt16 mnRawRecLeft; /// Bytes left in current raw record (without following CONTINUEs). @@ -258,7 +258,7 @@ public: /** Sets stream pointer to the start of the record content for the record at the passed absolute stream position. @return false = no record found (end of stream). */ - bool StartNextRecord( sal_Size nNextRecPos ); + bool StartNextRecord( std::size_t nNextRecPos ); /** Sets stream pointer to begin of record content. @param bContLookup Automatic CONTINUE lookup on/off. In difference to other stream settings, this setting is persistent until next call of @@ -312,15 +312,15 @@ public: /** Returns the current record ID. */ inline sal_uInt16 GetRecId() const { return mnRecId; } /** Returns the position inside of the whole record content. */ - sal_Size GetRecPos() const; + std::size_t GetRecPos() const; /** Returns the data size of the whole record without record headers. */ - sal_Size GetRecSize(); + std::size_t GetRecSize(); /** Returns remaining data size of the whole record without record headers. */ - sal_Size GetRecLeft(); + std::size_t GetRecLeft(); /** Returns the record ID of the following record. */ sal_uInt16 GetNextRecId(); - sal_uInt16 PeekRecId( sal_Size nPos ); + sal_uInt16 PeekRecId( std::size_t nPos ); SAL_WARN_UNUSED_RESULT sal_uInt8 ReaduInt8(); @@ -337,19 +337,19 @@ public: /** Reads nBytes bytes to the existing(!) buffer pData. @return Count of bytes really read. */ - sal_Size Read( void* pData, sal_Size nBytes ); + std::size_t Read( void* pData, std::size_t nBytes ); /** Copies nBytes bytes to rOutStrm. @return Count of bytes really written. */ - sal_Size CopyToStream( SvStream& rOutStrm, sal_Size nBytes ); + std::size_t CopyToStream( SvStream& rOutStrm, std::size_t nBytes ); /** Copies the entire record to rOutStrm. The current record position keeps unchanged. */ void CopyRecordToStream( SvStream& rOutStrm ); /** Seeks absolute in record content to the specified position. @descr The value 0 means start of record, independent from physical stream position. */ - void Seek( sal_Size nPos ); + void Seek( std::size_t nPos ); /** Seeks forward inside the current record. */ - void Ignore( sal_Size nBytes ); + void Ignore( std::size_t nBytes ); // *** special string functions *** --------------------------------------- @@ -373,12 +373,12 @@ public: /** Reads ext. header, detects 8/16 bit mode, sets all ext. info. @return Total size of ext. data. */ - sal_Size ReadUniStringExtHeader( + std::size_t ReadUniStringExtHeader( bool& rb16Bit, bool& rbRich, bool& rbFareast, sal_uInt16& rnFormatRuns, sal_uInt32& rnExtInf, sal_uInt8 nFlags ); /** Seeks to begin of character array, detects 8/16 bit mode. @return Total size of ext. data. */ - sal_Size ReadUniStringExtHeader( bool& rb16Bit, sal_uInt8 nFlags ); + std::size_t ReadUniStringExtHeader( bool& rb16Bit, sal_uInt8 nFlags ); /** Sets a replacement character for NUL characters. @descr NUL characters must be replaced, because Tools strings cannot @@ -416,9 +416,9 @@ public: // *** SvStream functions *** --------------------------------------------- /** Returns the absolute stream position. */ - inline sal_Size GetSvStreamPos() const { return mrStrm.Tell(); } + inline std::size_t GetSvStreamPos() const { return mrStrm.Tell(); } /** Returns the stream size. */ - inline sal_Size GetSvStreamSize() const { return mnStreamSize; } + inline std::size_t GetSvStreamSize() const { return mnStreamSize; } /** Stores current stream position into rPos. */ void StorePosition( XclImpStreamPos& rPos ); @@ -463,7 +463,7 @@ private: @return Copy of mbValid. */ bool EnsureRawReadSize( sal_uInt16 nBytes ); /** Returns the maximum size of raw data possible to read in one block. */ - sal_uInt16 GetMaxRawReadSize( sal_Size nBytes ) const; + sal_uInt16 GetMaxRawReadSize( std::size_t nBytes ) const; /** Reads and decrypts nBytes bytes to the existing(!) buffer pData. @return Count of bytes really read. */ @@ -489,10 +489,10 @@ private: bool mbGlobValidRec; /// Was user position a valid record? bool mbHasGlobPos; /// Is user position defined? - sal_Size mnStreamSize; /// Size of system stream. - sal_Size mnNextRecPos; /// Start of next record header. - sal_Size mnCurrRecSize; /// Helper for record position. - sal_Size mnComplRecSize; /// Size of complete record data (with CONTINUEs). + std::size_t mnStreamSize; /// Size of system stream. + std::size_t mnNextRecPos; /// Start of next record header. + std::size_t mnCurrRecSize; /// Helper for record position. + std::size_t mnComplRecSize; /// Size of complete record data (with CONTINUEs). bool mbHasComplRec; /// true = mnComplRecSize is valid. sal_uInt16 mnRecId; /// Current record ID (not the CONTINUE ID). diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 152d876c76ac..b47d4080d935 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -147,7 +147,7 @@ class XclRoot; // Constants and Enumerations ================================================= -const sal_Size EXC_CHART_PROGRESS_SIZE = 10; +const std::size_t EXC_CHART_PROGRESS_SIZE = 10; const sal_uInt16 EXC_CHART_AUTOROTATION = 0xFFFF; /// Automatic rotation, e.g. axis labels (internal use only). const sal_Int32 EXC_CHART_AXIS_NONE = -1; /// For internal use only. diff --git a/sc/source/filter/inc/xlstream.hxx b/sc/source/filter/inc/xlstream.hxx index 0f63f3251afe..0c45575199ed 100644 --- a/sc/source/filter/inc/xlstream.hxx +++ b/sc/source/filter/inc/xlstream.hxx @@ -25,8 +25,8 @@ // Constants ================================================================== -const sal_Size EXC_REC_SEEK_TO_BEGIN = 0; -const sal_Size EXC_REC_SEEK_TO_END = static_cast< sal_Size >( -1 ); +const std::size_t EXC_REC_SEEK_TO_BEGIN = 0; +const std::size_t EXC_REC_SEEK_TO_END = static_cast<std::size_t>( -1 ); const sal_uInt16 EXC_MAXRECSIZE_BIFF5 = 2080; const sal_uInt16 EXC_MAXRECSIZE_BIFF8 = 8224; |