diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:57:02 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 20:55:50 +0000 |
| commit | 6cb9e6dad798ec59f055aebe84a9c4a21e4be40d (patch) | |
| tree | 21a7d6c0b165251ba8e0f36e73c851d41ac9dd04 /sc/source | |
| parent | 7e8806cd728bf906e1a8f1d649bef7337f297b1c (diff) | |
Remove redundant 'inline' keyword
...from function definitions occurring within class definitions. Done with
a rewriting Clang plugin (to be pushed later).
Change-Id: I9c6f2818a57ccdb361548895a7743107cbacdff8
Reviewed-on: https://gerrit.libreoffice.org/34874
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc/source')
115 files changed, 825 insertions, 825 deletions
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index 4d2487153f31..1a67cb577fc4 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -570,15 +570,15 @@ namespace { struct ScDPSaveGroupDimNameFunc { OUString maDimName; - inline explicit ScDPSaveGroupDimNameFunc( const OUString& rDimName ) : maDimName( rDimName ) {} - inline bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetGroupDimName() == maDimName; } + explicit ScDPSaveGroupDimNameFunc( const OUString& rDimName ) : maDimName( rDimName ) {} + bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetGroupDimName() == maDimName; } }; struct ScDPSaveGroupSourceNameFunc { OUString maSrcDimName; - inline explicit ScDPSaveGroupSourceNameFunc( const OUString& rSrcDimName ) : maSrcDimName( rSrcDimName ) {} - inline bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetSourceDimName() == maSrcDimName; } + explicit ScDPSaveGroupSourceNameFunc( const OUString& rSrcDimName ) : maSrcDimName( rSrcDimName ) {} + bool operator()( const ScDPSaveGroupDimension& rGroupDim ) const { return rGroupDim.GetSourceDimName() == maSrcDimName; } }; } // namespace diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 965d843aafc1..2bc0e99a3284 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -166,7 +166,7 @@ public: /** Returns the drawing layer page of the sheet contained in maPos. */ SdrPage* GetDrawPage(); /** Returns the caption drawing object. */ - inline ScCaptionPtr GetCaption() { return mxCaption; } + ScCaptionPtr GetCaption() { return mxCaption; } /** Moves the caption inside the passed rectangle. Uses page area if 0 is passed. */ void FitCaptionToRect( const Rectangle* pVisRect = nullptr ); @@ -188,7 +188,7 @@ private: /** Initializes all members. */ void Initialize(); /** Returns the passed rectangle if existing, page rectangle otherwise. */ - inline const Rectangle& GetVisRect( const Rectangle* pVisRect ) const { return pVisRect ? *pVisRect : maPageRect; } + const Rectangle& GetVisRect( const Rectangle* pVisRect ) const { return pVisRect ? *pVisRect : maPageRect; } private: ScDocument& mrDoc; diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 08d2d6bcd1a6..f7d921b530e7 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -555,7 +555,7 @@ namespace { class ScStringTokenIterator { public: - inline explicit ScStringTokenIterator( ScTokenArray& rTokArr ) : + explicit ScStringTokenIterator( ScTokenArray& rTokArr ) : mrTokArr( rTokArr ), mbSkipEmpty( true ), mbOk( true ) {} /** Returns the string of the first string token or NULL on error or empty token array. */ @@ -564,7 +564,7 @@ public: rtl_uString* Next(); /** Returns false, if a wrong token has been found. Does NOT return false on end of token array. */ - inline bool Ok() const { return mbOk; } + bool Ok() const { return mbOk; } private: svl::SharedString maCurString; /// Current string. diff --git a/sc/source/core/inc/arraysumfunctor.hxx b/sc/source/core/inc/arraysumfunctor.hxx index d94bf74240a3..13f69d9cf62a 100644 --- a/sc/source/core/inc/arraysumfunctor.hxx +++ b/sc/source/core/inc/arraysumfunctor.hxx @@ -94,7 +94,7 @@ public: } private: - inline double executeSSE2(size_t& i, const double* pCurrent) const + double executeSSE2(size_t& i, const double* pCurrent) const { #if defined(LO_SSE2_AVAILABLE) double fSum = 0.0; @@ -144,7 +144,7 @@ private: #endif } - inline double executeUnrolled(size_t& i, const double* pCurrent) const + double executeUnrolled(size_t& i, const double* pCurrent) const { size_t nRealSize = mnSize - i; size_t nUnrolledSize = nRealSize - (nRealSize % 4); diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index 654edc078e16..b55c478656e7 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -66,20 +66,20 @@ public: ScBroadcastArea( const ScRange& rRange ); - inline SvtBroadcaster& GetBroadcaster() { return aBroadcaster; } - inline const SvtBroadcaster& GetBroadcaster() const { return aBroadcaster; } - inline void UpdateRange( const ScRange& rNewRange ) + SvtBroadcaster& GetBroadcaster() { return aBroadcaster; } + const SvtBroadcaster& GetBroadcaster() const { return aBroadcaster; } + void UpdateRange( const ScRange& rNewRange ) { aRange = rNewRange; } - inline const ScRange& GetRange() const { return aRange; } - inline void IncRef() { ++nRefCount; } - inline sal_uLong DecRef() { return nRefCount ? --nRefCount : 0; } - inline sal_uLong GetRef() { return nRefCount; } - inline ScBroadcastArea* GetUpdateChainNext() const { return pUpdateChainNext; } - inline void SetUpdateChainNext( ScBroadcastArea* p ) { pUpdateChainNext = p; } - inline bool IsInUpdateChain() const { return mbInUpdateChain; } - inline void SetInUpdateChain( bool b ) { mbInUpdateChain = b; } - - inline bool IsGroupListening() const { return mbGroupListening; } + const ScRange& GetRange() const { return aRange; } + void IncRef() { ++nRefCount; } + sal_uLong DecRef() { return nRefCount ? --nRefCount : 0; } + sal_uLong GetRef() { return nRefCount; } + ScBroadcastArea* GetUpdateChainNext() const { return pUpdateChainNext; } + void SetUpdateChainNext( ScBroadcastArea* p ) { pUpdateChainNext = p; } + bool IsInUpdateChain() const { return mbInUpdateChain; } + void SetInUpdateChain( bool b ) { mbInUpdateChain = b; } + + bool IsGroupListening() const { return mbGroupListening; } void SetGroupListening( bool b ) { mbGroupListening = b; } /** Equalness of this or range. */ @@ -265,14 +265,14 @@ private: public: TableSlots(); ~TableSlots(); - inline ScBroadcastAreaSlot** getSlots() { return ppSlots; } + ScBroadcastAreaSlot** getSlots() { return ppSlots; } /** Obtain slot pointer, no check on validity! It is assumed that all calls are made with the results of ComputeSlotOffset(), ComputeAreaPoints() and ComputeNextSlot() */ - inline ScBroadcastAreaSlot* getAreaSlot( SCSIZE nOff ) { return *(ppSlots + nOff); } + ScBroadcastAreaSlot* getAreaSlot( SCSIZE nOff ) { return *(ppSlots + nOff); } private: ScBroadcastAreaSlot** ppSlots; @@ -327,10 +327,10 @@ public: /// @return: how many removed size_t RemoveBulkArea( const ScBroadcastArea* p ); - inline void SetUpdateChain( ScBroadcastArea* p ) { pUpdateChain = p; } - inline ScBroadcastArea* GetEOUpdateChain() const { return pEOUpdateChain; } - inline void SetEOUpdateChain( ScBroadcastArea* p ) { pEOUpdateChain = p; } - inline bool IsInBulkBroadcast() const { return nInBulkBroadcast > 0; } + void SetUpdateChain( ScBroadcastArea* p ) { pUpdateChain = p; } + ScBroadcastArea* GetEOUpdateChain() const { return pEOUpdateChain; } + void SetEOUpdateChain( ScBroadcastArea* p ) { pEOUpdateChain = p; } + bool IsInBulkBroadcast() const { return nInBulkBroadcast > 0; } // only for ScBroadcastAreaSlot void PushAreaToBeErased( ScBroadcastAreaSlot* pSlot, diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index bbd18ddd5c17..ae47fc4e1b11 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -289,7 +289,7 @@ void PushTempTokenWithoutError( const formula::FormulaToken* ); If nGlobalError is not set do nothing. Used in PushTempToken() and alike to simplify handling. @return: <TRUE/> if nGlobalError. */ -inline bool IfErrorPushError() +bool IfErrorPushError() { if (nGlobalError != FormulaError::NONE) { @@ -441,7 +441,7 @@ void ScTableOp(); // repeated operations // common helper functions -inline void CurFmtToFuncFmt() +void CurFmtToFuncFmt() { nFuncFmtType = nCurFmtType; nFuncFmtIndex = nCurFmtIndex; } /** Check if a double is suitable as string position or length argument. diff --git a/sc/source/core/inc/parclass.hxx b/sc/source/core/inc/parclass.hxx index 4df70f098d6f..004c82c253c4 100644 --- a/sc/source/core/inc/parclass.hxx +++ b/sc/source/core/inc/parclass.hxx @@ -86,7 +86,7 @@ public: /** Whether OpCode has a parameter of type ForceArray or ReferenceOrForceArray. */ - static inline bool HasForceArray( OpCode eOp) + static bool HasForceArray( OpCode eOp) { return 0 <= (short)eOp && eOp <= SC_OPCODE_LAST_OPCODE_ID && diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index efd1029e0dd5..574273417fb6 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -48,7 +48,7 @@ namespace { struct MatrixAdd : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + double operator() (const double& lhs, const double& rhs) const { return ::rtl::math::approxAdd( lhs,rhs); } @@ -56,7 +56,7 @@ struct MatrixAdd : public ::std::binary_function<double,double,double> struct MatrixSub : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + double operator() (const double& lhs, const double& rhs) const { return ::rtl::math::approxSub( lhs,rhs); } @@ -64,7 +64,7 @@ struct MatrixSub : public ::std::binary_function<double,double,double> struct MatrixMul : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + double operator() (const double& lhs, const double& rhs) const { return lhs * rhs; } @@ -72,7 +72,7 @@ struct MatrixMul : public ::std::binary_function<double,double,double> struct MatrixDiv : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + double operator() (const double& lhs, const double& rhs) const { return ScInterpreter::div( lhs,rhs); } @@ -80,7 +80,7 @@ struct MatrixDiv : public ::std::binary_function<double,double,double> struct MatrixPow : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + double operator() (const double& lhs, const double& rhs) const { return ::pow( lhs,rhs); } diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 181eb60dc20e..c7db4c085302 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -238,7 +238,7 @@ struct XclExpChRootData : public XclChRootData XclChFrBlockVector maWrittenFrBlocks; /// Stack of future record levels already written out. XclChFrBlockVector maUnwrittenFrBlocks; /// Stack of future record levels not yet written out. - inline explicit XclExpChRootData( XclExpChChart& rChartData ) : mrChartData( rChartData ) {} + explicit XclExpChRootData( XclExpChChart& rChartData ) : mrChartData( rChartData ) {} /** Registers a new future record level. */ void RegisterFutureRecBlock( const XclChFrBlock& rFrBlock ); diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index dae805f4222c..126e139595ed 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -62,14 +62,14 @@ struct XclExpHashEntry { const XclExpString* mpString; /// Pointer to the string (no ownership). sal_uInt32 mnSstIndex; /// The SST index of this string. - inline explicit XclExpHashEntry( const XclExpString* pString, sal_uInt32 nSstIndex ) : + explicit XclExpHashEntry( const XclExpString* pString, sal_uInt32 nSstIndex ) : mpString( pString ), mnSstIndex( nSstIndex ) {} }; /** Function object for strict weak ordering. */ struct XclExpHashEntrySWO { - inline bool operator()( const XclExpHashEntry& rLeft, const XclExpHashEntry& rRight ) const + bool operator()( const XclExpHashEntry& rLeft, const XclExpHashEntry& rRight ) const { return *rLeft.mpString < *rRight.mpString; } }; diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 93261215d9d9..79dce1e5bdc6 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -57,10 +57,10 @@ struct XclExpScToken const FormulaToken* mpScToken; /// Currently processed Calc token. sal_uInt8 mnSpaces; /// Number of spaces before the Calc token. - inline explicit XclExpScToken() : mpScToken( nullptr ), mnSpaces( 0 ) {} - inline bool Is() const { return mpScToken != nullptr; } - inline StackVar GetType() const { return mpScToken ? mpScToken->GetType() : static_cast< StackVar >( svUnknown ); } - inline OpCode GetOpCode() const { return mpScToken ? mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); } + explicit XclExpScToken() : mpScToken( nullptr ), mnSpaces( 0 ) {} + bool Is() const { return mpScToken != nullptr; } + StackVar GetType() const { return mpScToken ? mpScToken->GetType() : static_cast< StackVar >( svUnknown ); } + OpCode GetOpCode() const { return mpScToken ? mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); } }; /** Effective token class conversion types. */ @@ -83,7 +83,7 @@ struct XclExpTokenConvInfo or for all parameters of a function. */ struct XclExpOperandList : public std::vector< XclExpTokenConvInfo > { - inline explicit XclExpOperandList() { reserve( 2 ); } + explicit XclExpOperandList() { reserve( 2 ); } void AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv eConv, bool bValType ); }; @@ -106,7 +106,7 @@ struct XclExpExtFuncData bool mbVBasic; /// True = Visual Basic macro call. bool mbHidden; /// True = Create hidden defined name. - inline explicit XclExpExtFuncData() : mbVBasic( false ), mbHidden( false ) {} + explicit XclExpExtFuncData() : mbVBasic( false ), mbHidden( false ) {} void Set( const OUString& rFuncName, bool bVBasic, bool bHidden ); }; @@ -126,30 +126,30 @@ public: const XclFunctionInfo& rFuncInfo, const XclExpExtFuncData& rExtFuncData ); - inline const FormulaToken& GetScToken() const { return *mrTokData.mpScToken; } - inline OpCode GetOpCode() const { return mrFuncInfo.meOpCode; } - inline sal_uInt16 GetXclFuncIdx() const { return mrFuncInfo.mnXclFunc; } - inline bool IsVolatile() const { return mrFuncInfo.IsVolatile(); } - inline bool IsFixedParamCount() const { return mrFuncInfo.IsFixedParamCount(); } - inline bool IsAddInEquivalent() const { return mrFuncInfo.IsAddInEquivalent(); } - inline bool IsMacroFunc() const { return mrFuncInfo.IsMacroFunc(); } - inline sal_uInt8 GetSpaces() const { return mrTokData.mnSpaces; } - inline const XclExpExtFuncData& GetExtFuncData() const { return maExtFuncData; } - inline sal_uInt8 GetReturnClass() const { return mrFuncInfo.mnRetClass; } + const FormulaToken& GetScToken() const { return *mrTokData.mpScToken; } + OpCode GetOpCode() const { return mrFuncInfo.meOpCode; } + sal_uInt16 GetXclFuncIdx() const { return mrFuncInfo.mnXclFunc; } + bool IsVolatile() const { return mrFuncInfo.IsVolatile(); } + bool IsFixedParamCount() const { return mrFuncInfo.IsFixedParamCount(); } + bool IsAddInEquivalent() const { return mrFuncInfo.IsAddInEquivalent(); } + bool IsMacroFunc() const { return mrFuncInfo.IsMacroFunc(); } + sal_uInt8 GetSpaces() const { return mrTokData.mnSpaces; } + const XclExpExtFuncData& GetExtFuncData() const { return maExtFuncData; } + sal_uInt8 GetReturnClass() const { return mrFuncInfo.mnRetClass; } const XclFuncParamInfo& GetParamInfo() const; bool IsCalcOnlyParam() const; bool IsExcelOnlyParam() const; void IncParamInfoIdx(); - inline sal_uInt8 GetMinParamCount() const { return mrFuncInfo.mnMinParamCount; } - inline sal_uInt8 GetMaxParamCount() const { return mrFuncInfo.mnMaxParamCount; } - inline sal_uInt8 GetParamCount() const { return static_cast< sal_uInt8 >( mxOperands->size() ); } + sal_uInt8 GetMinParamCount() const { return mrFuncInfo.mnMinParamCount; } + sal_uInt8 GetMaxParamCount() const { return mrFuncInfo.mnMaxParamCount; } + sal_uInt8 GetParamCount() const { return static_cast< sal_uInt8 >( mxOperands->size() ); } void FinishParam( sal_uInt16 nTokPos ); const XclExpOperandListRef& GetOperandList() const { return mxOperands; } - inline ScfUInt16Vec& GetAttrPosVec() { return maAttrPosVec; } - inline void AppendAttrPos( sal_uInt16 nPos ) { maAttrPosVec.push_back( nPos ); } + ScfUInt16Vec& GetAttrPosVec() { return maAttrPosVec; } + void AppendAttrPos( sal_uInt16 nPos ) { maAttrPosVec.push_back( nPos ); } private: ScfUInt16Vec maAttrPosVec; /// Token array positions of tAttr tokens. @@ -315,7 +315,7 @@ public: private: const XclExpCompConfig* GetConfigForType( XclFormulaType eType ) const; - inline sal_uInt16 GetSize() const { return static_cast< sal_uInt16 >( mxData->maTokVec.size() ); } + sal_uInt16 GetSize() const { return static_cast< sal_uInt16 >( mxData->maTokVec.size() ); } void Init( XclFormulaType eType ); void Init( XclFormulaType eType, const ScTokenArray& rScTokArr, diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 8ecd71762587..46a7e779eba3 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -54,7 +54,7 @@ public: const OUString& rName, sal_uInt16 nFlags = 0 ); /** Returns the name string of the external name. */ - inline const OUString& GetName() const { return maName; } + const OUString& GetName() const { return maName; } private: /** Writes the start of the record that is equal in all EXTERNNAME records and calls WriteAddData(). */ @@ -197,7 +197,7 @@ public: ScExternalRefCache::TableTypeRef const & xCacheTable ); /** Returns the external sheet name. */ - inline const XclExpString& GetTabName() const { return maTabName; } + const XclExpString& GetTabName() const { return maTabName; } /** Stores all cells in the given range in the CRN list. */ void StoreCellRange( const ScRange& rRange ); @@ -373,12 +373,12 @@ struct XclExpXti sal_uInt16 mnFirstSBTab; /// Index to the first sheet of the range in the SUPBOOK. sal_uInt16 mnLastSBTab; /// Index to the last sheet of the range in the SUPBOOK. - inline explicit XclExpXti() : mnSupbook( 0 ), mnFirstSBTab( 0 ), mnLastSBTab( 0 ) {} - inline explicit XclExpXti( sal_uInt16 nSupbook, sal_uInt16 nFirstSBTab, sal_uInt16 nLastSBTab ) : + explicit XclExpXti() : mnSupbook( 0 ), mnFirstSBTab( 0 ), mnLastSBTab( 0 ) {} + explicit XclExpXti( sal_uInt16 nSupbook, sal_uInt16 nFirstSBTab, sal_uInt16 nLastSBTab ) : mnSupbook( nSupbook ), mnFirstSBTab( nFirstSBTab ), mnLastSBTab( nLastSBTab ) {} /** Writes this XTI structure (inside of the EXTERNSHEET record). */ - inline void Save( XclExpStream& rStrm ) const + void Save( XclExpStream& rStrm ) const { rStrm << mnSupbook << mnFirstSBTab << mnLastSBTab; } }; @@ -444,7 +444,7 @@ public: { sal_uInt16 mnSupbook; /// SUPBOOK index for an Excel sheet. sal_uInt16 mnSBTab; /// Sheet name index in SUPBOOK for an Excel sheet. - inline void Set( sal_uInt16 nSupbook, sal_uInt16 nSBTab ) + void Set( sal_uInt16 nSupbook, sal_uInt16 nSBTab ) { mnSupbook = nSupbook; mnSBTab = nSBTab; } }; typedef ::std::vector< XclExpSBIndex > XclExpSBIndexVec; diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index bfd76c6b2c28..fbedae44707b 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -61,18 +61,18 @@ public: void SetSymbol( const OUString& rValue ); /** Returns the original name (title) of this defined name. */ - inline const OUString& GetOrigName() const { return maOrigName; } + const OUString& GetOrigName() const { return maOrigName; } /** Returns the Excel built-in name index of this defined name. @return The built-in name index or EXC_BUILTIN_UNKNOWN for user-defined names. */ - inline sal_Unicode GetBuiltInName() const { return mcBuiltIn; } + sal_Unicode GetBuiltInName() const { return mcBuiltIn; } /** Returns the token array for this defined name. */ const XclTokenArrayRef& GetTokenArray() const { return mxTokArr; } /** Returns true, if this is a document-global defined name. */ - inline bool IsGlobal() const { return mnXclTab == EXC_NAME_GLOBAL; } + bool IsGlobal() const { return mnXclTab == EXC_NAME_GLOBAL; } /** Returns the Calc sheet of a local defined name. */ - inline SCTAB GetScTab() const { return mnScTab; } + SCTAB GetScTab() const { return mnScTab; } /** Returns true, if this defined name is volatile. */ bool IsVolatile() const; diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index 7a388d805500..442395596b0e 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -63,12 +63,12 @@ struct XclHasher : public ::std::unary_function< Type, sal_uInt32 > {}; template< typename Type > struct XclDirectHasher : public XclHasher< Type > { - inline sal_uInt32 operator()( Type nVal ) const { return nVal; } + sal_uInt32 operator()( Type nVal ) const { return nVal; } }; struct XclFormatRunHasher : public XclHasher< const XclFormatRun& > { - inline sal_uInt32 operator()( const XclFormatRun& rRun ) const + sal_uInt32 operator()( const XclFormatRun& rRun ) const { return (rRun.mnChar << 8) ^ rRun.mnFontIdx; } }; diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index ab7dd9dff35e..529b086afe2b 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -139,16 +139,16 @@ public: explicit XclListColor( const Color& rColor, sal_uInt32 nColorId ); /** Returns the RGB color value of the color. */ - inline const Color& GetColor() const { return maColor; } + const Color& GetColor() const { return maColor; } /** Returns the unique ID of the color. */ - inline sal_uInt32 GetColorId() const { return mnColorId; } + sal_uInt32 GetColorId() const { return mnColorId; } /** Returns the current weighting of the color. */ - inline sal_uInt32 GetWeighting() const { return mnWeight; } + sal_uInt32 GetWeighting() const { return mnWeight; } /** Returns true, if this color is a base color, i.e. it will not be removed or merged. */ - inline bool IsBaseColor() const { return mbBaseColor; } + bool IsBaseColor() const { return mbBaseColor; } /** Adds the passed weighting to this color. */ - inline void AddWeighting( sal_uInt32 nWeight ) { mnWeight += nWeight; } + void AddWeighting( sal_uInt32 nWeight ) { mnWeight += nWeight; } /** Merges this color with rColor, regarding weighting settings. */ void Merge( const XclListColor& rColor ); }; @@ -185,7 +185,7 @@ struct XclColorIdData Color maColor; /// The original inserted color. sal_uInt32 mnIndex; /// Maps current color ID to color list or export color vector. /** Sets the contents of this struct. */ - inline void Set( const Color& rColor, sal_uInt32 nIndex ) { maColor = rColor; mnIndex = nIndex; } + void Set( const Color& rColor, sal_uInt32 nIndex ) { maColor = rColor; mnIndex = nIndex; } }; /** A color that will be written to the Excel file. */ @@ -194,8 +194,8 @@ struct XclPaletteColor Color maColor; /// Resulting color to export. bool mbUsed; /// true = Entry is used in the document. - inline explicit XclPaletteColor( const Color& rColor ) : maColor( rColor ), mbUsed( false ) {} - inline void SetColor( const Color& rColor ) { maColor = rColor; mbUsed = true; } + explicit XclPaletteColor( const Color& rColor ) : maColor( rColor ), mbUsed( false ) {} + void SetColor( const Color& rColor ) { maColor = rColor; mbUsed = true; } }; /** Maps a color list index to a palette index. @@ -205,8 +205,8 @@ struct XclRemap sal_uInt32 mnPalIndex; /// Index to palette. bool mbProcessed; /// true = List color already processed. - inline explicit XclRemap() : mnPalIndex( 0 ), mbProcessed( false ) {} - inline void SetIndex( sal_uInt32 nPalIndex ) + explicit XclRemap() : mnPalIndex( 0 ), mbProcessed( false ) {} + void SetIndex( sal_uInt32 nPalIndex ) { mnPalIndex = nPalIndex; mbProcessed = true; } }; @@ -216,7 +216,7 @@ struct XclNearest sal_uInt32 mnPalIndex; /// Index to nearest palette color. sal_Int32 mnDist; /// Distance to palette color. - inline explicit XclNearest() : mnPalIndex( 0 ), mnDist( 0 ) {} + explicit XclNearest() : mnPalIndex( 0 ), mnDist( 0 ) {} }; } // namespace @@ -259,7 +259,7 @@ public: private: /** Returns the Excel index of a 0-based color index. */ - static inline sal_uInt16 GetXclIndex( sal_uInt32 nIndex ) + static sal_uInt16 GetXclIndex( sal_uInt32 nIndex ) { return static_cast< sal_uInt16 >( nIndex + EXC_COLOR_USEROFFSET ); } /** Returns the original inserted color represented by the color ID nColorId. */ @@ -1331,8 +1331,8 @@ size_t XclExpFontBuffer::Find( const XclFontData& rFontData ) struct XclExpNumFmtPred { sal_uLong mnScNumFmt; - inline explicit XclExpNumFmtPred( sal_uLong nScNumFmt ) : mnScNumFmt( nScNumFmt ) {} - inline bool operator()( const XclExpNumFmt& rFormat ) const + explicit XclExpNumFmtPred( sal_uLong nScNumFmt ) : mnScNumFmt( nScNumFmt ) {} + bool operator()( const XclExpNumFmt& rFormat ) const { return rFormat.mnScNumFmt == mnScNumFmt; } }; @@ -2379,7 +2379,7 @@ struct XclExpBorderPred { const XclExpCellBorder& mrBorder; - inline explicit XclExpBorderPred( const XclExpCellBorder& rBorder ) : mrBorder( rBorder ) {} + explicit XclExpBorderPred( const XclExpCellBorder& rBorder ) : mrBorder( rBorder ) {} bool operator()( const XclExpCellBorder& rBorder ) const; }; @@ -2409,7 +2409,7 @@ struct XclExpFillPred { const XclExpCellArea& mrFill; - inline explicit XclExpFillPred( const XclExpCellArea& rFill ) : mrFill( rFill ) {} + explicit XclExpFillPred( const XclExpCellArea& rFill ) : mrFill( rFill ) {} bool operator()( const XclExpCellArea& rFill ) const; }; diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 1dcde34ff7ff..d7fb26f5a7f0 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -206,7 +206,7 @@ struct XclImpChRootData : public XclChRootData { XclImpChChart& mrChartData; /// The chart data object. - inline explicit XclImpChRootData( XclImpChChart& rChartData ) : mrChartData( rChartData ) {} + explicit XclImpChRootData( XclImpChChart& rChartData ) : mrChartData( rChartData ) {} }; XclImpChRoot::XclImpChRoot( const XclImpRoot& rRoot, XclImpChChart& rChartData ) : diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 25c2ecee968a..1784a5610be2 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -65,7 +65,7 @@ public: The sheet index is set while creating the Calc sheet with CreateTable(). */ explicit XclImpSupbookTab( const OUString& rTabName ); - inline const OUString& GetTabName() const { return maTabName; } + const OUString& GetTabName() const { return maTabName; } /** Reads a CRN record (external referenced cell) at the specified address. */ void ReadCrn( XclImpStream& rStrm, const XclAddress& rXclPos ); @@ -99,10 +99,10 @@ public: void ReadExternname( XclImpStream& rStrm, ExcelToSc* pFormulaConv ); /** Returns the SUPBOOK record type. */ - inline XclSupbookType GetType() const { return meType; } + XclSupbookType GetType() const { return meType; } /** Returns the URL of the external document. */ - inline const OUString& GetXclUrl() const { return maXclUrl; } + const OUString& GetXclUrl() const { return maXclUrl; } /** Returns the external name specified by an index from the Excel document (one-based). */ const XclImpExtName* GetExternName( sal_uInt16 nXclIndex ) const; @@ -143,7 +143,7 @@ struct XclImpXti sal_uInt16 mnSupbook; /// Index to SUPBOOK record. sal_uInt16 mnSBTabFirst; /// Index to the first sheet of the range in the SUPBOOK. sal_uInt16 mnSBTabLast; /// Index to the last sheet of the range in the SUPBOOK. - inline explicit XclImpXti() : mnSupbook( SAL_MAX_UINT16 ), mnSBTabFirst( SAL_MAX_UINT16 ), mnSBTabLast( SAL_MAX_UINT16 ) {} + explicit XclImpXti() : mnSupbook( SAL_MAX_UINT16 ), mnSBTabFirst( SAL_MAX_UINT16 ), mnSBTabLast( SAL_MAX_UINT16 ) {} }; inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti ) diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index b7111bc57c57..d7e6c5a9ef82 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -1588,7 +1588,7 @@ namespace { /** Functor for case-insensitive string comparison, usable in maps etc. */ struct IgnoreCaseCompare { - inline bool operator()( const OUString& rName1, const OUString& rName2 ) const + bool operator()( const OUString& rName1, const OUString& rName2 ) const { return rName1.compareToIgnoreAsciiCase( rName2 ) < 0; } }; diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 2c0ea0f1862d..374fc6256b21 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -387,15 +387,15 @@ const XclCodePageEntry* const pCodePageTableEnd = std::end(pCodePageTable); struct XclCodePageEntry_CPPred { - inline explicit XclCodePageEntry_CPPred( sal_uInt16 nCodePage ) : mnCodePage( nCodePage ) {} - inline bool operator()( const XclCodePageEntry& rEntry ) const { return rEntry.mnCodePage == mnCodePage; } + explicit XclCodePageEntry_CPPred( sal_uInt16 nCodePage ) : mnCodePage( nCodePage ) {} + bool operator()( const XclCodePageEntry& rEntry ) const { return rEntry.mnCodePage == mnCodePage; } sal_uInt16 mnCodePage; }; struct XclCodePageEntry_TEPred { - inline explicit XclCodePageEntry_TEPred( rtl_TextEncoding eTextEnc ) : meTextEnc( eTextEnc ) {} - inline bool operator()( const XclCodePageEntry& rEntry ) const { return rEntry.meTextEnc == meTextEnc; } + explicit XclCodePageEntry_TEPred( rtl_TextEncoding eTextEnc ) : meTextEnc( eTextEnc ) {} + bool operator()( const XclCodePageEntry& rEntry ) const { return rEntry.meTextEnc == meTextEnc; } rtl_TextEncoding meTextEnc; }; diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index aa28b5bc913f..5e31859b0d37 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -1783,8 +1783,8 @@ private: public: explicit ScHTMLTableMap( ScHTMLTable& rParentTable ); - inline const_iterator begin() const { return maTables.begin(); } - inline const_iterator end() const { return maTables.end(); } + const_iterator begin() const { return maTables.begin(); } + const_iterator end() const { return maTables.end(); } /** Returns the specified table. @param nTableId Unique identifier of the table. @@ -1797,7 +1797,7 @@ public: private: /** Sets a working table with its index for search optimization. */ - inline void SetCurrTable( ScHTMLTable* pTable ) const + void SetCurrTable( ScHTMLTable* pTable ) const { if( pTable ) mpCurrTable = pTable; } }; @@ -1849,9 +1849,9 @@ public: @param pTableMap Pointer to the table map (is allowed to be NULL). */ explicit ScHTMLTableIterator( const ScHTMLTableMap* pTableMap ); - inline bool is() const { return mpTableMap && maIter != maEnd; } - inline ScHTMLTable* operator->() { return maIter->second.get(); } - inline ScHTMLTableIterator& operator++() { ++maIter; return *this; } + bool is() const { return mpTableMap && maIter != maEnd; } + ScHTMLTable* operator->() { return maIter->second.get(); } + ScHTMLTableIterator& operator++() { ++maIter; return *this; } private: ScHTMLTableMap::const_iterator maIter; diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 65d8dd4c0d62..cdf47298015b 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -50,7 +50,7 @@ private: public: XclExpUserBView( const OUString& rUsername, const sal_uInt8* pGUID ); - inline const sal_uInt8* GetGUID() const { return aGUID; } + const sal_uInt8* GetGUID() const { return aGUID; } virtual sal_uInt16 GetNum() const override; virtual std::size_t GetLen() const override; @@ -70,8 +70,8 @@ public: XclExpUserBViewList( const ScChangeTrack& rChangeTrack ); virtual ~XclExpUserBViewList() override; - inline const_iterator cbegin () { return aViews.cbegin(); } - inline const_iterator cend () { return aViews.cend(); } + const_iterator cbegin () { return aViews.cbegin(); } + const_iterator cend () { return aViews.cend(); } virtual void Save( XclExpStream& rStrm ) override; }; @@ -160,7 +160,7 @@ private: sal_uInt16 nRecNum; public: - inline XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {} + XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {} virtual ~XclExpChTrEmpty() override; virtual sal_uInt16 GetNum() const override; @@ -216,11 +216,11 @@ private: virtual void SaveCont( XclExpStream& rStrm ) override; public: - inline XclExpChTrHeader() : nCount( 0 ) {} + XclExpChTrHeader() : nCount( 0 ) {} virtual ~XclExpChTrHeader() override; - inline void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); } - inline void SetCount( sal_uInt32 nNew ) { nCount = nNew; } + void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); } + void SetCount( sal_uInt32 nNew ) { nCount = nNew; } virtual sal_uInt16 GetNum() const override; virtual std::size_t GetLen() const override; @@ -305,9 +305,9 @@ public: sal_uInt16 GetId( sal_uInt16 nIndex ) const; void Remove(); - inline sal_uInt16 GetBufferCount() const + sal_uInt16 GetBufferCount() const { return static_cast< sal_uInt16 >( (pLast - pBuffer.get()) + 1 ); } - inline void GetBufferCopy( sal_uInt16* pDest ) const + void GetBufferCopy( sal_uInt16* pDest ) const { memcpy( pDest, pBuffer.get(), sizeof(sal_uInt16) * GetBufferCount() ); } }; @@ -319,12 +319,12 @@ private: sal_uInt16* pBuffer; sal_uInt16 nTabCount; - inline void Clear() { delete[] pBuffer; pBuffer = nullptr; } + void Clear() { delete[] pBuffer; pBuffer = nullptr; } virtual void SaveCont( XclExpStream& rStrm ) override; public: - inline XclExpChTrTabId( sal_uInt16 nCount ) : + XclExpChTrTabId( sal_uInt16 nCount ) : pBuffer( nullptr ), nTabCount( nCount ) {} XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer ); virtual ~XclExpChTrTabId() override; @@ -369,7 +369,7 @@ protected: // save header data, call SaveActionData() virtual void SaveCont( XclExpStream& rStrm ) override; - static inline std::size_t GetHeaderByteCount() { return 12; } + static std::size_t GetHeaderByteCount() { return 12; } // override to save action data without header, called by SaveCont() virtual void SaveActionData( XclExpStream& rStrm ) const = 0; @@ -381,7 +381,7 @@ protected: // do something after writing the record virtual void CompleteSaveAction( XclExpStream& rStrm ) const; - inline bool GetAccepted() const { return bAccepted; } + bool GetAccepted() const { return bAccepted; } public: XclExpChTrAction( @@ -391,10 +391,10 @@ public: sal_uInt16 nNewOpCode = EXC_CHTR_OP_UNKNOWN ); virtual ~XclExpChTrAction() override; - inline const OUString& GetUsername() const { return sUsername; } - inline const DateTime& GetDateTime() const { return aDateTime; } - inline const XclExpChTrTabIdBuffer& GetTabIdBuffer() const { return rIdBuffer; } - inline bool ForceInfoRecord() const { return bForceInfo; } + const OUString& GetUsername() const { return sUsername; } + const DateTime& GetDateTime() const { return aDateTime; } + const XclExpChTrTabIdBuffer& GetTabIdBuffer() const { return rIdBuffer; } + bool ForceInfoRecord() const { return bForceInfo; } // set own index & return new index // could override to use more indexes per action @@ -403,8 +403,8 @@ public: virtual void Save( XclExpStream& rStrm ) override; virtual std::size_t GetLen() const override; - inline XclExpChTrAction* GetAddAction() { return pAddAction.get(); } - inline sal_uInt32 GetActionNumber() const { return nIndex; } + XclExpChTrAction* GetAddAction() { return pAddAction.get(); } + sal_uInt32 GetActionNumber() const { return nIndex; } }; inline void XclExpChTrAction::Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index f38e53ecc5c3..82e1f2bb74af 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -63,7 +63,7 @@ private: enum { nmBase, nmFound, nmNested } eNestedMode; // action with nested content actions - inline bool FoundNestedMode() { return eNestedMode == nmFound; } + bool FoundNestedMode() { return eNestedMode == nmFound; } void DoAcceptRejectAction( ScChangeAction* pAction ); void DoAcceptRejectAction( sal_uInt32 nFirst, sal_uInt32 nLast ); diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index a72e66109106..713476b8a572 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -34,9 +34,9 @@ struct BinAddress sal_Int32 mnCol; sal_Int32 mnRow; - inline explicit BinAddress() : mnCol( 0 ), mnRow( 0 ) {} - inline explicit BinAddress( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} - inline explicit BinAddress( const ScAddress& rAddr ) : mnCol( rAddr.Col() ), mnRow( rAddr.Row() ) {} + explicit BinAddress() : mnCol( 0 ), mnRow( 0 ) {} + explicit BinAddress( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} + explicit BinAddress( const ScAddress& rAddr ) : mnCol( rAddr.Col() ), mnRow( rAddr.Row() ) {} void read( SequenceInputStream& rStrm ); }; @@ -71,7 +71,7 @@ inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRange& or class BinRangeList { public: - inline explicit BinRangeList() : mvRanges() {} + explicit BinRangeList() : mvRanges() {} ::std::vector< BinRange >::const_iterator begin() const { return mvRanges.begin(); } ::std::vector< BinRange >::const_iterator end() const { return mvRanges.end(); } @@ -147,17 +147,17 @@ public: sal_Int32 nStart = 0 ); /** Returns the biggest valid cell address in the own Calc document. */ - inline const ScAddress& + const ScAddress& getMaxApiAddress() const { return maMaxApiPos; } /** Returns the biggest valid cell address in the imported/exported Excel document. */ - inline const ScAddress& + const ScAddress& getMaxXlsAddress() const { return maMaxXlsPos; } /** Returns the biggest valid cell address in both Calc and the imported/exported Excel document. */ - inline const ScAddress& + const ScAddress& getMaxAddress() const { return maMaxPos; } /** Checks if the passed column index is valid. diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index f2aface35235..0f1cd52992a4 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -166,7 +166,7 @@ public: /** Creates and returns the specified filter settings object. */ template< typename FilterSettingsType > - inline FilterSettingsBase& createFilterSettings() + FilterSettingsBase& createFilterSettings() { mxSettings.reset( new FilterSettingsType( *this ) ); return *mxSettings; } /** Returns converted UNO API filter settings representing all filter diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index 5807ae6fca2e..4548ff6a9b4a 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -42,7 +42,7 @@ public: virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& o_rEncryptionData ) override; /** Returns true, if the decoder has been initialized correctly. */ - inline bool isValid() const { return mbValid; } + bool isValid() const { return mbValid; } private: /** Derived classes implement password verification and initialization of diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index a0c7aec5193b..cb7bbf4dbfd3 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -164,7 +164,7 @@ public: void finalizeImport(); /** Returns the priority of this rule. */ - inline sal_Int32 getPriority() const { return maModel.mnPriority; } + sal_Int32 getPriority() const { return maModel.mnPriority; } ColorScaleRule* getColorScale(); DataBarRule* getDataBar(); @@ -210,7 +210,7 @@ public: void finalizeImport(); /** Returns the cell ranges this conditional formatting belongs to. */ - inline const ScRangeList& getRanges() const { return maModel.maRanges; } + const ScRangeList& getRanges() const { return maModel.maRanges; } void setReadyForFinalize() { mbReadyForFinalize = true; } private: diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx index fefdef0313b6..3c29cc33d05d 100644 --- a/sc/source/filter/inc/connectionsbuffer.hxx +++ b/sc/source/filter/inc/connectionsbuffer.hxx @@ -114,9 +114,9 @@ public: void importWebPrTable( SequenceInputStream& rStrm, sal_Int32 nRecId ); /** Returns the unique connection identifier. */ - inline sal_Int32 getConnectionId() const { return maModel.mnId; } + sal_Int32 getConnectionId() const { return maModel.mnId; } /** Returns the source data type of the connection. */ - inline sal_Int32 getConnectionType() const { return maModel.mnType; } + sal_Int32 getConnectionType() const { return maModel.mnType; } /** Returns read-only access to the connection model data. */ const ConnectionModel& getModel() const { return maModel; } diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index fed44d83916c..b0d24739e67e 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -68,9 +68,9 @@ public: explicit DefinedNameBase( const WorkbookHelper& rHelper ); /** Returns the original name as imported from or exported to the file. */ - inline const OUString& getModelName() const { return maModel.maName; } + const OUString& getModelName() const { return maModel.maName; } /** Returns the name as used in the Calc document. */ - inline const OUString& getCalcName() const { return maCalcName; } + const OUString& getCalcName() const { return maCalcName; } /** Returns the original name as imported from or exported to the file. */ const OUString& getUpcaseModelName() const; @@ -102,20 +102,20 @@ public: void convertFormula( const css::uno::Sequence<css::sheet::ExternalLinkInfo>& rExternalLinks ); std::unique_ptr<ScTokenArray> getScTokens( const css::uno::Sequence<css::sheet::ExternalLinkInfo>& rExternalLinks ); /** Returns true, if this defined name is global in the document. */ - inline bool isGlobalName() const { return mnCalcSheet < 0; } + bool isGlobalName() const { return mnCalcSheet < 0; } /** Returns true, if this defined name is a special builtin name. */ - inline bool isBuiltinName() const { return mcBuiltinId != BIFF_DEFNAME_UNKNOWN; } + bool isBuiltinName() const { return mcBuiltinId != BIFF_DEFNAME_UNKNOWN; } /** Returns true, if this defined name is a macro function call. */ - inline bool isMacroFunction() const { return maModel.mbMacro && maModel.mbFunction; } + bool isMacroFunction() const { return maModel.mbMacro && maModel.mbFunction; } /** Returns true, if this defined name is a reference to a VBA macro. */ - inline bool isVBName() const { return maModel.mbMacro && maModel.mbVBName; } + bool isVBName() const { return maModel.mbMacro && maModel.mbVBName; } /** Returns the 0-based sheet index for local names, or -1 for global names. */ - inline sal_Int16 getLocalCalcSheet() const { return mnCalcSheet; } + sal_Int16 getLocalCalcSheet() const { return mnCalcSheet; } /** Returns the built-in identifier of the defined name. */ - inline sal_Unicode getBuiltinId() const { return mcBuiltinId; } + sal_Unicode getBuiltinId() const { return mcBuiltinId; } /** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */ - inline sal_Int32 getTokenIndex() const { return mnTokenIndex; } + sal_Int32 getTokenIndex() const { return mnTokenIndex; } /** Tries to resolve the defined name to an absolute cell range. */ bool getAbsoluteRange( ScRange& orRange ) const; diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx index ff2ca068e64d..ae1662bf6ab2 100644 --- a/sc/source/filter/inc/drawingbase.hxx +++ b/sc/source/filter/inc/drawingbase.hxx @@ -30,15 +30,15 @@ namespace xls { /** Absolute position in a spreadsheet (in EMUs) independent from cells. */ struct AnchorPointModel : public ::oox::drawingml::EmuPoint { - inline explicit AnchorPointModel() : ::oox::drawingml::EmuPoint( -1, -1 ) {} - inline bool isValid() const { return (X >= 0) && (Y >= 0); } + explicit AnchorPointModel() : ::oox::drawingml::EmuPoint( -1, -1 ) {} + bool isValid() const { return (X >= 0) && (Y >= 0); } }; /** Absolute size in a spreadsheet (in EMUs). */ struct AnchorSizeModel : public ::oox::drawingml::EmuSize { - inline explicit AnchorSizeModel() : ::oox::drawingml::EmuSize( -1, -1 ) {} - inline bool isValid() const { return (Width >= 0) && (Height >= 0); } + explicit AnchorSizeModel() : ::oox::drawingml::EmuSize( -1, -1 ) {} + bool isValid() const { return (Width >= 0) && (Height >= 0); } }; /** Position in spreadsheet (cell position and offset inside cell). */ @@ -50,7 +50,7 @@ struct CellAnchorModel sal_Int64 mnRowOffset; /// Y offset inside the row. explicit CellAnchorModel(); - inline bool isValid() const { return (mnCol >= 0) && (mnRow >= 0); } + bool isValid() const { return (mnCol >= 0) && (mnRow >= 0); } }; /** Application-specific client data of a shape. */ diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index cbf746dfe729..88105a159f9f 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -124,7 +124,7 @@ public: void GetDimensions( SCCOL& nCols, SCROW& nRows ) const { nCols = nColMax; nRows = nRowMax; } - inline size_t ListSize() const{ return maList.size(); } + size_t ListSize() const{ return maList.size(); } ScEEParseEntry* ListEntry( size_t index ) { return maList[ index ]; } const ScEEParseEntry* ListEntry( size_t index ) const { return maList[ index ]; } }; diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx index 8d5391896c57..fa02e013b9eb 100644 --- a/sc/source/filter/inc/excelhandlers.hxx +++ b/sc/source/filter/inc/excelhandlers.hxx @@ -35,7 +35,7 @@ class WorkbookContextBase : public ::oox::core::ContextHandler2, public Workbook { public: template< typename ParentType > - inline explicit WorkbookContextBase( ParentType& rParent ) : + explicit WorkbookContextBase( ParentType& rParent ) : ::oox::core::ContextHandler2( rParent ), WorkbookHelper( rParent ) {} }; @@ -47,7 +47,7 @@ class WorksheetContextBase : public ::oox::core::ContextHandler2, public Workshe { public: template< typename ParentType > - inline explicit WorksheetContextBase( ParentType& rParent ) : + explicit WorksheetContextBase( ParentType& rParent ) : ::oox::core::ContextHandler2( rParent ), WorksheetHelper( rParent ) {} }; diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index 02fc8c4240fe..1c8cef4db240 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -87,20 +87,20 @@ public: RootData* pRoot, const ScRange& rRange); - inline bool IsActive() const { return bActive; } - inline bool IsFiltered() const { return bAutoOrAdvanced; } - inline SCTAB Tab() const { return aParam.nTab; } - inline SCCOL StartCol() const { return aParam.nCol1; } - inline SCROW StartRow() const { return aParam.nRow1; } - inline SCCOL EndCol() const { return aParam.nCol2; } - inline SCROW EndRow() const { return aParam.nRow2; } + bool IsActive() const { return bActive; } + bool IsFiltered() const { return bAutoOrAdvanced; } + SCTAB Tab() const { return aParam.nTab; } + SCCOL StartCol() const { return aParam.nCol1; } + SCROW StartRow() const { return aParam.nRow1; } + SCCOL EndCol() const { return aParam.nCol2; } + SCROW EndRow() const { return aParam.nRow2; } void ReadAutoFilter( XclImpStream& rStrm, svl::SharedStringPool& rPool ); - inline void Activate() { bActive = true; } + void Activate() { bActive = true; } void SetAdvancedRange( const ScRange* pRange ); void SetExtractPos( const ScAddress& rAddr ); - inline void SetAutoOrAdvanced() { bAutoOrAdvanced = true; } + void SetAutoOrAdvanced() { bAutoOrAdvanced = true; } void Apply(); void EnableRemoveFilter(); }; diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index a2997097214e..289444b1f7d6 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -97,7 +97,7 @@ private: protected: bool bVal; - inline ExcBoolRecord() : bVal( false ) {} + ExcBoolRecord() : bVal( false ) {} public: virtual std::size_t GetLen() const override; @@ -256,7 +256,7 @@ protected: public: ExcBundlesheetBase( RootData& rRootData, SCTAB nTab ); - inline void SetStreamPos(sal_uInt64 const nStrPos) { m_nStrPos = nStrPos; } + void SetStreamPos(sal_uInt64 const nStrPos) { m_nStrPos = nStrPos; } void UpdateStreamPos( XclExpStream& rStrm ); virtual sal_uInt16 GetNum() const override; @@ -338,8 +338,8 @@ class XclExpAutofilterinfo : public XclExpUInt16Record public: explicit XclExpAutofilterinfo( const ScAddress& rStartPos, SCCOL nScCol ); - inline const ScAddress& GetStartPos() const { return maStartPos; } - inline SCCOL GetColCount() const { return static_cast< SCCOL >( GetValue() ); } + const ScAddress& GetStartPos() const { return maStartPos; } + SCCOL GetColCount() const { return static_cast< SCCOL >( GetValue() ); } private: ScAddress maStartPos; @@ -359,7 +359,7 @@ public: ExcFilterCondition(); ~ExcFilterCondition(); - inline bool IsEmpty() const { return (nType == EXC_AFTYPE_NOTUSED); } + bool IsEmpty() const { return (nType == EXC_AFTYPE_NOTUSED); } std::size_t GetTextBytes() const; void SetCondition( sal_uInt8 nTp, sal_uInt8 nOp, double fV, OUString* pT ); @@ -388,8 +388,8 @@ private: public: XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC ); - inline sal_uInt16 GetCol() const { return nCol; } - inline bool HasTop10() const { return ::get_flag( nFlags, EXC_AFFLAG_TOP10 ); } + sal_uInt16 GetCol() const { return nCol; } + bool HasTop10() const { return ::get_flag( nFlags, EXC_AFFLAG_TOP10 ); } bool HasCondition() const; bool AddEntry( const ScQueryEntry& rEntry ); diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx index 38d436c6d61c..a33a37db6d8e 100644 --- a/sc/source/filter/inc/excscen.hxx +++ b/sc/source/filter/inc/excscen.hxx @@ -38,9 +38,9 @@ public: ExcScenarioCell( const sal_uInt16 nC, const sal_uInt16 nR ); - inline void SetValue( const OUString& rVal ) { aValue = rVal; } + void SetValue( const OUString& rVal ) { aValue = rVal; } - inline const OUString& GetValue() const { return aValue; } + const OUString& GetValue() const { return aValue; } }; class ExcScenario diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index db47ce23e0ce..7114daa4eddf 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -58,7 +58,7 @@ public: /** Appends the passed value to the result set. */ template< typename Type > - inline void appendResultValue( const Type& rValue ) + void appendResultValue( const Type& rValue ) { if( maCurrIt != maResults.end() ) (*maCurrIt++) <<= rValue; } /** Imports the definedName element. */ @@ -117,7 +117,7 @@ typedef std::shared_ptr< ExternalName > ExternalNameRef; class LinkSheetRange { public: - inline explicit LinkSheetRange() { setDeleted(); } + explicit LinkSheetRange() { setDeleted(); } /** Sets this struct to deleted state. */ void setDeleted(); @@ -129,17 +129,17 @@ public: void setExternalRange( sal_Int32 nDocLink, sal_Int32 nFirst, sal_Int32 nLast ); /** Returns true, if the sheet indexes are valid and different. */ - inline bool isDeleted() const { return mnFirst < 0; } + bool isDeleted() const { return mnFirst < 0; } /** Returns true, if the sheet range points to an external document. */ - inline bool isExternal() const { return !isDeleted() && (meType == LINKSHEETRANGE_EXTERNAL); } + bool isExternal() const { return !isDeleted() && (meType == LINKSHEETRANGE_EXTERNAL); } /** Returns true, if the sheet indexes are valid and different. */ - inline bool isSameSheet() const { return meType == LINKSHEETRANGE_SAMESHEET; } + bool isSameSheet() const { return meType == LINKSHEETRANGE_SAMESHEET; } /** Returns true, if the sheet indexes are valid and different. */ - inline bool is3dRange() const { return (0 <= mnFirst) && (mnFirst < mnLast); } + bool is3dRange() const { return (0 <= mnFirst) && (mnFirst < mnLast); } - inline sal_Int32 getDocLinkIndex() const { return mnDocLink; } - inline sal_Int32 getFirstSheet() const { return mnFirst; } - inline sal_Int32 getLastSheet() const { return mnLast; } + sal_Int32 getDocLinkIndex() const { return mnDocLink; } + sal_Int32 getFirstSheet() const { return mnFirst; } + sal_Int32 getLastSheet() const { return mnLast; } private: enum LinkSheetRangeType @@ -204,17 +204,17 @@ public: void importExternalAddin( SequenceInputStream& rStrm ); /** Sets the link type to 'self reference'. */ - inline void setSelfLinkType() { meLinkType = ExternalLinkType::Self; } + void setSelfLinkType() { meLinkType = ExternalLinkType::Self; } /** Returns the type of this external link. */ - inline ExternalLinkType getLinkType() const { return meLinkType; } + ExternalLinkType getLinkType() const { return meLinkType; } /** Returns the relation identifier for the external link fragment. */ - inline const OUString& getRelId() const { return maRelId; } + const OUString& getRelId() const { return maRelId; } /** Returns the class name of this external link. */ - inline const OUString& getClassName() const { return maClassName; } + const OUString& getClassName() const { return maClassName; } /** Returns the target URL of this external link. */ - inline const OUString& getTargetUrl() const { return maTargetUrl; } + const OUString& getTargetUrl() const { return maTargetUrl; } /** Returns the link info needed by the XML formula parser. */ css::sheet::ExternalLinkInfo getLinkInfo() const; diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index 649c8ac45698..acd8944bd7e2 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -48,10 +48,10 @@ class ScfApiHelper { public: /** Converts a tools color to a UNO color value. */ - inline static sal_Int32 ConvertToApiColor( const Color& rColor ) + static sal_Int32 ConvertToApiColor( const Color& rColor ) { return static_cast< sal_Int32 >( rColor.GetColor() ); } /** Converts a UNO color value to a tools color. */ - inline static Color ConvertFromApiColor( sal_Int32 nApiColor ) + static Color ConvertFromApiColor( sal_Int32 nApiColor ) { return Color( static_cast< ColorData >( nApiColor ) ); } /** Converts a non-empty vector into a UNO sequence containing elements of the same type. */ @@ -112,12 +112,12 @@ css::uno::Sequence< Type > ScfApiHelper::VectorToSequence( const ::std::vector< class ScfPropertySet { public: - inline explicit ScfPropertySet() {} + explicit ScfPropertySet() {} /** Constructs a property set wrapper with the passed UNO property set. */ - inline explicit ScfPropertySet( const css::uno::Reference< css::beans::XPropertySet > & xPropSet ) { Set( xPropSet ); } + explicit ScfPropertySet( const css::uno::Reference< css::beans::XPropertySet > & xPropSet ) { Set( xPropSet ); } /** Constructs a property set wrapper after querying the XPropertySet interface. */ template< typename InterfaceType > - inline explicit ScfPropertySet( const css::uno::Reference< InterfaceType >& xInterface ) { Set( xInterface ); } + explicit ScfPropertySet( const css::uno::Reference< InterfaceType >& xInterface ) { Set( xInterface ); } ~ScfPropertySet(); @@ -125,11 +125,11 @@ public: void Set( css::uno::Reference< css::beans::XPropertySet > const & xPropSet ); /** Queries the passed interface for an XPropertySet and releases the old UNO property set. */ template< typename InterfaceType > - inline void Set( css::uno::Reference< InterfaceType > xInterface ) + void Set( css::uno::Reference< InterfaceType > xInterface ) { Set( css::uno::Reference< css::beans::XPropertySet >( xInterface, css::uno::UNO_QUERY ) ); } /** Returns true, if the contained XPropertySet interface is valid. */ - inline bool Is() const { return mxPropSet.is(); } + bool Is() const { return mxPropSet.is(); } /** Returns the contained XPropertySet interface. */ const css::uno::Reference< css::beans::XPropertySet >& GetApiPropertySet() const { return mxPropSet; } @@ -149,7 +149,7 @@ public: /** Gets the specified property from the property set. @return true, if the passed variable could be filled with the property value. */ template< typename Type > - inline bool GetProperty( Type& rValue, const OUString& rPropName ) const + bool GetProperty( Type& rValue, const OUString& rPropName ) const { css::uno::Any aAny; return GetAnyProperty( aAny, rPropName ) && (aAny >>= rValue); } /** Gets the specified Boolean property from the property set. @@ -175,19 +175,19 @@ public: /** Puts the passed value into the property set. */ template< typename Type > - inline void SetProperty( const OUString& rPropName, const Type& rValue ) + void SetProperty( const OUString& rPropName, const Type& rValue ) { SetAnyProperty( rPropName, css::uno::makeAny( rValue ) ); } /** Puts the passed Boolean value into the property set. */ - inline void SetBoolProperty( const OUString& rPropName, bool bValue ) + void SetBoolProperty( const OUString& rPropName, bool bValue ) { SetAnyProperty( rPropName, css::uno::Any( bValue ) ); } /** Puts the passed string into the property set. */ - inline void SetStringProperty( const OUString& rPropName, const OUString& rValue ) + void SetStringProperty( const OUString& rPropName, const OUString& rValue ) { SetProperty( rPropName, rValue ); } /** Puts the passed color into the property set. */ - inline void SetColorProperty( const OUString& rPropName, const Color& rColor ) + void SetColorProperty( const OUString& rPropName, const Color& rColor ) { SetProperty( rPropName, ScfApiHelper::ConvertToApiColor( rColor ) ); } /** Puts the passed properties into the property set. Tries to use the XMultiPropertySet interface. @@ -246,7 +246,7 @@ public: /** Writes an Any to the value sequence. */ void WriteValue( const css::uno::Any& rAny ); /** Writes a color value to the value sequence. */ - inline void WriteValue( const Color& rColor ) + void WriteValue( const Color& rColor ) { WriteValue( ScfApiHelper::ConvertToApiColor( rColor ) ); } /** Writes a C++ boolean value to the value sequence. */ void WriteValue( bool rbValue ); diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 21716615b25a..ba5440cc7679 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -282,7 +282,7 @@ public: /** Appends a new token with the passed op-code and data. */ template< typename Type > - inline void append( sal_Int32 nOpCode, const Type& rData ) { append( nOpCode ) <<= rData; } + void append( sal_Int32 nOpCode, const Type& rData ) { append( nOpCode ) <<= rData; } /** Converts to a sequence. */ ApiTokenSequence toSequence() const; @@ -298,8 +298,8 @@ class ApiTokenIterator { public: explicit ApiTokenIterator( const ApiTokenSequence& rTokens, sal_Int32 nSpacesOpCode, bool bSkipSpaces ); - inline bool is() const { return mpToken != mpTokenEnd; } - inline const ApiToken* operator->() const { return mpToken; } + bool is() const { return mpToken != mpTokenEnd; } + const ApiToken* operator->() const { return mpToken; } ApiTokenIterator& operator++(); @@ -601,7 +601,7 @@ public: const OpCodeProvider& rOpCodeProv ); /** Returns read/write access to the formula parser property set. */ - inline PropertySet& getParserProperties() { return maParserProps; } + PropertySet& getParserProperties() { return maParserProps; } /** Calls the XFormulaParser::parseFormula() function of the API parser. */ ApiTokenSequence parseFormula( diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index 862a820d0ed7..6919831bb004 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -125,7 +125,7 @@ public: /** Starts the progress bar or activates another segment. */ void ActivateSegment( sal_Int32 nSegment ); /** Starts the progress bar (with first segment). */ - inline void Activate() { ActivateSegment( 0 ); } + void Activate() { ActivateSegment( 0 ); } /** Set current segment to the specified absolute position. */ void ProgressAbs( std::size_t nPos ); /** Increase current segment by the passed value. */ @@ -191,7 +191,7 @@ public: explicit ScfSimpleProgressBar( std::size_t nSize, SfxObjectShell* pDocShell, sal_uInt16 nResId ); /** Set progress bar to the specified position. */ - inline void ProgressAbs( std::size_t nPos ) { maProgress.ProgressAbs( nPos ); } + void ProgressAbs( std::size_t nPos ) { maProgress.ProgressAbs( nPos ); } private: /** Initializes and starts the progress bar. */ diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index 10c323d103f6..1114b0a83366 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -216,7 +216,7 @@ public: /** Reads and returns a zero terminated byte string and decreases a stream counter. */ static OString read_zeroTerminated_uInt8s_ToOString(SvStream& rStrm, sal_Int32& rnBytesLeft); /** Reads and returns a zero terminated byte string and decreases a stream counter. */ - inline static OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) + static OUString read_zeroTerminated_uInt8s_ToOUString(SvStream& rStrm, sal_Int32& rnBytesLeft, rtl_TextEncoding eTextEnc) { return OStringToOUString(read_zeroTerminated_uInt8s_ToOString(rStrm, rnBytesLeft), eTextEnc); } diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 2d4c2dc66795..d36c70caf763 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -236,18 +236,18 @@ struct ScHTMLPos SCCOL mnCol; SCROW mnRow; - inline explicit ScHTMLPos() : mnCol( 0 ), mnRow( 0 ) {} - inline explicit ScHTMLPos( SCCOL nCol, SCROW nRow ) : + explicit ScHTMLPos() : mnCol( 0 ), mnRow( 0 ) {} + explicit ScHTMLPos( SCCOL nCol, SCROW nRow ) : mnCol( nCol ), mnRow( nRow ) {} - inline explicit ScHTMLPos( const ScAddress& rAddr ) { Set( rAddr ); } + explicit ScHTMLPos( const ScAddress& rAddr ) { Set( rAddr ); } - inline SCCOLROW Get( ScHTMLOrient eOrient ) const + SCCOLROW Get( ScHTMLOrient eOrient ) const { return (eOrient == tdCol) ? mnCol : mnRow; } - inline void Set( SCCOL nCol, SCROW nRow ) + void Set( SCCOL nCol, SCROW nRow ) { mnCol = nCol; mnRow = nRow; } - inline void Set( const ScAddress& rAddr ) + void Set( const ScAddress& rAddr ) { Set( rAddr.Col(), rAddr.Row() ); } - inline ScAddress MakeAddr() const + ScAddress MakeAddr() const { return ScAddress( mnCol, mnRow, 0 ); } }; @@ -262,9 +262,9 @@ struct ScHTMLSize SCCOL mnCols; SCROW mnRows; - inline explicit ScHTMLSize( SCCOL nCols, SCROW nRows ) : + explicit ScHTMLSize( SCCOL nCols, SCROW nRows ) : mnCols( nCols ), mnRows( nRows ) {} - inline void Set( SCCOL nCols, SCROW nRows ) + void Set( SCCOL nCols, SCROW nRows ) { mnCols = nCols; mnRows = nRows; } }; @@ -277,16 +277,16 @@ public: ScHTMLTableId nTableId = SC_HTML_NO_TABLE ); /** Returns true, if the selection of the entry is empty. */ - inline bool IsEmpty() const { return !aSel.HasRange(); } + bool IsEmpty() const { return !aSel.HasRange(); } /** Returns true, if the entry has any content to be imported. */ bool HasContents() const; /** Returns true, if the entry represents a table. */ - inline bool IsTable() const { return nTab != SC_HTML_NO_TABLE; } + bool IsTable() const { return nTab != SC_HTML_NO_TABLE; } /** Returns true, if the entry represents a table. */ - inline ScHTMLTableId GetTableId() const { return nTab; } + ScHTMLTableId GetTableId() const { return nTab; } /** Sets or cleares the import always state. */ - inline void SetImportAlways() { mbImportAlways = true; } + void SetImportAlways() { mbImportAlways = true; } /** Sets start point of the entry selection to the start of the import info object. */ void AdjustStart( const ImportInfo& rInfo ); /** Sets end point of the entry selection to the end of the import info object. */ @@ -295,9 +295,9 @@ public: void Strip( const EditEngine& rEditEngine ); /** Returns read/write access to the item set of this entry. */ - inline SfxItemSet& GetItemSet() { return aItemSet; } + SfxItemSet& GetItemSet() { return aItemSet; } /** Returns read-only access to the item set of this entry. */ - inline const SfxItemSet& GetItemSet() const { return aItemSet; } + const SfxItemSet& GetItemSet() const { return aItemSet; } private: bool mbImportAlways; /// true = Always import this entry. @@ -338,9 +338,9 @@ public: virtual ~ScHTMLTable(); /** Returns the name of the table, specified in the TABLE tag. */ - inline const OUString& GetTableName() const { return maTableName; } + const OUString& GetTableName() const { return maTableName; } /** Returns the unique identifier of the table. */ - inline ScHTMLTableId GetTableId() const { return maTableId.mnTableId; } + ScHTMLTableId GetTableId() const { return maTableId.mnTableId; } /** Returns the cell spanning of the specified cell. */ ScHTMLSize GetSpan( const ScHTMLPos& rCellPos ) const; @@ -408,7 +408,7 @@ public: ScHTMLSize GetDocSize( const ScHTMLPos& rCellPos ) const; /** Returns the resulting Calc position of the top left edge of the table. */ - inline const ScHTMLPos& GetDocPos() const { return maDocBasePos; } + const ScHTMLPos& GetDocPos() const { return maDocBasePos; } /** Calculates the resulting Calc position of the specified HTML column/row. */ SCCOLROW GetDocPos( ScHTMLOrient eOrient, SCCOLROW nCellPos ) const; /** Calculates the resulting Calc position of the specified HTML cell. */ diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index 7740bfa280b2..4a2dfafd51a0 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -61,9 +61,9 @@ public: explicit XclImpOutlineDataBuffer( const XclImpRoot& rRoot, SCTAB nScTab ); virtual ~XclImpOutlineDataBuffer() override; - inline XclImpColRowSettings* GetColRowBuff() const { return mxColRowBuff.get(); } - inline XclImpOutlineBuffer* GetColOutline() const { return mxColOutlineBuff.get(); } - inline XclImpOutlineBuffer* GetRowOutline() const { return mxRowOutlineBuff.get(); } + XclImpColRowSettings* GetColRowBuff() const { return mxColRowBuff.get(); } + XclImpOutlineBuffer* GetColOutline() const { return mxColOutlineBuff.get(); } + XclImpOutlineBuffer* GetRowOutline() const { return mxRowOutlineBuff.get(); } void Convert(); private: diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx index 564befff6860..2c3b3905d4f2 100644 --- a/sc/source/filter/inc/lotattr.hxx +++ b/sc/source/filter/inc/lotattr.hxx @@ -42,13 +42,13 @@ struct LotAttrWK3 sal_uInt8 nFontCol; sal_uInt8 nBack; - inline bool HasStyles () const + bool HasStyles () const { return ( nFont || nLineStyle || nFontCol || ( nBack & 0x7F ) ); // !! ohne Center-Bit!! } - inline bool IsCentered () const + bool IsCentered () const { return ( nBack & 0x80 ); } @@ -78,7 +78,7 @@ private: ~ENTRY(); }; - inline static void MakeHash( const LotAttrWK3& rAttr, sal_uInt32& rOut ) + static void MakeHash( const LotAttrWK3& rAttr, sal_uInt32& rOut ) { reinterpret_cast<sal_uInt8*>(&rOut)[ 0 ] = rAttr.nFont & 0x7F; reinterpret_cast<sal_uInt8*>(&rOut)[ 1 ] = rAttr.nLineStyle; diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index d207d7619191..6c7bd0a92482 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -37,7 +37,7 @@ private: SvxFontHeightItem* pHeight; SvxColorItem* pColor; sal_Int32 nType; // < 0 -> undefiniert - inline ENTRY() + ENTRY() { pTmpName = nullptr; pFont = nullptr; @@ -45,7 +45,7 @@ private: pColor = nullptr; nType = -1; } - inline ~ENTRY() + ~ENTRY() { if( pTmpName ) delete pTmpName; @@ -56,20 +56,20 @@ private: if( pColor ) delete pColor; } - inline void TmpName( const OUString &rNew ) + void TmpName( const OUString &rNew ) { if( pTmpName ) *pTmpName = rNew; else pTmpName = new OUString( rNew ); } - inline void Height( SvxFontHeightItem& rNew ) + void Height( SvxFontHeightItem& rNew ) { if( pHeight ) delete pHeight; pHeight = &rNew; } - inline void Type( const sal_uInt16 nNew ) { nType = nNew; } + void Type( const sal_uInt16 nNew ) { nType = nNew; } }; static void MakeFont( ENTRY* pEntry ); diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index 8f2b171d74fa..83fe5b21ba2c 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -169,7 +169,7 @@ struct ExtName sal_uInt32 nStorageId; sal_uInt16 nFlags; - inline ExtName( sal_uInt16 n ) : nStorageId( 0 ), nFlags( n ) {} + ExtName( sal_uInt16 n ) : nStorageId( 0 ), nFlags( n ) {} bool IsOLE() const; }; diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index dfb8ae8c6b8f..fe867c6b740b 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -71,13 +71,13 @@ public: void readIndex( SequenceInputStream& rStrm ); /** Returns the type of the item. */ - inline sal_Int32 getType() const { return mnType; } + sal_Int32 getType() const { return mnType; } /** Returns the value of the item. */ - inline const css::uno::Any& getValue() const { return maValue; } + const css::uno::Any& getValue() const { return maValue; } /** Returns the string representation of the item. */ OUString getName() const; /** Returns true if the item is unused. */ - inline bool isUnused() const { return mbUnused; } + bool isUnused() const { return mbUnused; } private: friend class PivotCacheItemList; @@ -99,9 +99,9 @@ public: void importItem( sal_Int32 nRecId, SequenceInputStream& rStrm ); /** Returns true, if this item list is empty. */ - inline bool empty() const { return maItems.empty(); } + bool empty() const { return maItems.empty(); } /** Returns the size of the item list. */ - inline size_t size() const { return maItems.size(); } + size_t size() const { return maItems.size(); } /** Returns the specified item. */ const PivotCacheItem* getCacheItem( sal_Int32 nItemIdx ) const; @@ -183,7 +183,7 @@ struct PivotCacheGroupItem OUString maOrigName; OUString maGroupName; - inline explicit PivotCacheGroupItem( const OUString& rItemName ) : + explicit PivotCacheGroupItem( const OUString& rItemName ) : maOrigName( rItemName ), maGroupName( rItemName ) {} }; @@ -228,29 +228,29 @@ public: void applyItemCaptions( const IdCaptionPairList& vCaptions ); /** Returns true, if the field is based on source data, or false if it is grouped or calculated. */ - inline bool isDatabaseField() const { return maFieldModel.mbDatabaseField; } + bool isDatabaseField() const { return maFieldModel.mbDatabaseField; } /** Returns true, if the field contains a list of shared items. */ - inline bool hasSharedItems() const { return !maSharedItems.empty(); } + bool hasSharedItems() const { return !maSharedItems.empty(); } /** Returns true, if the field contains a list of grouping items. */ - inline bool hasGroupItems() const { return !maGroupItems.empty(); } + bool hasGroupItems() const { return !maGroupItems.empty(); } /** Returns true, if the field has inplace numeric grouping settings. */ - inline bool hasNumericGrouping() const { return maFieldGroupModel.mbRangeGroup && !maFieldGroupModel.mbDateGroup; } + bool hasNumericGrouping() const { return maFieldGroupModel.mbRangeGroup && !maFieldGroupModel.mbDateGroup; } /** Returns true, if the field has inplace date grouping settings. */ - inline bool hasDateGrouping() const { return maFieldGroupModel.mbRangeGroup && maFieldGroupModel.mbDateGroup; } + bool hasDateGrouping() const { return maFieldGroupModel.mbRangeGroup && maFieldGroupModel.mbDateGroup; } /** Returns true, if the field has a parent group field that groups the items of this field. */ - inline bool hasParentGrouping() const { return maFieldGroupModel.mnParentField >= 0; } + bool hasParentGrouping() const { return maFieldGroupModel.mnParentField >= 0; } /** Returns the name of the cache field. */ - inline const OUString& getName() const { return maFieldModel.maName; } + const OUString& getName() const { return maFieldModel.maName; } /** Returns the index of the parent group field that groups the items of this field. */ - inline sal_Int32 getParentGroupField() const { return maFieldGroupModel.mnParentField; } + sal_Int32 getParentGroupField() const { return maFieldGroupModel.mnParentField; } /** Returns the index of the base field grouping is based on. */ - inline sal_Int32 getGroupBaseField() const { return maFieldGroupModel.mnBaseField; } + sal_Int32 getGroupBaseField() const { return maFieldGroupModel.mnBaseField; } /** Returns the finalized group name of this field. */ - inline const OUString& getFinalGroupName() const { return maFieldGroupModel.msFinalGroupName; } + const OUString& getFinalGroupName() const { return maFieldGroupModel.msFinalGroupName; } /** Set the finalized group name of this field. */ - inline void setFinalGroupName(const OUString& rFinalGroupName) { maFieldGroupModel.msFinalGroupName = rFinalGroupName; } + void setFinalGroupName(const OUString& rFinalGroupName) { maFieldGroupModel.msFinalGroupName = rFinalGroupName; } /** Returns the shared or group item with the specified index. */ const PivotCacheItem* getCacheItem( sal_Int32 nItemIdx ) const; @@ -367,14 +367,14 @@ public: /** Returns true, if the pivot cache is based on a valid data source, so that pivot tables can be created based on this pivot cache. */ - inline bool isValidDataSource() const { return mbValidSource; } + bool isValidDataSource() const { return mbValidSource; } /** Returns true, if the pivot cache is based on a dummy sheet created in finalizeImport. */ - inline bool isBasedOnDummySheet() const { return mbDummySheet; } + bool isBasedOnDummySheet() const { return mbDummySheet; } /** Returns the internal cell range the cache is based on. */ - inline const ScRange& + const ScRange& getSourceRange() const { return maSheetSrcModel.maRange; } /** Returns the relation identifier of the pivot cache records fragment. */ - inline const OUString& getRecordsRelId() const { return maDefModel.maRelId; } + const OUString& getRecordsRelId() const { return maDefModel.maRelId; } /** Returns the cache field with the specified index. */ PivotCacheField* getCacheField( sal_Int32 nFieldIdx ); diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index f3bc3daf4821..083d434bfd58 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -152,7 +152,7 @@ public: const css::uno::Reference< css::sheet::XDataPilotDescriptor >& rxDPDesc); /** Returns the name of the DataPilot field in the fields collection. */ - inline const OUString& getDPFieldName() const { return maDPFieldName; } + const OUString& getDPFieldName() const { return maDPFieldName; } /** Converts dimension and other settings for a row field. */ void convertRowField(); diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index 1582b4c2fa6f..bb62d2e40a5c 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -51,9 +51,9 @@ public: void finalizeImport(); /** Returns the text data of this portion. */ - inline const OUString& getText() const { return maText; } + const OUString& getText() const { return maText; } /** Returns true, if the portion contains font formatting. */ - inline bool hasFont() const { return mxFont.get() != nullptr; } + bool hasFont() const { return mxFont.get() != nullptr; } /** Converts the portion and replaces or appends to the passed XText. */ void convert( @@ -84,8 +84,8 @@ struct FontPortionModel sal_Int32 mnPos; /// First character in the string. sal_Int32 mnFontId; /// Font identifier for the next characters. - explicit inline FontPortionModel() : mnPos( 0 ), mnFontId( -1 ) {} - explicit inline FontPortionModel( sal_Int32 nPos, sal_Int32 nFontId ) : + explicit FontPortionModel() : mnPos( 0 ), mnFontId( -1 ) {} + explicit FontPortionModel( sal_Int32 nPos, sal_Int32 nFontId ) : mnPos( nPos ), mnFontId( nFontId ) {} void read( SequenceInputStream& rStrm ); @@ -96,7 +96,7 @@ class FontPortionModelList { ::std::vector< FontPortionModel > mvModels; public: - inline explicit FontPortionModelList() : mvModels() {} + explicit FontPortionModelList() : mvModels() {} bool empty() const { return mvModels.empty(); } @@ -175,8 +175,8 @@ struct PhoneticPortionModel sal_Int32 mnBasePos; /// First character in base text. sal_Int32 mnBaseLen; /// Number of characters in base text. - explicit inline PhoneticPortionModel() : mnPos( -1 ), mnBasePos( -1 ), mnBaseLen( 0 ) {} - explicit inline PhoneticPortionModel( sal_Int32 nPos, sal_Int32 nBasePos, sal_Int32 nBaseLen ) : + explicit PhoneticPortionModel() : mnPos( -1 ), mnBasePos( -1 ), mnBaseLen( 0 ) {} + explicit PhoneticPortionModel( sal_Int32 nPos, sal_Int32 nBasePos, sal_Int32 nBaseLen ) : mnPos( nPos ), mnBasePos( nBasePos ), mnBaseLen( nBaseLen ) {} void read( SequenceInputStream& rStrm ); @@ -186,7 +186,7 @@ struct PhoneticPortionModel class PhoneticPortionModelList { public: - inline explicit PhoneticPortionModelList() : mvModels() {} + explicit PhoneticPortionModelList() : mvModels() {} bool empty() const { return mvModels.empty(); } diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx index c44088ea7680..d74a7ed62538 100644 --- a/sc/source/filter/inc/root.hxx +++ b/sc/source/filter/inc/root.hxx @@ -75,8 +75,8 @@ class ExcRoot { protected: RootData* pExcRoot; - inline ExcRoot( RootData* pNexExcRoot ) : pExcRoot( pNexExcRoot ) {} - inline ExcRoot( const ExcRoot& rCopy ) : pExcRoot( rCopy.pExcRoot ) {} + ExcRoot( RootData* pNexExcRoot ) : pExcRoot( pNexExcRoot ) {} + ExcRoot( const ExcRoot& rCopy ) : pExcRoot( rCopy.pExcRoot ) {} }; // Lotus Imp~/Exp~ - diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 9f9a357d2208..19ed1e86346a 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -103,7 +103,7 @@ public: void importColorId( SequenceInputStream& rStrm ); /** Returns true, if the color is set to automatic. */ - inline bool isAuto() const { return isPlaceHolder(); } + bool isAuto() const { return isPlaceHolder(); } }; SequenceInputStream& operator>>( SequenceInputStream& rStrm, Color& orColor ); @@ -232,7 +232,7 @@ public: /** Returns the font model structure. This function can be called before finalizeImport() has been called. */ - inline const FontModel& getModel() const { return maModel; } + const FontModel& getModel() const { return maModel; } /** Final processing after import of all style settings. */ void finalizeImport(); @@ -315,9 +315,9 @@ public: void finalizeImport(); /** Returns the alignment model structure. */ - inline const AlignmentModel& getModel() const { return maModel; } + const AlignmentModel& getModel() const { return maModel; } /** Returns the converted API alignment data struct. */ - inline const ApiAlignmentData& getApiData() const { return maApiData; } + const ApiAlignmentData& getApiData() const { return maApiData; } void fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const; @@ -365,7 +365,7 @@ public: void finalizeImport(); /** Returns the converted API protection data struct. */ - inline const ApiProtectionData& getApiData() const { return maApiData; } + const ApiProtectionData& getApiData() const { return maApiData; } void fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const; private: @@ -441,7 +441,7 @@ public: void finalizeImport( bool bRTL ); /** Returns the converted API border data struct. */ - inline const ApiBorderData& getApiData() const { return maApiData; } + const ApiBorderData& getApiData() const { return maApiData; } void fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs = false ) const; @@ -613,12 +613,12 @@ public: void finalizeImport(); /** Returns true, if the XF is a cell XF, and false, if it is a style XF. */ - inline bool isCellXf() const { return maModel.mbCellXf; } + bool isCellXf() const { return maModel.mbCellXf; } /** Returns the referred font object. */ FontRef getFont() const; /** Returns the alignment data of this style. */ - inline const Alignment& getAlignment() const { return maAlignment; } + const Alignment& getAlignment() const { return maAlignment; } void applyPatternToAttrList( AttrList& rAttrs, SCROW nRow1, SCROW nRow2, sal_Int32 nForceScNumFmt ); @@ -716,10 +716,10 @@ public: void finalizeImport( const OUString& rFinalName ); /** Returns the cell style model structure. */ - inline const CellStyleModel& getModel() const { return maModel; } + const CellStyleModel& getModel() const { return maModel; } /** Returns the final style name used in the document. */ - inline const OUString& getFinalStyleName() const { return maFinalName; } - inline ::ScStyleSheet* getStyleSheet() { return mpStyleSheet; } + const OUString& getFinalStyleName() const { return maFinalName; } + ::ScStyleSheet* getStyleSheet() { return mpStyleSheet; } private: CellStyleModel maModel; OUString maFinalName; /// Final style name used in API. diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx index 878c91943879..a5fbc55bc6bf 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -40,7 +40,7 @@ class FontContext : public WorkbookContextBase { public: template< typename ParentType > - inline explicit FontContext( ParentType& rParent, const FontRef& rxFont ) : + explicit FontContext( ParentType& rParent, const FontRef& rxFont ) : WorkbookContextBase( rParent ), mxFont( rxFont ) {} protected: @@ -54,7 +54,7 @@ class BorderContext : public WorkbookContextBase { public: template< typename ParentType > - inline explicit BorderContext( ParentType& rParent, const BorderRef& rxBorder ) : + explicit BorderContext( ParentType& rParent, const BorderRef& rxBorder ) : WorkbookContextBase( rParent ), mxBorder( rxBorder ) {} protected: @@ -69,7 +69,7 @@ class FillContext : public WorkbookContextBase { public: template< typename ParentType > - inline explicit FillContext( ParentType& rParent, const FillRef& rxFill ) : + explicit FillContext( ParentType& rParent, const FillRef& rxFill ) : WorkbookContextBase( rParent ), mxFill( rxFill ), mfGradPos( -1.0 ) {} protected: @@ -84,7 +84,7 @@ class XfContext : public WorkbookContextBase { public: template< typename ParentType > - inline explicit XfContext( ParentType& rParent, const XfRef& rxXf, bool bCellXf ) : + explicit XfContext( ParentType& rParent, const XfRef& rxXf, bool bCellXf ) : WorkbookContextBase( rParent ), mxXf( rxXf ), mbCellXf( bCellXf ) {} protected: @@ -100,7 +100,7 @@ class DxfContext : public WorkbookContextBase { public: template< typename ParentType > - inline explicit DxfContext( ParentType& rParent, const DxfRef& rxDxf ) : + explicit DxfContext( ParentType& rParent, const DxfRef& rxDxf ) : WorkbookContextBase( rParent ), mxDxf( rxDxf ) {} protected: diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx index 384b46191713..43a87b9b87a9 100644 --- a/sc/source/filter/inc/tablebuffer.hxx +++ b/sc/source/filter/inc/tablebuffer.hxx @@ -50,9 +50,9 @@ public: /** Imports a table definition from a TABLE record. */ void importTable( SequenceInputStream& rStrm, sal_Int16 nSheet ); /** Creates a new auto filter and stores it internally. */ - inline AutoFilter& createAutoFilter() { return maAutoFilters.createAutoFilter(); } + AutoFilter& createAutoFilter() { return maAutoFilters.createAutoFilter(); } /** Creates a new tableColumns handler and stores it internally. */ - inline TableColumns& createTableColumns() { return maTableColumns.createTableColumns(); } + TableColumns& createTableColumns() { return maTableColumns.createTableColumns(); } /** Creates a database range from this tables. */ void finalizeImport(); @@ -60,24 +60,24 @@ public: void applyTableColumns(); /** Returns the unique table identifier. */ - inline sal_Int32 getTableId() const { return maModel.mnId; } + sal_Int32 getTableId() const { return maModel.mnId; } /** Returns the token index used in API token arrays (com.sun.star.sheet.FormulaToken). */ - inline sal_Int32 getTokenIndex() const { return mnTokenIndex; } + sal_Int32 getTokenIndex() const { return mnTokenIndex; } /** Returns the original display name of the table. */ - inline const OUString& getDisplayName() const { return maModel.maDisplayName; } + const OUString& getDisplayName() const { return maModel.maDisplayName; } /** Returns the original (unchecked) total range of the table. */ - inline const ScRange& getOriginalRange() const { return maModel.maRange; } + const ScRange& getOriginalRange() const { return maModel.maRange; } /** Returns the cell range of this table. */ - inline const ScRange& getRange() const { return maDestRange; } + const ScRange& getRange() const { return maDestRange; } /** Returns the number of columns of this table. */ - inline SCCOL getWidth() const { return maDestRange.aEnd.Col() - maDestRange.aStart.Col() + 1; } + SCCOL getWidth() const { return maDestRange.aEnd.Col() - maDestRange.aStart.Col() + 1; } /** Returns the number of rows of this table. */ - inline SCROW getHeight() const { return maDestRange.aEnd.Row() - maDestRange.aStart.Row() + 1; } + SCROW getHeight() const { return maDestRange.aEnd.Row() - maDestRange.aStart.Row() + 1; } /** Returns the number of header rows in the table range. */ - inline sal_Int32 getHeaderRows() const { return maModel.mnHeaderRows; } + sal_Int32 getHeaderRows() const { return maModel.mnHeaderRows; } /** Returns the number of totals rows in the table range. */ - inline sal_Int32 getTotalsRows() const { return maModel.mnTotalsRows; } + sal_Int32 getTotalsRows() const { return maModel.mnTotalsRows; } private: TableModel maModel; diff --git a/sc/source/filter/inc/themebuffer.hxx b/sc/source/filter/inc/themebuffer.hxx index 8ae61d11e87d..76a6d021ab91 100644 --- a/sc/source/filter/inc/themebuffer.hxx +++ b/sc/source/filter/inc/themebuffer.hxx @@ -40,7 +40,7 @@ public: sal_Int32 getColorByIndex(size_t nIndex) const; /** Returns the default font data for the current file type. */ - inline const FontModel& getDefaultFontModel() const { return *mxDefFontModel; } + const FontModel& getDefaultFontModel() const { return *mxDefFontModel; } private: typedef ::std::unique_ptr< FontModel > FontModelPtr; diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index cd18b10ccac0..55d0dba05ea1 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -44,9 +44,9 @@ struct TokenId TokenId() : nId( 0 ) {} TokenId( sal_uInt16 n ) : nId( n ) {} TokenId( const TokenId& r ) : nId( r.nId ) {} - inline TokenId& operator =( const TokenId& r ) { nId = r.nId; return *this; } - inline TokenId& operator =( sal_uInt16 n ) { nId = n; return *this; } - inline operator const sal_uInt16&() const { return nId; } + TokenId& operator =( const TokenId& r ) { nId = r.nId; return *this; } + TokenId& operator =( sal_uInt16 n ) { nId = n; return *this; } + operator const sal_uInt16&() const { return nId; } }; struct ScComplexRefData; @@ -232,7 +232,7 @@ class TokenStack inline void Reset(); - inline bool HasMoreTokens() const { return nPos > 0; } + bool HasMoreTokens() const { return nPos > 0; } inline const TokenId Get(); }; diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index e5e12b6dfc08..e6369c6aa817 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -101,7 +101,7 @@ typedef std::shared_ptr< WorkbookGlobals > WorkbookGlobalsRef; class WorkbookHelper { public: - inline /*implicit*/ WorkbookHelper( WorkbookGlobals& rBookGlob ) : mrBookGlob( rBookGlob ) {} + /*implicit*/ WorkbookHelper( WorkbookGlobals& rBookGlob ) : mrBookGlob( rBookGlob ) {} virtual ~WorkbookHelper(); static WorkbookGlobalsRef constructGlobals( ExcelFilter& rFilter ); diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index ee04695e4eeb..c63ce77e0d8c 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -142,8 +142,8 @@ private: public: XclEscherHostAppData() : bStackedGroup( false ) {} - inline void SetStackedGroup( bool b ) { bStackedGroup = b; } - inline bool IsStackedGroup() const { return bStackedGroup; } + void SetStackedGroup( bool b ) { bStackedGroup = b; } + bool IsStackedGroup() const { return bStackedGroup; } }; // --- class XclEscherClientData ------------------------------------- @@ -172,7 +172,7 @@ public: XclObj* pObj ); //! ONLY for the AdditionalText mimic - inline void SetXclObj( XclObj* p ) { pXclObj = p; } + void SetXclObj( XclObj* p ) { pXclObj = p; } virtual void WriteData( EscherEx& rEx ) const override; }; diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index 62698c2e7fe7..3d7bc09e5d3c 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -52,15 +52,15 @@ public: void pop_back (); - inline bool empty () const { return maObjs.empty(); } + bool empty () const { return maObjs.empty(); } - inline size_t size () const { return maObjs.size(); } + size_t size () const { return maObjs.size(); } - inline iterator begin () { return maObjs.begin(); } + iterator begin () { return maObjs.begin(); } - inline iterator end () { return maObjs.end(); } + iterator end () { return maObjs.end(); } - inline XclExpMsoDrawing* GetMsodrawingPerSheet() { return pMsodrawingPerSheet; } + XclExpMsoDrawing* GetMsodrawingPerSheet() { return pMsodrawingPerSheet; } /// close groups and DgContainer opened in ctor void EndSheet(); @@ -115,25 +115,25 @@ protected: public: virtual ~XclObj() override; - inline sal_uInt16 GetObjType() const { return mnObjType; } + sal_uInt16 GetObjType() const { return mnObjType; } - inline void SetId( sal_uInt16 nId ) { nObjId = nId; } + void SetId( sal_uInt16 nId ) { nObjId = nId; } - inline void SetTab( SCTAB nScTab ) { mnScTab = nScTab; } - inline SCTAB GetTab() const { return mnScTab; } + void SetTab( SCTAB nScTab ) { mnScTab = nScTab; } + SCTAB GetTab() const { return mnScTab; } - inline void SetLocked( bool b ) + void SetLocked( bool b ) { b ? nGrbit |= 0x0001 : nGrbit &= ~0x0001; } - inline void SetPrintable( bool b ) + void SetPrintable( bool b ) { b ? nGrbit |= 0x0010 : nGrbit &= ~0x0010; } - inline void SetAutoFill( bool b ) + void SetAutoFill( bool b ) { b ? nGrbit |= 0x2000 : nGrbit &= ~0x2000; } - inline void SetAutoLine( bool b ) + void SetAutoLine( bool b ) { b ? nGrbit |= 0x4000 : nGrbit &= ~0x4000; } // set corresponding Excel object type in OBJ/ftCmo void SetEscherShapeType( sal_uInt16 nType ); - inline void SetEscherShapeTypeGroup() { mnObjType = EXC_OBJTYPE_GROUP; } + void SetEscherShapeTypeGroup() { mnObjType = EXC_OBJTYPE_GROUP; } /** If set to true, this object has created its own escher data. @descr This causes the function EscherEx::EndShape() to not post process @@ -144,7 +144,7 @@ public: EscherEx::EndShape(). */ /** Returns true, if the object has created the escher data itself. @descr See SetOwnEscher() for details. */ - inline bool IsOwnEscher() const { return mbOwnEscher; } + bool IsOwnEscher() const { return mbOwnEscher; } //! actually writes ESCHER_ClientTextbox void SetText( const XclExpRoot& rRoot, const SdrTextObj& rObj ); @@ -203,8 +203,8 @@ public: XclTxo( const XclExpRoot& rRoot, const SdrTextObj& rEditObj ); XclTxo( const XclExpRoot& rRoot, const EditTextObject& rEditObj, SdrObject* pCaption ); - inline void SetHorAlign( sal_uInt8 nHorAlign ) { mnHorAlign = nHorAlign; } - inline void SetVerAlign( sal_uInt8 nVerAlign ) { mnVerAlign = nVerAlign; } + void SetHorAlign( sal_uInt8 nHorAlign ) { mnHorAlign = nHorAlign; } + void SetVerAlign( sal_uInt8 nVerAlign ) { mnVerAlign = nVerAlign; } virtual void Save( XclExpStream& rStrm ) override; @@ -358,7 +358,7 @@ protected: public: ExcEScenarioCell( sal_uInt16 nC, sal_uInt16 nR, const OUString& rTxt ); - inline std::size_t GetStringBytes() const + std::size_t GetStringBytes() const { return sText.GetSize(); } void WriteAddress( XclExpStream& rStrm ) const ; diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index a5b43c149dbf..f4e05de6f3b3 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -84,7 +84,7 @@ public: virtual ~XclExpChRoot() override; /** Returns this root instance - for code readability in derived classes. */ - inline const XclExpChRoot& GetChRoot() const { return *this; } + const XclExpChRoot& GetChRoot() const { return *this; } /** Returns the API Chart document model. */ css::uno::Reference< css::chart2::XChartDocument > const & GetChartDocument() const; @@ -204,7 +204,7 @@ public: explicit XclExpChFramePos( sal_uInt16 nTLMode ); /** Returns read/write access to the frame position data. */ - inline XclChFramePos& GetFramePosData() { return maData; } + XclChFramePos& GetFramePosData() { return maData; } private: virtual void WriteBody( XclExpStream& rStrm ) override; @@ -224,17 +224,17 @@ public: void Convert( const XclExpChRoot& rRoot, const ScfPropertySet& rPropSet, XclChObjectType eObjType ); /** Sets or clears the automatic flag. */ - inline void SetAuto( bool bAuto ) { ::set_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO, bAuto ); } + void SetAuto( bool bAuto ) { ::set_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO, bAuto ); } /** Sets flag to show or hide an axis. */ - inline void SetShowAxis( bool bShowAxis ) + void SetShowAxis( bool bShowAxis ) { ::set_flag( maData.mnFlags, EXC_CHLINEFORMAT_SHOWAXIS, bShowAxis ); } /** Sets the line format to the specified default type. */ void SetDefault( XclChFrameType eDefFrameType ); /** Returns true, if the line format is set to automatic. */ - inline bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO ); } + bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO ); } /** Returns true, if the line style is set to something visible. */ - inline bool HasLine() const { return maData.mnPattern != EXC_CHLINEFORMAT_NONE; } + bool HasLine() const { return maData.mnPattern != EXC_CHLINEFORMAT_NONE; } /** Returns true, if the line contains default formatting according to the passed frame type. */ bool IsDefault( XclChFrameType eDefFrameType ) const; @@ -258,14 +258,14 @@ public: bool Convert( const XclExpChRoot& rRoot, const ScfPropertySet& rPropSet, XclChObjectType eObjType ); /** Sets or clears the automatic flag. */ - inline void SetAuto( bool bAuto ) { ::set_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO, bAuto ); } + void SetAuto( bool bAuto ) { ::set_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO, bAuto ); } /** Sets the area format to the specified default type. */ void SetDefault( XclChFrameType eDefFrameType ); /** Returns true, if the area format is set to automatic. */ - inline bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO ); } + bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO ); } /** Returns true, if the area style is set to something visible. */ - inline bool HasArea() const { return maData.mnPattern != EXC_PATT_NONE; } + bool HasArea() const { return maData.mnPattern != EXC_PATT_NONE; } /** Returns true, if the area contains default formatting according to the passed frame type. */ bool IsDefault( XclChFrameType eDefFrameType ) const; @@ -399,7 +399,7 @@ public: void AppendString( const OUString& rStr ); /** Returns true, if this source link contains explicit string data. */ - inline bool HasString() const { return mxString && !mxString->IsEmpty(); } + bool HasString() const { return mxString && !mxString->IsEmpty(); } /** Writes the CHSOURCELINK record and optionally a CHSTRING record with explicit string data. */ virtual void Save( XclExpStream& rStrm ) override; @@ -507,7 +507,7 @@ public: void ConvertTrendLineEquation( const ScfPropertySet& rPropSet, const XclChDataPointPos& rPointPos ); /** Returns true, if the string object does not contain any text data. */ - inline bool HasString() const { return mxSrcLink && mxSrcLink->HasString(); } + bool HasString() const { return mxSrcLink && mxSrcLink->HasString(); } /** Returns the flags needed for the CHATTACHEDLABEL record. */ sal_uInt16 GetAttLabelFlags() const; @@ -546,11 +546,11 @@ public: const ScfPropertySet& rPropSet, bool bCloseSymbol ); /** Returns true, if markers are enabled. */ - inline bool HasMarker() const { return maData.mnMarkerType != EXC_CHMARKERFORMAT_NOSYMBOL; } + bool HasMarker() const { return maData.mnMarkerType != EXC_CHMARKERFORMAT_NOSYMBOL; } /** Returns true, if border line of markers is visible. */ - inline bool HasLineColor() const { return !::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_NOLINE ); } + bool HasLineColor() const { return !::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_NOLINE ); } /** Returns true, if fill area of markers is visible. */ - inline bool HasFillColor() const { return !::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_NOFILL ); } + bool HasFillColor() const { return !::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_NOFILL ); } private: /** Registers marker colors in palette and stores color identifiers. */ @@ -625,7 +625,7 @@ public: void ConvertLine( const ScfPropertySet& rPropSet, XclChObjectType eObjType ); /** Returns true, if this objects describes the formatting of an entire series. */ - inline bool IsSeriesFormat() const { return maData.maPointPos.mnPointIdx == EXC_CHDATAFORMAT_ALLPOINTS; } + bool IsSeriesFormat() const { return maData.maPointPos.mnPointIdx == EXC_CHDATAFORMAT_ALLPOINTS; } /** Writes all embedded records. */ virtual void WriteSubRecords( XclExpStream& rStrm ) override; @@ -772,9 +772,9 @@ public: void SetStacked( bool bPercent ); /** Returns true, if this is object represents a valid chart type. */ - inline bool IsValidType() const { return maTypeInfo.meTypeId != EXC_CHTYPEID_UNKNOWN; } + bool IsValidType() const { return maTypeInfo.meTypeId != EXC_CHTYPEID_UNKNOWN; } /** Returns the chart type info struct for the contained chart type. */ - inline const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; } + const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; } private: virtual void WriteBody( XclExpStream& rStrm ) override; @@ -793,10 +793,10 @@ public: /** Converts 3d settings for the passed chart type. */ void Convert( const ScfPropertySet& rPropSet, bool b3dWallChart ); /** Sets flag that the data points are clustered on the X axis. */ - inline void SetClustered() { ::set_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); } + void SetClustered() { ::set_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); } /** Returns true, if the data points are clustered on the X axis. */ - inline bool IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); } + bool IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); } private: virtual void WriteBody( XclExpStream& rStrm ) override; @@ -887,19 +887,19 @@ public: void ConvertLegend( const ScfPropertySet& rPropSet ); /** Returns true, if this chart type group contains at least one valid series. */ - inline bool IsValidGroup() const { return !maSeries.IsEmpty() && maType.IsValidType(); } + bool IsValidGroup() const { return !maSeries.IsEmpty() && maType.IsValidType(); } /** Returns the index of this chart type group format. */ - inline sal_uInt16 GetGroupIdx() const { return maData.mnGroupIdx; } + sal_uInt16 GetGroupIdx() const { return maData.mnGroupIdx; } /** Returns the chart type info struct for the contained chart type. */ - inline const XclChExtTypeInfo& GetTypeInfo() const { return maTypeInfo; } + const XclChExtTypeInfo& GetTypeInfo() const { return maTypeInfo; } /** Returns true, if the chart is three-dimensional. */ - inline bool Is3dChart() const { return maTypeInfo.mb3dChart; } + bool Is3dChart() const { return maTypeInfo.mb3dChart; } /** Returns true, if chart type supports wall and floor format. */ - inline bool Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); } + bool Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); } /** Returns true, if the series in this chart type group are ordered on the Z axis. */ - inline bool Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); } + bool Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); } /** Returns true, if this chart type can be combined with other types. */ - inline bool IsCombinable2d() const { return !Is3dChart() && maTypeInfo.mbCombinable2d; } + bool IsCombinable2d() const { return !Is3dChart() && maTypeInfo.mbCombinable2d; } /** Writes all embedded records. */ virtual void WriteSubRecords( XclExpStream& rStrm ) override; @@ -949,7 +949,7 @@ public: /** Converts position settings of a crossing axis at this axis. */ void ConvertAxisPosition( const ScfPropertySet& rPropSet ); /** Sets flag for tickmark position between categories or on categories. */ - inline void SetTicksBetweenCateg( bool bTicksBetween ) + void SetTicksBetweenCateg( bool bTicksBetween ) { ::set_flag( maLabelData.mnFlags, EXC_CHLABELRANGE_BETWEEN, bTicksBetween ); } private: @@ -1029,9 +1029,9 @@ public: void ConvertWall( css::uno::Reference< css::chart2::XDiagram > const & xDiagram ); /** Returns the type of this axis. */ - inline sal_uInt16 GetAxisType() const { return maData.mnType; } + sal_uInt16 GetAxisType() const { return maData.mnType; } /** Returns the axis dimension index used by the chart API. */ - inline sal_Int32 GetApiAxisDimension() const { return maData.GetApiAxisDimension(); } + sal_Int32 GetApiAxisDimension() const { return maData.GetApiAxisDimension(); } /** Writes all embedded records. */ virtual void WriteSubRecords( XclExpStream& rStrm ) override; @@ -1071,11 +1071,11 @@ public: sal_uInt16 nFirstGroupIdx ); /** Returns true, if this axes set exists (returns false if this is a dummy object). */ - inline bool IsValidAxesSet() const { return !maTypeGroups.IsEmpty(); } + bool IsValidAxesSet() const { return !maTypeGroups.IsEmpty(); } /** Returns the index of the axes set (primary/secondary). */ - inline sal_uInt16 GetAxesSetId() const { return maData.mnAxesSetId; } + sal_uInt16 GetAxesSetId() const { return maData.mnAxesSetId; } /** Returns the axes set index used by the chart API. */ - inline sal_Int32 GetApiAxesSetIndex() const { return maData.GetApiAxesSetIndex(); } + sal_Int32 GetApiAxesSetIndex() const { return maData.GetApiAxesSetIndex(); } /** Returns true, if the chart is three-dimensional. */ bool Is3dChart() const; diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 06f582fe5e3d..1b8d00253d3a 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -104,7 +104,7 @@ public: virtual ~XclExpHyperlink() override; /** Returns the cell representation text or 0, if not available. */ - inline const OUString* GetRepr() const { return m_Repr.isEmpty() ? nullptr : &m_Repr; } + const OUString* GetRepr() const { return m_Repr.isEmpty() ? nullptr : &m_Repr; } virtual void SaveXml( XclExpXmlStream& rStrm ) override; @@ -322,7 +322,7 @@ public: virtual ~XclExpDV() override; /** Returns the core handle of the validation data. */ - inline sal_uLong GetScHandle() const { return mnScHandle; } + sal_uLong GetScHandle() const { return mnScHandle; } /** Inserts a new cell range into the cell range list. */ void InsertCellRange( const ScRange& rPos ); diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index fdb632b38a49..f3a98cfddd6b 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -172,11 +172,11 @@ protected: css::uno::Reference< css::drawing::XShape > const & xShape ); /** Returns the Excel token array of the cell link, or 0, if no link present. */ - inline const XclTokenArray* GetCellLinkTokArr() const { return mxCellLink.get(); } + const XclTokenArray* GetCellLinkTokArr() const { return mxCellLink.get(); } /** Returns the Excel token array of the source range, or 0, if no link present. */ - inline const XclTokenArray* GetSourceRangeTokArr() const { return mxSrcRange.get(); } + const XclTokenArray* GetSourceRangeTokArr() const { return mxSrcRange.get(); } /** Returns the number of entries in the source range, or 0, if no source set. */ - inline sal_uInt16 GetSourceEntryCount() const { return mnEntryCount; } + sal_uInt16 GetSourceEntryCount() const { return mnEntryCount; } /** Writes a formula with special style only valid in OBJ records. */ static void WriteFormula( XclExpStream& rStrm, const XclTokenArray& rTokArr ); @@ -405,7 +405,7 @@ public: /** Finalizes the object manager after conversion of all sheets. */ void EndDocument(); - inline XclEscherEx& GetEscherEx() { return *mxEscherEx; } + XclEscherEx& GetEscherEx() { return *mxEscherEx; } XclExpMsoDrawing* GetMsodrawingPerSheet(); bool HasObj() const; sal_uInt16 AddObj( XclObj* pObjRec ); diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index b60d3438bc24..7bcdd57759ad 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -189,9 +189,9 @@ public: XclExpHyperlinkRef GetLinkRecord(); /** Returns true, if multiple URLs have been processed. */ - inline bool HasMultipleUrls() const { return mbMultipleUrls; } + bool HasMultipleUrls() const { return mbMultipleUrls; } /** Returns a string containing all processed URLs. */ - inline const OUString& GetUrlList() { return maUrlList; } + const OUString& GetUrlList() { return maUrlList; } private: XclExpHyperlinkRef mxLinkRec; /// Created HLINK record. @@ -374,9 +374,9 @@ public: const EditTextObject* pRightObj ); /** Returns the last generated header/footer string. */ - inline const OUString& GetHFString() const { return maHFString; } + const OUString& GetHFString() const { return maHFString; } /** Returns the total height of the last generated header/footer in twips. */ - inline sal_Int32 GetTotalHeight() const { return mnTotalHeight; } + sal_Int32 GetTotalHeight() const { return mnTotalHeight; } private: /** Converts the text object contents and stores it in the passed string. */ diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index b8f0868a6cd3..6798583bb252 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -89,19 +89,19 @@ public: SCTAB GetRealScTab( SCTAB nSortedScTab ) const; /** Returns the number of Calc sheets. */ - inline SCTAB GetScTabCount() const { return mnScCnt; } + SCTAB GetScTabCount() const { return mnScCnt; } /** Returns the number of Excel sheets to be exported. */ - inline sal_uInt16 GetXclTabCount() const { return mnXclCnt; } + sal_uInt16 GetXclTabCount() const { return mnXclCnt; } /** Returns the number of external linked sheets. */ - inline sal_uInt16 GetXclExtTabCount() const { return mnXclExtCnt; } + sal_uInt16 GetXclExtTabCount() const { return mnXclExtCnt; } /** Returns the number of exported selected sheets. */ - inline sal_uInt16 GetXclSelectedCount() const { return mnXclSelCnt; } + sal_uInt16 GetXclSelectedCount() const { return mnXclSelCnt; } /** Returns the Excel index of the active, displayed sheet. */ - inline sal_uInt16 GetDisplayedXclTab() const { return mnDisplXclTab; } + sal_uInt16 GetDisplayedXclTab() const { return mnDisplXclTab; } /** Returns the Excel index of the first visible sheet. */ - inline sal_uInt16 GetFirstVisXclTab() const { return mnFirstVisXclTab; } + sal_uInt16 GetFirstVisXclTab() const { return mnFirstVisXclTab; } private: /** Returns true, if any of the passed flags is set for the specified Calc sheet. */ @@ -121,7 +121,7 @@ private: OUString maScName; sal_uInt16 mnXclTab; ExcTabBufFlags mnFlags; - inline explicit XclExpTabInfoEntry() : mnXclTab( 0 ), mnFlags( ExcTabBufFlags::NONE ) {} + explicit XclExpTabInfoEntry() : mnXclTab( 0 ), mnFlags( ExcTabBufFlags::NONE ) {} }; typedef ::std::vector< XclExpTabInfoEntry > XclExpTabInfoVec; diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx index fe05987c39be..6fc206078885 100644 --- a/sc/source/filter/inc/xepage.hxx +++ b/sc/source/filter/inc/xepage.hxx @@ -96,7 +96,7 @@ public: explicit XclExpPageSettings( const XclExpRoot& rRoot ); /** Returns read-only access to the page data. */ - inline const XclPageData& GetPageData() const { return maData; } + const XclPageData& GetPageData() const { return maData; } /** Writes all page settings records to the stream. */ virtual void Save( XclExpStream& rStrm ) override; diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 8d9cd54770c1..7cdc3892bb26 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -45,7 +45,7 @@ public: explicit XclExpPCItem( sal_Int16 nValue ); explicit XclExpPCItem( bool bValue ); - inline sal_uInt16 GetTypeFlag() const { return mnTypeFlag; } + sal_uInt16 GetTypeFlag() const { return mnTypeFlag; } bool EqualsText( const OUString& rText ) const; bool EqualsDouble( double fValue ) const; @@ -79,7 +79,7 @@ public: void SetGroupChildField( const XclExpPCField& rChildField ); /** Returns the name of this cache field. */ - inline const OUString& GetFieldName() const { return maFieldInfo.maName; } + const OUString& GetFieldName() const { return maFieldInfo.maName; } /** Returns the number of visible items of this field. */ sal_uInt16 GetItemCount() const; @@ -164,12 +164,12 @@ public: const ScDPObject& rDPObj, sal_uInt16 nListIdx ); /** Returns true, if the cache has been constructed successfully. */ - inline bool IsValid() const { return mbValid; } + bool IsValid() const { return mbValid; } /** Returns true, if the item index list will be written. */ bool HasItemIndexList() const; /** Returns the list index of the cache used in pivot table records. */ - inline sal_uInt16 GetCacheIndex() const { return mnListIdx; } + sal_uInt16 GetCacheIndex() const { return mnListIdx; } /** Returns the number of pivot cache fields. */ sal_uInt16 GetFieldCount() const; @@ -327,7 +327,7 @@ public: const XclExpPCField* GetCacheField( sal_uInt16 nCacheIdx ) const; /** Returns the output range of the pivot table. */ - inline SCTAB GetScTab() const { return mnOutScTab; } + SCTAB GetScTab() const { return mnOutScTab; } /** Returns a pivot table field by its name. */ const XclExpPTField* GetField( sal_uInt16 nFieldIdx ) const; diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index 5bff6106f2f3..efa20eb0f402 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -125,16 +125,16 @@ public: virtual ~XclExpRecord() override; /** Returns the current record ID. */ - inline sal_uInt16 GetRecId() const { return mnRecId; } + sal_uInt16 GetRecId() const { return mnRecId; } /** Returns the current record size prediction. */ - inline std::size_t GetRecSize() const { return mnRecSize; } + std::size_t GetRecSize() const { return mnRecSize; } /** Sets a new record ID. */ - inline void SetRecId( sal_uInt16 nRecId ) { mnRecId = nRecId; } + void SetRecId( sal_uInt16 nRecId ) { mnRecId = nRecId; } /** Sets a new record size prediction. */ - inline void SetRecSize( std::size_t nRecSize ) { mnRecSize = nRecSize; } + void SetRecSize( std::size_t nRecSize ) { mnRecSize = nRecSize; } /** Adds a size value to the record size prediction. */ - inline void AddRecSize( std::size_t nRecSize ) { mnRecSize += nRecSize; } + void AddRecSize( std::size_t nRecSize ) { mnRecSize += nRecSize; } /** Sets record ID and size with one call. */ void SetRecHeader( sal_uInt16 nRecId, std::size_t nRecSize ); @@ -173,13 +173,13 @@ 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, std::size_t nSize = sizeof( Type ) ) : + 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. */ - inline const Type& GetValue() const { return maValue; } + const Type& GetValue() const { return maValue; } /** Sets a new record value. */ - inline void SetValue( const Type& rValue ) { maValue = rValue; } + void SetValue( const Type& rValue ) { maValue = rValue; } /** Sets the OOXML attribute this record corresponds to */ XclExpValueRecord* SetAttribute( sal_Int32 nId ); @@ -230,11 +230,11 @@ class XclExpBoolRecord : public XclExpRecord public: /** @param nRecId The record ID of this record. @param nValue The value for the record body. */ - inline explicit XclExpBoolRecord( sal_uInt16 nRecId, bool bValue, sal_Int32 nAttribute = -1 ) : + explicit XclExpBoolRecord( sal_uInt16 nRecId, bool bValue, sal_Int32 nAttribute = -1 ) : XclExpRecord( nRecId, 2 ), mbValue( bValue ), mnAttribute( nAttribute ) {} /** Returns the Boolean value of the record. */ - inline bool GetBool() const { return mbValue; } + bool GetBool() const { return mbValue; } virtual void SaveXml( XclExpXmlStream& rStrm ) override; @@ -297,41 +297,41 @@ class XclExpRecordList : public XclExpRecordBase public: typedef std::shared_ptr< RecType > RecordRefType; - inline bool IsEmpty() const { return maRecs.empty(); } - inline size_t GetSize() const { return maRecs.size(); } + bool IsEmpty() const { return maRecs.empty(); } + size_t GetSize() const { return maRecs.size(); } /** Returns true, if the passed index points to an exiting record. */ - inline bool HasRecord( size_t nPos ) const + bool HasRecord( size_t nPos ) const { return nPos < maRecs.size(); } /** Returns reference to an existing record or empty reference on error. */ - inline RecordRefType GetRecord( size_t nPos ) const + RecordRefType GetRecord( size_t nPos ) const { return (nPos < maRecs.size()) ? maRecs[ nPos ] : RecordRefType(); } /** Returns reference to the first existing record or empty reference, if list is empty. */ - inline RecordRefType GetFirstRecord() const + RecordRefType GetFirstRecord() const { return maRecs.empty() ? RecordRefType() : maRecs.front(); } /** Returns reference to the last existing record or empty reference, if list is empty. */ - inline RecordRefType GetLastRecord() const + RecordRefType GetLastRecord() const { return maRecs.empty() ? RecordRefType() : maRecs.back(); } /** Inserts a record at the specified position into the list. */ - inline void InsertRecord( RecordRefType xRec, size_t nPos ) + void InsertRecord( RecordRefType xRec, size_t nPos ) { if( xRec.get() ) maRecs.insert( maRecs.begin() + ::std::min( nPos, maRecs.size() ), xRec ); } /** Appends a record to the list. */ - inline void AppendRecord( RecordRefType xRec ) + void AppendRecord( RecordRefType xRec ) { if( xRec.get() ) maRecs.push_back( xRec ); } /** Replaces the record at the specified position from the list with the passed record. */ - inline void ReplaceRecord( RecordRefType xRec, size_t nPos ) + void ReplaceRecord( RecordRefType xRec, size_t nPos ) { RemoveRecord( nPos ); InsertRecord( xRec, nPos ); } /** Appends a newly created record to the list. */ - inline void AppendNewRecord( RecType* pRec ) + void AppendNewRecord( RecType* pRec ) { if( pRec ) AppendRecord( RecordRefType( pRec ) ); } /** Removes the record at the specified position from the list. */ - inline void RemoveRecord( size_t nPos ) + void RemoveRecord( size_t nPos ) { if( nPos < maRecs.size() ) maRecs.erase( maRecs.begin() + nPos ); } /** Removes all records from the list. */ - inline void RemoveAllRecords() { maRecs.clear(); } + void RemoveAllRecords() { maRecs.clear(); } /** Writes the complete record list. */ virtual void Save( XclExpStream& rStrm ) override diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index 5a7ac4ef751e..6ccfda12691f 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -115,9 +115,9 @@ public: explicit XclExpRoot( XclExpRootData& rExpRootData ); /** Returns this root instance - for code readability in derived classes. */ - inline const XclExpRoot& GetRoot() const { return *this; } + const XclExpRoot& GetRoot() const { return *this; } /** Returns true, if URLs should be stored relative to the document location. */ - inline bool IsRelUrl() const { return mrExpData.mbRelUrl; } + bool IsRelUrl() const { return mrExpData.mbRelUrl; } sc::CompileFormulaContext& GetCompileFormulaContext() const { return *mrExpData.mpCompileFormulaCxt; } /** Returns the buffer for Calc->Excel sheet index conversion. */ @@ -155,7 +155,7 @@ public: XclExpDxfs& GetDxfs() const; /** Clean and return the OStringBuffer */ - inline OStringBuffer& GetStringBuf() const { mrExpData.maStringBuf.setLength(0); return mrExpData.maStringBuf; } + OStringBuffer& GetStringBuf() const { mrExpData.maStringBuf.setLength(0); return mrExpData.maStringBuf; } XclExpXmlPivotTableManager& GetXmlPivotTableManager(); diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 754187b46ea2..8c8808a1927c 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -84,7 +84,7 @@ public: ~XclExpStream(); /** Returns the filter root data. */ - inline const XclExpRoot& GetRoot() const { return mrRoot; } + const XclExpRoot& GetRoot() const { return mrRoot; } /** Starts a new record: writes header data, stores calculated record size. */ void StartRecord( sal_uInt16 nRecId, std::size_t nRecSize ); @@ -92,7 +92,7 @@ public: void EndRecord(); /** Returns the position inside of current record (starts by 0 in every CONTINUE). */ - inline sal_uInt16 GetRawRecPos() const { return mnCurrSize; } + sal_uInt16 GetRawRecPos() const { return mnCurrSize; } /** Sets data slice length. 0 = no slices. */ void SetSliceSize( sal_uInt16 nSize ); @@ -137,7 +137,7 @@ public: /** Sets position of system stream (only allowed outside of records). */ void SetSvStreamPos(sal_uInt64 nPos); /** Returns the absolute position of the system stream. */ - inline sal_uInt64 GetSvStreamPos() const { return mrStrm.Tell(); } + sal_uInt64 GetSvStreamPos() const { return mrStrm.Tell(); } void SetEncrypter( XclExpEncrypterRef const & xEncrypter ); @@ -295,7 +295,7 @@ public: virtual ~XclExpXmlStream() override; /** Returns the filter root data. */ - inline const XclExpRoot& GetRoot() const { return *mpRoot; } + const XclExpRoot& GetRoot() const { return *mpRoot; } sax_fastparser::FSHelperPtr& GetCurrentStream(); void PushStream( sax_fastparser::FSHelperPtr const & aStream ); diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index 570a3f0e25a7..56726faea3fc 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -111,22 +111,22 @@ public: // get data --------------------------------------------------------------- /** Returns the character count of the string. */ - inline sal_uInt16 Len() const { return mnLen; } + sal_uInt16 Len() const { return mnLen; } /** Returns true, if the string is empty. */ - inline bool IsEmpty() const { return mnLen == 0; } + bool IsEmpty() const { return mnLen == 0; } /** Returns true, if the string contains line breaks. */ - inline bool IsWrapped() const { return mbWrapped; } + bool IsWrapped() const { return mbWrapped; } /** Returns true, if this string is equal to the passed string. */ bool IsEqual( const XclExpString& rCmp ) const; /** Returns true, if this string is less than the passed string. */ bool IsLessThan( const XclExpString& rCmp ) const; /** Returns true, if the string contains formatting information. */ - inline bool IsRich() const { return !maFormats.empty(); } + bool IsRich() const { return !maFormats.empty(); } /** Returns the current count of formatting runs for rich strings. */ sal_uInt16 GetFormatsCount() const; /** Returns the vector with all formatting runs. */ - inline const XclFormatRunVec& GetFormats() const { return maFormats; } + const XclFormatRunVec& GetFormats() const { return maFormats; } /** Returns the current string flags field to export. */ sal_uInt8 GetFlagField() const; diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index f22d4e4fda80..0cf18f9bacf1 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -162,9 +162,9 @@ public: const XclFontData& rFontData, XclExpColorType eColorType ); /** Returns read-only access to font data. */ - inline const XclFontData& GetFontData() const { return maData; } + const XclFontData& GetFontData() const { return maData; } /** Returns the font color identifier. */ - inline sal_uInt32 GetFontColorId() const { return mnColorId; } + sal_uInt32 GetFontColorId() const { return mnColorId; } /** Compares this font with the passed font data. @param nHash The hash value calculated from the font data. */ virtual bool Equals( const XclFontData& rFontData, sal_uInt32 nHash ) const; @@ -261,7 +261,7 @@ struct XclExpNumFmt sal_uInt16 mnXclNumFmt; /// Resulting Excel format index. OUString maNumFmtString; /// format string - inline explicit XclExpNumFmt( sal_uInt32 nScNumFmt, sal_uInt16 nXclNumFmt, const OUString& rFrmt ) : + explicit XclExpNumFmt( sal_uInt32 nScNumFmt, sal_uInt16 nXclNumFmt, const OUString& rFrmt ) : mnScNumFmt( nScNumFmt ), mnXclNumFmt( nXclNumFmt ), maNumFmtString( rFrmt ) {} void SaveXml( XclExpXmlStream& rStrm ); @@ -278,7 +278,7 @@ public: virtual ~XclExpNumFmtBuffer() override; /** Returns the core index of the current standard number format. */ - inline sal_uInt32 GetStandardFormat() const { return mnStdFmt; } + sal_uInt32 GetStandardFormat() const { return mnStdFmt; } /** Inserts a number format into the format buffer. @param nScNumFmt The core index of the number format. @@ -539,7 +539,7 @@ public: explicit XclExpStyle( sal_uInt32 nXFId, sal_uInt8 nStyleId, sal_uInt8 nLevel ); /** Returns true, if this record represents an Excel built-in style. */ - inline bool IsBuiltIn() const { return mnStyleId != EXC_STYLE_USERDEF; } + bool IsBuiltIn() const { return mnStyleId != EXC_STYLE_USERDEF; } virtual void SaveXml( XclExpXmlStream& rStrm ) override; diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 12837cac6964..1cf60bc8a69c 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -278,11 +278,11 @@ class XclExpCellBase : public XclExpRecord { public: /** Returns the (first) address of the cell(s). */ - inline const XclAddress& GetXclPos() const { return maXclPos; } + const XclAddress& GetXclPos() const { return maXclPos; } /** Returns the (first) Excel column index of the cell(s). */ - inline sal_uInt16 GetXclCol() const { return maXclPos.mnCol; } + sal_uInt16 GetXclCol() const { return maXclPos.mnCol; } /** Returns the Excel row index of the cell. */ - inline sal_uInt32 GetXclRow() const { return maXclPos.mnRow; } + sal_uInt32 GetXclRow() const { return maXclPos.mnRow; } /** Derived classes return the column index of the last contained cell. */ virtual sal_uInt16 GetLastXclCol() const = 0; @@ -308,7 +308,7 @@ protected: 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; } + void SetXclCol( sal_uInt16 nXclCol ) { maXclPos.mnCol = nXclCol; } private: XclAddress maXclPos; /// Address of the cell. @@ -341,11 +341,11 @@ protected: sal_uInt16 nRecId, std::size_t nContSize, const XclAddress& rXclPos, const ScPatternAttr* pPattern, sal_Int16 nScript, sal_uInt32 nForcedXFId ); - inline void SetContSize( std::size_t nContSize ) { mnContSize = nContSize; } - inline std::size_t GetContSize() const { return mnContSize; } + void SetContSize( std::size_t nContSize ) { mnContSize = nContSize; } + std::size_t GetContSize() const { return mnContSize; } - inline void SetXFId( sal_uInt32 nXFId ) { maXFId.mnXFId = nXFId; } - inline sal_uInt32 GetXFId() const { return maXFId.mnXFId; } + void SetXFId( sal_uInt32 nXFId ) { maXFId.mnXFId = nXFId; } + sal_uInt32 GetXFId() const { return maXFId.mnXFId; } private: /** Writes cell address, XF index, and calls WriteContents() for each cell. */ @@ -470,7 +470,7 @@ struct XclExpMultiXFId : public XclExpXFId { sal_uInt16 mnCount; /// Number of XF identifiers. - inline explicit XclExpMultiXFId( sal_uInt32 nXFId, sal_uInt16 nCount = 1 ) : + explicit XclExpMultiXFId( sal_uInt32 nXFId, sal_uInt16 nCount = 1 ) : XclExpXFId( nXFId ), mnCount( nCount ) {} }; @@ -585,9 +585,9 @@ class XclExpOutlineBuffer { public: /** Returns true, if a collapsed group ends at the last processed position. */ - inline bool IsCollapsed() const { return mbCurrCollapse; } + bool IsCollapsed() const { return mbCurrCollapse; } /** Returns the highest level of an open group at the last processed position. */ - inline sal_uInt8 GetLevel() const { return ::std::min( mnCurrLevel, EXC_OUTLINE_MAX ); } + sal_uInt8 GetLevel() const { return ::std::min( mnCurrLevel, EXC_OUTLINE_MAX ); } protected: /** Constructs the outline buffer. @@ -603,7 +603,7 @@ private: { SCCOLROW mnScEndPos; /// The end position of a group in a level. bool mbHidden; /// true = Group in this level is hidden. - inline explicit XclExpLevelInfo() : mnScEndPos( 0 ), mbHidden( false ) {} + explicit XclExpLevelInfo() : mnScEndPos( 0 ), mbHidden( false ) {} }; typedef ::std::vector< XclExpLevelInfo > XclExpLevelInfoVec; @@ -617,11 +617,11 @@ private: class XclExpColOutlineBuffer : public XclExpOutlineBuffer { public: - inline explicit XclExpColOutlineBuffer( const XclExpRoot& rRoot ) : + explicit XclExpColOutlineBuffer( const XclExpRoot& rRoot ) : XclExpOutlineBuffer( rRoot, false ) {} /** Updates the current state by processing the settings of the passed Calc column. */ - inline void Update( SCCOL nScCol ) + void Update( SCCOL nScCol ) { UpdateColRow( static_cast< SCCOLROW >( nScCol ) ); } }; @@ -629,11 +629,11 @@ public: class XclExpRowOutlineBuffer : public XclExpOutlineBuffer { public: - inline explicit XclExpRowOutlineBuffer( const XclExpRoot& rRoot ) : + explicit XclExpRowOutlineBuffer( const XclExpRoot& rRoot ) : XclExpOutlineBuffer( rRoot, true ) {} /** Updates the current state by processing the settings of the passed Calc row. */ - inline void Update( SCROW nScRow ) + void Update( SCROW nScRow ) { UpdateColRow( static_cast< SCCOLROW >( nScRow ) ); } }; @@ -726,11 +726,11 @@ public: bool TryMerge( const XclExpColinfo& rColInfo ); /** Returns the Excel width of the column(s). */ - inline sal_uInt16 GetColWidth() const { return mnWidth; } + sal_uInt16 GetColWidth() const { return mnWidth; } /** Returns the final Excel XF index of the column(s). */ - inline sal_uInt16 GetXFIndex() const { return maXFId.mnXFIndex; } + sal_uInt16 GetXFIndex() const { return maXFId.mnXFIndex; } /** Returns the number of columns represented by this record. */ - inline sal_uInt16 GetColCount() const { return mnLastXclCol - mnFirstXclCol + 1; } + sal_uInt16 GetColCount() const { return mnLastXclCol - mnFirstXclCol + 1; } /** Returns true, if the column has default format and width. */ bool IsDefault( const XclExpDefcolwidth& rDefColWidth ) const; @@ -798,9 +798,9 @@ struct XclExpDefaultRowData explicit XclExpDefaultRowData( const XclExpRow& rRow ); /** Returns true, if rows are hidden by default. */ - inline bool IsHidden() const { return ::get_flag( mnFlags, EXC_DEFROW_HIDDEN ); } + bool IsHidden() const { return ::get_flag( mnFlags, EXC_DEFROW_HIDDEN ); } /** Returns true, if the rows have a manually set height by default. */ - inline bool IsUnsynced() const { return ::get_flag( mnFlags, EXC_DEFROW_UNSYNCED ); } + bool IsUnsynced() const { return ::get_flag( mnFlags, EXC_DEFROW_UNSYNCED ); } }; /** Represents a DEFROWHEIGHT record containing default format for unused rows. */ @@ -841,17 +841,17 @@ public: XclExpRowOutlineBuffer& rOutlineBfr, bool bAlwaysEmpty, bool bHidden, sal_uInt16 nHeight ); /** Returns the excel row index of this ROW record. */ - inline sal_uInt32 GetXclRow() const { return mnXclRow; } + sal_uInt32 GetXclRow() const { return mnXclRow; } /** Returns the height of the row in twips. */ - inline sal_uInt16 GetHeight() const { return mnHeight; } + sal_uInt16 GetHeight() const { return mnHeight; } /** Returns true, if this row does not contain at least one valid cell. */ - inline bool IsEmpty() const { return maCellList.IsEmpty(); } + bool IsEmpty() const { return maCellList.IsEmpty(); } /** Returns true, if this row is hidden. */ - inline bool IsHidden() const { return ::get_flag( mnFlags, EXC_ROW_HIDDEN ); } + bool IsHidden() const { return ::get_flag( mnFlags, EXC_ROW_HIDDEN ); } /** Returns true, if this row contains a manually set height. */ - inline bool IsUnsynced() const { return ::get_flag( mnFlags, EXC_ROW_UNSYNCED ); } + bool IsUnsynced() const { return ::get_flag( mnFlags, EXC_ROW_UNSYNCED ); } /** Returns true, if this row is enabled (will be exported). */ - inline bool IsEnabled() const { return mbEnabled; } + bool IsEnabled() const { return mbEnabled; } /** Appends the passed cell object to this row. */ void AppendCell( XclExpCellRef const & xCell, bool bIsMergedBase ); @@ -884,8 +884,8 @@ public: virtual void Save( XclExpStream& rStrm ) override; virtual void SaveXml( XclExpXmlStream& rStrm ) override; - inline sal_uInt32 GetXclRowRpt() const { return mnXclRowRpt; } - inline void SetXclRowRpt( sal_uInt32 nRpt ){ mnXclRowRpt = nRpt; } + sal_uInt32 GetXclRowRpt() const { return mnXclRowRpt; } + void SetXclRowRpt( sal_uInt32 nRpt ){ mnXclRowRpt = nRpt; } private: /** Inserts a cell at the specified list position, tries to merge with neighbors. */ void InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase ); diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 3a5272da7e6f..7d72bf89ddd3 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -87,7 +87,7 @@ public: virtual ~XclImpChRoot() override; /** Returns this root instance - for code readability in derived classes. */ - inline const XclImpChRoot& GetChRoot() const { return *this; } + const XclImpChRoot& GetChRoot() const { return *this; } /** Returns a reference to the parent chart data object. */ XclImpChChart& GetChartData() const; /** Returns chart type info for a unique chart type identifier. */ @@ -204,7 +204,7 @@ public: void ReadChFramePos( XclImpStream& rStrm ); /** Returns read-only access to the imported frame position data. */ - inline const XclChFramePos& GetFramePosData() const { return maData; } + const XclChFramePos& GetFramePosData() const { return maData; } private: XclChFramePos maData; /// Position of the frame. @@ -217,21 +217,21 @@ class XclImpChLineFormat { public: /** Creates a new line format object with automatic formatting. */ - inline explicit XclImpChLineFormat() {} + explicit XclImpChLineFormat() {} /** Creates a new line format object with the passed formatting. */ - inline explicit XclImpChLineFormat( const XclChLineFormat& rLineFmt ) : maData( rLineFmt ) {} + explicit XclImpChLineFormat( const XclChLineFormat& rLineFmt ) : maData( rLineFmt ) {} /** Reads the CHLINEFORMAT record (basic line properties). */ void ReadChLineFormat( XclImpStream& rStrm ); /** Returns true, if the line format is set to automatic. */ - inline bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO ); } + bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_AUTO ); } /** Returns true, if the line style is set to something visible. */ - inline bool HasLine() const { return IsAuto() || (maData.mnPattern != EXC_CHLINEFORMAT_NONE); } + bool HasLine() const { return IsAuto() || (maData.mnPattern != EXC_CHLINEFORMAT_NONE); } /** Returns the line width of this line format (returns 'single', if the line is invisible). */ - inline sal_Int16 GetWeight() const { return (IsAuto() || !HasLine()) ? EXC_CHLINEFORMAT_SINGLE : maData.mnWeight; } + sal_Int16 GetWeight() const { return (IsAuto() || !HasLine()) ? EXC_CHLINEFORMAT_SINGLE : maData.mnWeight; } /** Returns true, if the "show axis" flag is set. */ - inline bool IsShowAxis() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_SHOWAXIS ); } + bool IsShowAxis() const { return ::get_flag( maData.mnFlags, EXC_CHLINEFORMAT_SHOWAXIS ); } /** Converts and writes the contained data to the passed property set. */ void Convert( const XclImpChRoot& rRoot, @@ -249,17 +249,17 @@ class XclImpChAreaFormat { public: /** Creates a new area format object with automatic formatting. */ - inline explicit XclImpChAreaFormat() {} + explicit XclImpChAreaFormat() {} /** Creates a new area format object with the passed formatting. */ - inline explicit XclImpChAreaFormat( const XclChAreaFormat& rAreaFmt ) : maData( rAreaFmt ) {} + explicit XclImpChAreaFormat( const XclChAreaFormat& rAreaFmt ) : maData( rAreaFmt ) {} /** Reads the CHAREAFORMAT record (basic fill properties, e.g. transparent or colored). */ void ReadChAreaFormat( XclImpStream& rStrm ); /** Returns true, if the area format is set to automatic. */ - inline bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO ); } + bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHAREAFORMAT_AUTO ); } /** Returns true, if the area style is set to something visible. */ - inline bool HasArea() const { return IsAuto() || (maData.mnPattern != EXC_PATT_NONE); } + bool HasArea() const { return IsAuto() || (maData.mnPattern != EXC_PATT_NONE); } /** Converts and writes the contained data to the passed property set. */ void Convert( const XclImpChRoot& rRoot, @@ -305,7 +305,7 @@ class XclImpChFrameBase : public XclImpChGroupBase { public: /** Creates a new frame object without internal formatting objects. */ - inline explicit XclImpChFrameBase() {} + explicit XclImpChFrameBase() {} /** Creates a new frame object with specific default formatting. */ explicit XclImpChFrameBase( const XclChFormatInfo& rFmtInfo ); @@ -313,14 +313,14 @@ public: virtual void ReadSubRecord( XclImpStream& rStrm ) override; /** Returns true, if the line format is set to automatic. */ - inline bool IsAutoLine() const { return !mxLineFmt || mxLineFmt->IsAuto(); } + bool IsAutoLine() const { return !mxLineFmt || mxLineFmt->IsAuto(); } /** Returns true, if the line style is set to something visible. */ - inline bool HasLine() const { return IsAutoLine() || mxLineFmt->HasLine(); } + bool HasLine() const { return IsAutoLine() || mxLineFmt->HasLine(); } /** Returns the line weight used for this frame. */ - inline sal_Int16 GetLineWeight() const { return mxLineFmt ? mxLineFmt->GetWeight() : EXC_CHLINEFORMAT_SINGLE; } + sal_Int16 GetLineWeight() const { return mxLineFmt ? mxLineFmt->GetWeight() : EXC_CHLINEFORMAT_SINGLE; } /** Returns true, if the area format is set to automatic. */ - inline bool IsAutoArea() const { return !mxEscherFmt && (!mxAreaFmt || mxAreaFmt->IsAuto()); } + bool IsAutoArea() const { return !mxEscherFmt && (!mxAreaFmt || mxAreaFmt->IsAuto()); } protected: /** Converts and writes the contained line formatting to the passed property set. */ @@ -387,12 +387,12 @@ public: void SetTextFormats( const XclFormatRunVec& rFormats ); /** Returns the destination object (title, values, category, ...). */ - inline sal_uInt8 GetDestType() const { return maData.mnDestType; } + sal_uInt8 GetDestType() const { return maData.mnDestType; } /** Returns the link type (to worksheet, directly, default, ...). */ - inline sal_uInt8 GetLinkType() const { return maData.mnLinkType; } + sal_uInt8 GetLinkType() const { return maData.mnLinkType; } /** Returns true, if the source link contains explicit string data. */ - inline bool HasString() const { return mxString && !mxString->IsEmpty(); } + bool HasString() const { return mxString && !mxString->IsEmpty(); } /** Returns explicit string data or an empty string. */ OUString GetString() const { if (mxString) return mxString->GetText(); @@ -452,7 +452,7 @@ public: void ReadChFont( XclImpStream& rStrm ); /** Returns the contained font index. */ - inline sal_uInt16 GetFontIndex() const { return mnFontIdx; } + sal_uInt16 GetFontIndex() const { return mnFontIdx; } private: sal_uInt16 mnFontIdx; /// Index into font buffer. @@ -490,13 +490,13 @@ public: void UpdateDataLabel( bool bCateg, bool bValue, bool bPercent ); /** Returns the target object this text is linked to. */ - inline sal_uInt16 GetLinkTarget() const { return maObjLink.mnTarget; } + sal_uInt16 GetLinkTarget() const { return maObjLink.mnTarget; } /** Returns the position of the data point label this text is linked to. */ - inline const XclChDataPointPos& GetPointPos() const { return maObjLink.maPointPos; } + const XclChDataPointPos& GetPointPos() const { return maObjLink.maPointPos; } /** Returns true, if this text group contains string data. */ - inline bool HasString() const { return mxSrcLink && mxSrcLink->HasString(); } + bool HasString() const { return mxSrcLink && mxSrcLink->HasString(); } /** Returns true, if the text object is marked as deleted. */ - inline bool IsDeleted() const { return ::get_flag( maData.mnFlags, EXC_CHTEXT_DELETED ); } + bool IsDeleted() const { return ::get_flag( maData.mnFlags, EXC_CHTEXT_DELETED ); } /** Converts and writes the contained font settings to the passed property set. */ void ConvertFont( ScfPropertySet& rPropSet ) const; @@ -545,7 +545,7 @@ public: void ReadChMarkerFormat( XclImpStream& rStrm ); /** Returns true, if the marker format is set to automatic. */ - inline bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_AUTO ); } + bool IsAuto() const { return ::get_flag( maData.mnFlags, EXC_CHMARKERFORMAT_AUTO ); } /** Converts and writes the contained data to the passed property set. */ void Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet, @@ -584,7 +584,7 @@ public: /** Reads the CHSERIESFORMAT record (additional settings for a series). */ void ReadChSeriesFormat( XclImpStream& rStrm ); /** Returns true, if the series line is smoothed. */ - inline bool HasSpline() const { return ::get_flag( mnFlags, EXC_CHSERIESFORMAT_SMOOTHED ); } + bool HasSpline() const { return ::get_flag( mnFlags, EXC_CHSERIESFORMAT_SMOOTHED ); } private: sal_uInt16 mnFlags; /// Additional flags. @@ -642,7 +642,7 @@ public: /** Sets this object to the specified data point position. */ void SetPointPos( const XclChDataPointPos& rPointPos, sal_uInt16 nFormatIdx ); /** Sets type and text formatting for a data point label (CHTEXT group). */ - inline void SetDataLabel( XclImpChTextRef xLabel ) { mxLabel = xLabel; } + void SetDataLabel( XclImpChTextRef xLabel ) { mxLabel = xLabel; } /** Updates default data format for series group. */ void UpdateGroupFormat( const XclChExtTypeInfo& rTypeInfo ); @@ -654,15 +654,15 @@ public: void UpdateTrendLineFormat(); /** Returns the position of the data point described by this group. */ - inline const XclChDataPointPos& GetPointPos() const { return maData.maPointPos; } + const XclChDataPointPos& GetPointPos() const { return maData.maPointPos; } /** Returns the format index of the data point described by this group. */ - inline sal_uInt16 GetFormatIdx() const { return maData.mnFormatIdx; } + sal_uInt16 GetFormatIdx() const { return maData.mnFormatIdx; } /** Returns true, if markers are set to automatic format. */ - inline bool IsAutoMarker() const { return !mxMarkerFmt || mxMarkerFmt->IsAuto(); } + bool IsAutoMarker() const { return !mxMarkerFmt || mxMarkerFmt->IsAuto(); } /** Returns true, if the series line is smoothed. */ - inline bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); } + bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); } /** Returns the data label text object. */ - inline const XclImpChText* GetDataLabel() const { return mxLabel.get(); } + const XclImpChText* GetDataLabel() const { return mxLabel.get(); } /** Converts and writes the contained data to the passed property set. */ void Convert( ScfPropertySet& rPropSet, const XclChExtTypeInfo& rTypeInfo ) const; @@ -698,9 +698,9 @@ public: /** Reads the CHSERTRENDLINE record. */ void ReadChSerTrendLine( XclImpStream& rStrm ); /** Sets formatting information for the trend line. */ - inline void SetDataFormat( XclImpChDataFormatRef xDataFmt ) { mxDataFmt = xDataFmt; } + void SetDataFormat( XclImpChDataFormatRef xDataFmt ) { mxDataFmt = xDataFmt; } - inline void SetTrendlineName( const OUString& aTrendlineName) { maTrendLineName = aTrendlineName; } + void SetTrendlineName( const OUString& aTrendlineName) { maTrendLineName = aTrendlineName; } /** Creates an API object representing this trend line. */ css::uno::Reference< css::chart2::XRegressionCurve > @@ -728,7 +728,7 @@ public: XclImpChDataFormatRef const & xDataFmt ); /** Returns the type of this error bar (X/Y, plus/minus). */ - inline sal_uInt8 GetBarType() const { return maData.mnBarType; } + sal_uInt8 GetBarType() const { return maData.mnBarType; } /** Creates a labeled data sequence object from value data link. */ css::uno::Reference< css::chart2::data::XLabeledDataSequence > CreateValueSequence() const; @@ -772,18 +772,18 @@ public: void FinalizeDataFormats(); /** Returns the axes set identifier this series is assigned to (primary/secondary). */ - inline sal_uInt16 GetGroupIdx() const { return mnGroupIdx; } + sal_uInt16 GetGroupIdx() const { return mnGroupIdx; } /** Returns the 0-based index of the parent series (e.g. of a trend line). */ - inline sal_uInt16 GetParentIdx() const { return mnParentIdx; } + sal_uInt16 GetParentIdx() const { return mnParentIdx; } /** Returns true, if the series is child of another series (e.g. trend line). */ - inline bool HasParentSeries() const { return mnParentIdx != EXC_CHSERIES_INVALID; } + bool HasParentSeries() const { return mnParentIdx != EXC_CHSERIES_INVALID; } /** Returns true, if the series contains child series (e.g. trend lines). */ - inline bool HasChildSeries() const { return !maTrendLines.empty() || !m_ErrorBars.empty(); } + bool HasChildSeries() const { return !maTrendLines.empty() || !m_ErrorBars.empty(); } /** Returns series title or an empty string, if the series does not contain a title. */ OUString GetTitle() const { return mxTitleLink ? mxTitleLink->GetString() : OUString(); } /** Returns true, if the series line is smoothed. */ - inline bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); } + bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); } /** Creates a labeled data sequence object from value data link. */ css::uno::Reference< css::chart2::data::XLabeledDataSequence > @@ -854,9 +854,9 @@ public: void Finalize( bool bStockChart ); /** Returns the record identifier of the chart type record. */ - inline sal_uInt16 GetRecId() const { return mnRecId; } + sal_uInt16 GetRecId() const { return mnRecId; } /** Returns the chart type info struct for the contained chart type. */ - inline const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; } + const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; } /** Returns true, if the series in this chart type group are stacked on each other (no percentage). */ bool IsStacked() const; /** Returns true, if the series in this chart type group are stacked on each other as percentage. */ @@ -884,7 +884,7 @@ public: /** Reads the CHCHART3D record (properties for 3D charts). */ void ReadChChart3d( XclImpStream& rStrm ); /** Returns true, if the data points are clustered on the X axis. */ - inline bool IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); } + bool IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); } /** Converts and writes the contained data to the passed property set. */ void Convert( ScfPropertySet& rPropSet, bool b3dWallChart ) const; @@ -974,21 +974,21 @@ public: sal_uInt16 PopUnusedFormatIndex(); /** Returns the index of this chart type group. */ - inline sal_uInt16 GetGroupIdx() const { return maData.mnGroupIdx; } + sal_uInt16 GetGroupIdx() const { return maData.mnGroupIdx; } /** Returns the chart type info struct for the contained chart type. */ - inline const XclChExtTypeInfo& GetTypeInfo() const { return maTypeInfo; } + const XclChExtTypeInfo& GetTypeInfo() const { return maTypeInfo; } /** Returns true, if this chart type group contains at least one valid series. */ - inline bool IsValidGroup() const { return !maSeries.empty(); } + bool IsValidGroup() const { return !maSeries.empty(); } /** Returns true, if the series in this chart type group are stacked on each other as percentage. */ - inline bool IsPercent() const { return maType.IsPercent(); } + bool IsPercent() const { return maType.IsPercent(); } /** Returns true, if the chart is three-dimensional. */ - inline bool Is3dChart() const { return mxChart3d && maTypeInfo.mbSupports3d; } + bool Is3dChart() const { return mxChart3d && maTypeInfo.mbSupports3d; } /** Returns true, if chart type supports wall and floor format in 3d mode. */ - inline bool Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); } + bool Is3dWallChart() const { return Is3dChart() && (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_PIE); } /** Returns true, if the series in this chart type group are ordered on the Z axis. */ - inline bool Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); } + bool Is3dDeepChart() const { return Is3dWallChart() && mxChart3d && !mxChart3d->IsClustered(); } /** Returns true, if category (X axis) labels are enabled (may be disabled in radar charts). */ - inline bool HasCategoryLabels() const { return maType.HasCategoryLabels(); } + bool HasCategoryLabels() const { return maType.HasCategoryLabels(); } /** Returns true, if points of a series show varying automatic area format. */ bool HasVarPointFormat() const; /** Returns true, if bars are connected with lines (stacked bar charts only). */ @@ -1022,7 +1022,7 @@ private: void ReadChDataFormat( XclImpStream& rStrm ); /** Returns true, if the chart type group contains drop bar formats. */ - inline bool HasDropBars() const { return !m_DropBars.empty(); } + bool HasDropBars() const { return !m_DropBars.empty(); } /** Inserts the passed series into the chart type. Adds additional properties to the series. */ void InsertDataSeries( css::uno::Reference< css::chart2::XChartType > const & xChartType, @@ -1103,7 +1103,7 @@ public: void ReadChTick( XclImpStream& rStrm ); /** Returns true, if the axis shows attached labels. */ - inline bool HasLabels() const { return maData.mnLabelPos != EXC_CHTICK_NOLABEL; } + bool HasLabels() const { return maData.mnLabelPos != EXC_CHTICK_NOLABEL; } /** Returns the leading font color for the axis labels. */ Color GetFontColor() const; /** Returns the rotation value for the axis labels. */ @@ -1144,9 +1144,9 @@ public: virtual sal_uInt16 GetRotation() const override; /** Returns the type of this axis. */ - inline sal_uInt16 GetAxisType() const { return maData.mnType; } + sal_uInt16 GetAxisType() const { return maData.mnType; } /** Returns the axis dimension index used by the chart API. */ - inline sal_Int32 GetApiAxisDimension() const { return maData.GetApiAxisDimension(); } + sal_Int32 GetApiAxisDimension() const { return maData.GetApiAxisDimension(); } /** Creates an API axis object. */ css::uno::Reference< css::chart2::XAxis > @@ -1196,11 +1196,11 @@ public: void Finalize(); /** Returns true, if this axes set exists (returns false if this is a dummy object). */ - inline bool IsValidAxesSet() const { return !maTypeGroups.empty(); } + bool IsValidAxesSet() const { return !maTypeGroups.empty(); } /** Returns the index of the axes set (primary/secondary). */ - inline sal_uInt16 GetAxesSetId() const { return maData.mnAxesSetId; } + sal_uInt16 GetAxesSetId() const { return maData.mnAxesSetId; } /** Returns the axes set index used by the chart API. */ - inline sal_Int32 GetApiAxesSetIndex() const { return maData.GetApiAxesSetIndex(); } + sal_Int32 GetApiAxesSetIndex() const { return maData.GetApiAxesSetIndex(); } /** Returns the outer plot area position, if existing. */ const XclImpChFramePosRef& GetPlotAreaFramePos() const { return mxFramePos; } @@ -1291,7 +1291,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 std::size_t GetProgressSize() { return 2 * EXC_CHART_PROGRESS_SIZE; } + static std::size_t GetProgressSize() { return 2 * EXC_CHART_PROGRESS_SIZE; } /** Converts and writes all properties to the passed chart. */ void Convert( @@ -1383,7 +1383,7 @@ public: /** Returns the number of units on the progress bar needed for the chart. */ std::size_t GetProgressSize() const; /** Returns true, if the chart is based on a pivot table. */ - inline bool IsPivotChart() const { return mbIsPivotChart; } + bool IsPivotChart() const { return mbIsPivotChart; } /** Creates the chart object in the passed component. */ void Convert( css::uno::Reference< css::frame::XModel > const & xModel, diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 6c0552d31677..185ee9a3f388 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -73,9 +73,9 @@ public: static XclImpDrawObjRef ReadObj8( const XclImpRoot& rRoot, XclImpStream& rStrm ); /** Sets whether this is an area object (then its width and height must be greater than 0). */ - inline void SetAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; } + void SetAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; } /** If set to true, a new SdrObject will be created while in DFF import. */ - inline void SetSimpleMacro( bool bMacro ) { mbSimpleMacro = bMacro; } + void SetSimpleMacro( bool bMacro ) { mbSimpleMacro = bMacro; } /** Sets the object anchor explicitly. */ void SetAnchor( const XclObjAnchor& rAnchor ); @@ -85,32 +85,32 @@ public: bool bVisible, bool bAutoMargin ); /** If set to false, the SdrObject will not be created, processed, or inserted into the draw page. */ - inline void SetProcessSdrObj( bool bProcess ) { mbProcessSdr = bProcess; } + void SetProcessSdrObj( bool bProcess ) { mbProcessSdr = bProcess; } /** If set to false, the SdrObject will be created or processed, but not be inserted into the draw page. */ - inline void SetInsertSdrObj( bool bInsert ) { mbInsertSdr = bInsert; } + void SetInsertSdrObj( bool bInsert ) { mbInsertSdr = bInsert; } /** If set to true, a new SdrObject will be created while in DFF import. */ - inline void SetCustomDffObj( bool bCustom ) { mbCustomDff = bCustom; } + void SetCustomDffObj( bool bCustom ) { mbCustomDff = bCustom; } /** Returns the sheet index and Excel object identifier from OBJ record. */ - inline sal_uInt16 GetObjId() const { return mnObjId; } + sal_uInt16 GetObjId() const { return mnObjId; } /** Returns the Excel object type from OBJ record. */ - inline sal_uInt16 GetObjType() const { return mnObjType; } + sal_uInt16 GetObjType() const { return mnObjType; } /** Returns the name of this object, may generate a default name. */ virtual OUString GetObjName() const; /** Returns associated macro name, if set, otherwise zero length string. */ - inline const OUString& GetMacroName() const { return maMacroName; } + const OUString& GetMacroName() const { return maMacroName; } /** Returns the shape identifier used in the DFF stream. */ - inline sal_uInt32 GetDffShapeId() const { return mnDffShapeId; } + sal_uInt32 GetDffShapeId() const { return mnDffShapeId; } /** Returns the shape flags from the DFF stream. */ - inline sal_uInt32 GetDffFlags() const { return mnDffFlags; } + sal_uInt32 GetDffFlags() const { return mnDffFlags; } /** Returns true, if the object is hidden. */ - inline bool IsHidden() const { return mbHidden; } + bool IsHidden() const { return mbHidden; } /** Returns true, if the object is visible. */ - inline bool IsVisible() const { return mbVisible; } + bool IsVisible() const { return mbVisible; } /** Returns true, if the object is printable. */ - inline bool IsPrintable() const { return mbPrintable; } + bool IsPrintable() const { return mbPrintable; } /** Returns the object anchor if existing, null otherwise. */ const XclObjAnchor* GetAnchor() const; @@ -120,9 +120,9 @@ public: ScRange GetUsedArea( SCTAB nScTab ) const; /** Returns true, if the object is valid and will be processed. */ - inline bool IsProcessSdrObj() const { return mbProcessSdr && !mbHidden; } + bool IsProcessSdrObj() const { return mbProcessSdr && !mbHidden; } /** Returns true, if the SdrObject will be created or processed, but not be inserted into the draw page. */ - inline bool IsInsertSdrObj() const { return mbInsertSdr; } + bool IsInsertSdrObj() const { return mbInsertSdr; } /** Returns the needed size on the progress bar (calls virtual DoGetProgressSize() function). */ std::size_t GetProgressSize() const; @@ -215,7 +215,7 @@ private: std::vector< XclImpDrawObjRef > mObjs; public: - inline explicit XclImpDrawObjVector() : mObjs() {} + explicit XclImpDrawObjVector() : mObjs() {} std::vector< XclImpDrawObjRef >::const_iterator begin() const { return mObjs.begin(); } std::vector< XclImpDrawObjRef >::const_iterator end() const { return mObjs.end(); } @@ -386,7 +386,7 @@ public: explicit XclImpTextObj( const XclImpRoot& rRoot ); /** Stores the passed textbox data. */ - inline void SetTextData( const XclImpObjTextData& rTextData ) { maTextData = rTextData; } + void SetTextData( const XclImpObjTextData& rTextData ) { maTextData = rTextData; } protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ @@ -467,7 +467,7 @@ public: virtual ~XclImpControlHelper(); /** Returns true, if a linked cell address is present. */ - inline bool HasCellLink() const { return mxCellLink != nullptr; } + bool HasCellLink() const { return mxCellLink != nullptr; } /** Returns the SdrObject from the passed control shape and sets the bounding rectangle. */ SdrObjectPtr CreateSdrObjectFromShape( @@ -512,7 +512,7 @@ public: void SetDffProperties( const DffPropSet& rDffPropSet ); /** Returns the service name of the control component to be created. */ - inline OUString GetServiceName() const { return DoGetServiceName(); } + OUString GetServiceName() const { return DoGetServiceName(); } /** Fills the passed macro event descriptor. */ bool FillMacroDescriptor( css::script::ScriptEventDescriptor& rDescriptor ) const; @@ -820,22 +820,22 @@ public: /** Returns the ObjectName - can use non-obvious lookup for override in the associated vba document module stream**/ virtual OUString GetObjName() const override; /** Returns the graphic imported from the IMGDATA record. */ - inline const Graphic& GetGraphic() const { return maGraphic; } + const Graphic& GetGraphic() const { return maGraphic; } /** Returns the visible area of the imported graphic. */ - inline const Rectangle& GetVisArea() const { return maVisArea; } + const Rectangle& GetVisArea() const { return maVisArea; } /** Returns true, if the OLE object will be shown as symbol. */ - inline bool IsSymbol() const { return mbSymbol; } + bool IsSymbol() const { return mbSymbol; } /** Returns the storage name for the OLE object. */ OUString GetOleStorageName() const; /** Returns true, if this object is an OCX form control. */ - inline bool IsOcxControl() const { return mbEmbedded && mbControl && mbUseCtlsStrm; } + bool IsOcxControl() const { return mbEmbedded && mbControl && mbUseCtlsStrm; } /** Returns the position in the 'Ctls' stream for additional form control data. */ - inline std::size_t GetCtlsStreamPos() const { return mnCtlsStrmPos; } + std::size_t GetCtlsStreamPos() const { return mnCtlsStrmPos; } /** Returns the size in the 'Ctls' stream for additional form control data. */ - inline std::size_t GetCtlsStreamSize() const { return mnCtlsStrmSize; } + std::size_t GetCtlsStreamSize() const { return mnCtlsStrmSize; } protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ @@ -900,8 +900,8 @@ private: { SdrObject* mpSdrObj; /// Pointer to an SdrObject. sal_uInt32 mnDffFlags; /// Shape flags from DFF stream. - inline explicit XclImpSdrInfo() : mpSdrObj( nullptr ), mnDffFlags( 0 ) {} - inline void Set( SdrObject* pSdrObj, sal_uInt32 nDffFlags ) + explicit XclImpSdrInfo() : mpSdrObj( nullptr ), mnDffFlags( 0 ) {} + void Set( SdrObject* pSdrObj, sal_uInt32 nDffFlags ) { mpSdrObj = pSdrObj; mnDffFlags = nDffFlags; } }; typedef std::map< sal_uInt32, XclImpSdrInfo > XclImpSdrInfoMap; @@ -962,7 +962,7 @@ public: /** Returns true, if the conversion of OLE objects is supported. */ bool SupportsOleObjects() const; /** Returns the default text margin in drawing layer units. */ - inline sal_Int32 GetDefaultTextMargin() const { return mnDefTextMargin; } + sal_Int32 GetDefaultTextMargin() const { return mnDefTextMargin; } private: // virtual functions of SvxMSDffManager @@ -1068,7 +1068,7 @@ public: void ReadMsoDrawing( XclImpStream& rStrm ); /** Returns true, if the conversion of OLE objects is supported. */ - inline bool SupportsOleObjects() const { return mbOleObjs; } + bool SupportsOleObjects() const { return mbOleObjs; } /** Finds the OBJ record data related to the DFF shape at the passed position. */ XclImpDrawObjRef FindDrawObj( const DffRecordHeader& rHeader ) const; /** Finds the OBJ record data specified by the passed object identifier. */ @@ -1133,7 +1133,7 @@ public: void ReadTabChart( XclImpStream& rStrm ); /** Returns the total cell range covered by any shapes in the sheet. */ - inline const ScRange& GetUsedArea() const { return maScUsedArea; } + const ScRange& GetUsedArea() const { return maScUsedArea; } /** Converts all objects and inserts them into the sheet drawing page. */ void ConvertObjects( XclImpDffConverter& rDffConv ); diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index a523231f1c76..e5a5f6484194 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -201,11 +201,11 @@ private: // types private: /** Returns the current edit engine text object. */ - inline XclImpHFPortionInfo& GetCurrInfo() { return maInfos[ meCurrObj ]; } + XclImpHFPortionInfo& GetCurrInfo() { return maInfos[ meCurrObj ]; } /** Returns the current edit engine text object. */ - inline XclImpHFPortionInfo::EditTextObjectRef& GetCurrObj() { return GetCurrInfo().mxObj; } + XclImpHFPortionInfo::EditTextObjectRef& GetCurrObj() { return GetCurrInfo().mxObj; } /** Returns the current selection. */ - inline ESelection& GetCurrSel() { return GetCurrInfo().maSel; } + ESelection& GetCurrSel() { return GetCurrInfo().maSel; } /** Returns the maximum line height of the specified portion. */ sal_uInt16 GetMaxLineHeight( XclImpHFPortion ePortion ) const; @@ -309,15 +309,15 @@ public: virtual ~XclImpCachedValue(); /** Returns the type of the cached value (EXC_CACHEDVAL_*). */ - inline sal_uInt8 GetType() const { return mnType; } + sal_uInt8 GetType() const { return mnType; } /** Returns the cached string value, if this value is a string, else an empty string. */ const OUString& GetString() const { return maStr;} /** Returns the cached number, if this value has number type, else 0.0. */ - inline double GetValue() const { return mfValue; } + double GetValue() const { return mfValue; } /** Returns the cached Boolean value, if this value has Boolean type, else false. */ - inline bool GetBool() const { return (mnType == EXC_CACHEDVAL_BOOL) && (mnBoolErr != 0); } + bool GetBool() const { return (mnType == EXC_CACHEDVAL_BOOL) && (mnBoolErr != 0); } /** Returns the cached Calc error code, if this value has Error type, else 0. */ - inline sal_uInt8 GetXclError() const { return (mnType == EXC_CACHEDVAL_ERROR) ? mnBoolErr : EXC_ERR_NA; } + sal_uInt8 GetXclError() const { return (mnType == EXC_CACHEDVAL_ERROR) ? mnBoolErr : EXC_ERR_NA; } /** Returns the cached Calc error code, if this value has Error type, else 0. */ FormulaError GetScError() const; diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index a7e686c5556d..0da156da58b1 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -51,12 +51,12 @@ public: explicit XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ); - inline const OUString& GetXclName() const { return maXclName; } - inline const OUString& GetScName() const { return maScName; } - inline SCTAB GetScTab() const { return mnScTab; } - inline const ScRangeData* GetScRangeData() const { return mpScData; } - inline bool IsGlobal() const { return mnScTab == SCTAB_MAX; } - inline bool IsVBName() const { return mbVBName; } + const OUString& GetXclName() const { return maXclName; } + const OUString& GetScName() const { return maScName; } + SCTAB GetScTab() const { return mnScTab; } + const ScRangeData* GetScRangeData() const { return mpScData; } + bool IsGlobal() const { return mnScTab == SCTAB_MAX; } + bool IsVBName() const { return mbVBName; } bool IsMacro() const { return mbMacro; } void ConvertTokens(); diff --git a/sc/source/filter/inc/xipage.hxx b/sc/source/filter/inc/xipage.hxx index eef405a96d51..f7b1756c4231 100644 --- a/sc/source/filter/inc/xipage.hxx +++ b/sc/source/filter/inc/xipage.hxx @@ -33,7 +33,7 @@ public: explicit XclImpPageSettings( const XclImpRoot& rRoot ); /** Returns read-only access to the page data. */ - inline const XclPageData& GetPageData() const { return maData; } + const XclPageData& GetPageData() const { return maData; } /** Initializes the object to be used for a new sheet. */ void Initialize(); @@ -58,7 +58,7 @@ public: /** Overrides paper size and orientation (used in sheet-charts). */ void SetPaperSize( sal_uInt16 nXclPaperSize, bool bPortrait ); /** Sets or clears the fit-to-pages setting (contained in WSBOOL record). */ - inline void SetFitToPages( bool bFitToPages ) { maData.mbFitToPages = bFitToPages; } + void SetFitToPages( bool bFitToPages ) { maData.mbFitToPages = bFitToPages; } /** Creates a page stylesheet from current settings and sets it at current sheet. */ void Finalize(); diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index 8bf43053b343..34c0c32e214f 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -149,7 +149,7 @@ public: // data access ------------------------------------------------------------ /** Returns the data source range read from the DCONREF record. */ - inline const ScRange& GetSourceRange() const { return maSrcRange; } + const ScRange& GetSourceRange() const { return maSrcRange; } const OUString& GetSourceRangeName() const { return maSrcRangeName; } @@ -236,9 +236,9 @@ public: const OUString* GetItemName( sal_uInt16 nItemIdx ) const; /** Returns the flags of the axes this field is part of. */ - inline sal_uInt16 GetAxes() const { return maFieldInfo.mnAxes; } + sal_uInt16 GetAxes() const { return maFieldInfo.mnAxes; } /** Sets the flags of the axes this field is part of. */ - inline void SetAxes( sal_uInt16 nAxes ) { maFieldInfo.mnAxes = nAxes; } + void SetAxes( sal_uInt16 nAxes ) { maFieldInfo.mnAxes = nAxes; } // records ---------------------------------------------------------------- @@ -298,7 +298,7 @@ public: // cache/field access, misc. ---------------------------------------------- const XclImpPivotCacheRef& GetPivotCache() const { return mxPCache; } - inline const ScfStringVec& GetVisFieldNames() const { return maVisFieldNames; } + const ScfStringVec& GetVisFieldNames() const { return maVisFieldNames; } sal_uInt16 GetFieldCount() const; const XclImpPTField* GetField( sal_uInt16 nFieldIdx ) const; diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx index 0af43864bbda..389df5c7fcb4 100644 --- a/sc/source/filter/inc/xiroot.hxx +++ b/sc/source/filter/inc/xiroot.hxx @@ -129,8 +129,8 @@ public: explicit XclImpRoot( XclImpRootData& rImpRootData ); /** Returns this root instance - for code readability in derived classes. */ - inline const XclImpRoot& GetRoot() const { return *this; } - inline XclImpRoot& GetRoot() { return *this; } + const XclImpRoot& GetRoot() const { return *this; } + XclImpRoot& GetRoot() { return *this; } /** Sets a code page read from a CODEPAGE record for byte string import. */ void SetCodePage( sal_uInt16 nCodePage ); @@ -204,9 +204,9 @@ public: static OUString GetScAddInName( const OUString& rXclName ); /** Returns true, if the document contains a VB project. */ - inline bool HasBasic() const { return mrImpData.mbHasBasic; } + bool HasBasic() const { return mrImpData.mbHasBasic; } /** Called to indicate that the document contains a VB project. */ - inline void SetHasBasic() { mrImpData.mbHasBasic = true; } + void SetHasBasic() { mrImpData.mbHasBasic = true; } /** Reads the CODENAME record and inserts the codename into the document. */ void ReadCodeName( XclImpStream& rStrm, bool bGlobals ); diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 8c5567591b1e..a3f6890cdb3e 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -47,9 +47,9 @@ public: virtual ~XclImpDecrypter() override; /** Returns the current error code of the decrypter. */ - inline ErrCode GetError() const { return mnError; } + ErrCode GetError() const { return mnError; } /** Returns true, if the decoder has been initialized correctly. */ - inline bool IsValid() const { return mnError == ERRCODE_NONE; } + bool IsValid() const { return mnError == ERRCODE_NONE; } /** Creates a (ref-counted) copy of this decrypter object. */ XclImpDecrypterRef Clone() const; @@ -214,7 +214,7 @@ public: bool& rbValid ) const; /** Returns the stored stream position. */ - inline std::size_t GetPos() const { return mnPos; } + std::size_t GetPos() const { return mnPos; } private: std::size_t mnPos; /// Absolute position of the stream. @@ -289,7 +289,7 @@ public: ~XclImpStream(); /** Returns the filter root data. */ - inline const XclImpRoot& GetRoot() const { return mrRoot; } + const XclImpRoot& GetRoot() const { return mrRoot; } /** Sets stream pointer to the start of the next record content. @descr Ignores all CONTINUE records of the current record, if automatic @@ -330,7 +330,7 @@ public: /** Switches usage of current decryption algorithm off. @descr This is a record-local setting. The function StartNextRecord() always enables decryption. */ - inline void DisableDecryption() { EnableDecryption( false ); } + void DisableDecryption() { EnableDecryption( false ); } /** Pushes current position on user position stack. @descr This stack is emptied when starting a new record with @@ -347,9 +347,9 @@ public: void SeekGlobalPosition(); /** Returns record reading state: false = record overread. */ - inline bool IsValid() const { return mbValid; } + bool IsValid() const { return mbValid; } /** Returns the current record ID. */ - inline sal_uInt16 GetRecId() const { return mnRecId; } + sal_uInt16 GetRecId() const { return mnRecId; } /** Returns the position inside of the whole record content. */ std::size_t GetRecPos() const; /** Returns the data size of the whole record without record headers. */ @@ -426,7 +426,7 @@ public: @param cNulSubst The character to use for NUL replacement. It is possible to specify NUL here. in this case strings are terminated when the first NUL occurs during string import. */ - inline void SetNulSubstChar( sal_Unicode cNulSubst = '?' ) { mcNulSubst = cNulSubst; } + void SetNulSubstChar( sal_Unicode cNulSubst = '?' ) { mcNulSubst = cNulSubst; } /** Reads nChars characters and returns the string. */ OUString ReadRawUniString( sal_uInt16 nChars, bool b16Bit ); @@ -455,9 +455,9 @@ public: // *** SvStream functions *** --------------------------------------------- /** Returns the absolute stream position. */ - inline std::size_t GetSvStreamPos() const { return mrStrm.Tell(); } + std::size_t GetSvStreamPos() const { return mrStrm.Tell(); } /** Returns the stream size. */ - inline std::size_t GetSvStreamSize() const { return mnStreamSize; } + std::size_t GetSvStreamSize() const { return mnStreamSize; } /** Stores current stream position into rPos. */ void StorePosition( XclImpStreamPos& rPos ); diff --git a/sc/source/filter/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxx index 0cf90c0e53d9..bb9d9f360ae2 100644 --- a/sc/source/filter/inc/xistring.hxx +++ b/sc/source/filter/inc/xistring.hxx @@ -41,23 +41,23 @@ public: void Read( XclImpStream& rStrm, XclStrFlags nFlags = EXC_STR_DEFAULT ); /** Sets the passed string data. */ - inline void SetText( const OUString& rText ) { maString = rText; } + void SetText( const OUString& rText ) { maString = rText; } /** Sets the passed formatting buffer. */ - inline void SetFormats( const XclFormatRunVec& rFormats ) { maFormats = rFormats; } + void SetFormats( const XclFormatRunVec& rFormats ) { maFormats = rFormats; } /** Reads and appends the formatting information (run count and runs) from stream. */ - inline void ReadFormats( XclImpStream& rStrm ) { ReadFormats( rStrm, maFormats ); } + void ReadFormats( XclImpStream& rStrm ) { ReadFormats( rStrm, maFormats ); } /** Reads and appends formatting runs from an OBJ or TXO record. */ - inline void ReadObjFormats( XclImpStream& rStrm, sal_uInt16 nFormatSize ) { ReadObjFormats( rStrm, maFormats, nFormatSize ); } + void ReadObjFormats( XclImpStream& rStrm, sal_uInt16 nFormatSize ) { ReadObjFormats( rStrm, maFormats, nFormatSize ); } /** Returns true, if the string is empty. */ - inline bool IsEmpty() const { return maString.isEmpty(); } + bool IsEmpty() const { return maString.isEmpty(); } /** Returns the pure text data of the string. */ - inline const OUString& GetText() const { return maString; } + const OUString& GetText() const { return maString; } /** Returns true, if the string contains formatting information. */ - inline bool IsRich() const { return !maFormats.empty(); } + bool IsRich() const { return !maFormats.empty(); } /** Returns the formatting run vector. */ - inline const XclFormatRunVec& GetFormats() const { return maFormats; } + const XclFormatRunVec& GetFormats() const { return maFormats; } /** Insert a formatting run to the passed format buffer. */ static void AppendFormat( XclFormatRunVec& rFormats, sal_uInt16 nChar, sal_uInt16 nFontIdx ); @@ -82,9 +82,9 @@ public: explicit XclImpStringIterator( const XclImpString& rString ); /** Returns true, if the iterator references a valid text portion. */ - inline bool Is() const { return mnTextBeg < mrText.getLength(); } + bool Is() const { return mnTextBeg < mrText.getLength(); } /** Returns the index of the current text portion. */ - inline size_t GetPortionIndex() const { return mnPortion; } + size_t GetPortionIndex() const { return mnPortion; } /** Returns the string of the current text portion. */ OUString GetPortionText() const; /** Returns the font index of the current text portion. */ diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx index eb4c0c5e618a..66592f689b91 100644 --- a/sc/source/filter/inc/xistyle.hxx +++ b/sc/source/filter/inc/xistyle.hxx @@ -57,7 +57,7 @@ public: /** Returns the color for a (non-zero-based) Excel palette entry. @descr First looks for a color read from file, then looks for a default color. @return The color from current or default palette or COL_AUTO, if nothing else found. */ - inline Color GetColor( sal_uInt16 nXclIndex ) const + Color GetColor( sal_uInt16 nXclIndex ) const { return Color( GetColorData( nXclIndex ) ); } /** Reads a PALETTE record. */ @@ -89,16 +89,16 @@ public: void SetFontData( const XclFontData& rFontData, bool bHasCharSet ); /** Returns read-only access to font data. */ - inline const XclFontData& GetFontData() const { return maData; } + const XclFontData& GetFontData() const { return maData; } /** Returns true, if the font character set is valid. */ - inline bool HasCharSet() const { return mbHasCharSet; } + bool HasCharSet() const { return mbHasCharSet; } /** Returns true, if the font contains superscript or subscript. */ - inline bool HasEscapement() const { return maData.mnEscapem != EXC_FONTESC_NONE; } + bool HasEscapement() const { return maData.mnEscapem != EXC_FONTESC_NONE; } /** Returns the text encoding for strings used with this font. */ rtl_TextEncoding GetFontEncoding() const; /** Returns true, if this font contains characters for Asian scripts (CJK). */ - inline bool HasAsianChars() const { return mbHasAsian; } + bool HasAsianChars() const { return mbHasAsian; } /** Reads a FONT record for all BIFF versions. */ void ReadFont( XclImpStream& rStrm ); @@ -171,7 +171,7 @@ public: /** Returns the object that stores all contents of a FONT record. */ const XclImpFont* GetFont( sal_uInt16 nFontIndex ) const; /** Returns the application font data of this file, needed i.e. for column width. */ - inline const XclFontData& GetAppFontData() const { return maAppFont; } + const XclFontData& GetAppFontData() const { return maAppFont; } /** Reads a FONT record. */ void ReadFont( XclImpStream& rStrm ); @@ -362,11 +362,11 @@ struct XclImpCellArea : public XclCellArea class XclImpXFIndex { public: - inline explicit XclImpXFIndex( sal_uInt16 nXFIndex, bool bBoolCell = false ) : + explicit XclImpXFIndex( sal_uInt16 nXFIndex, bool bBoolCell = false ) : mnXFIndex( nXFIndex ), mbBoolCell( bBoolCell ) {} - inline sal_uInt16 GetXFIndex() const { return mnXFIndex; } - inline bool IsBoolCell() const { return mbBoolCell; } + sal_uInt16 GetXFIndex() const { return mnXFIndex; } + bool IsBoolCell() const { return mbBoolCell; } private: sal_uInt16 mnXFIndex; /// The XF record index. @@ -393,8 +393,8 @@ public: /** Reads an XF record. */ void ReadXF( XclImpStream& rStrm ); - inline sal_uInt8 GetHorAlign() const { return maAlignment.mnHorAlign; } - inline sal_uInt16 GetFontIndex() const { return mnXclFont; } + sal_uInt8 GetHorAlign() const { return maAlignment.mnHorAlign; } + sal_uInt16 GetFontIndex() const { return mnXclFont; } /** Creates a Calc item set containing an item set with all cell properties. @param bSkipPoolDefs true = Do not put items equal to pool default; false = Put all items. @@ -453,11 +453,11 @@ public: /** Reads a STYLE record. */ void ReadStyle( XclImpStream& rStrm ); - inline const OUString& GetName() const { return maName; } - inline sal_uInt16 GetXfId() const { return mnXfId; } - inline bool IsBuiltin() const { return mbBuiltin && (mnBuiltinId != EXC_STYLE_USERDEF); } - inline sal_uInt8 GetBuiltinId() const { return mnBuiltinId; } - inline sal_uInt8 GetLevel() const { return mnLevel; } + const OUString& GetName() const { return maName; } + sal_uInt16 GetXfId() const { return mnXfId; } + bool IsBuiltin() const { return mbBuiltin && (mnBuiltinId != EXC_STYLE_USERDEF); } + sal_uInt8 GetBuiltinId() const { return mnBuiltinId; } + sal_uInt8 GetLevel() const { return mnLevel; } /** Creates a cell style sheet and inserts it into the Calc document. @return The pointer to the cell style sheet, or 0, if there is no style sheet. */ @@ -498,10 +498,10 @@ public: void ReadStyle( XclImpStream& rStrm ); /** Returns the object that stores all contents of an XF record. */ - inline XclImpXF* GetXF( sal_uInt16 nXFIndex ) + XclImpXF* GetXF( sal_uInt16 nXFIndex ) { return (nXFIndex >= maXFList.size()) ? nullptr : maXFList.at(nXFIndex).get(); } - inline const XclImpXF* GetXF( sal_uInt16 nXFIndex ) const + const XclImpXF* GetXF( sal_uInt16 nXFIndex ) const { return (nXFIndex >= maXFList.size()) ? nullptr : maXFList.at(nXFIndex).get(); } /** Returns the index to the Excel font used in the specified XF record. */ @@ -578,7 +578,7 @@ public: typedef std::vector< std::unique_ptr<XclImpXFRange> > IndexList; - inline explicit XclImpXFRangeColumn() {} + explicit XclImpXFRangeColumn() {} IndexList::iterator begin() { return maIndexList.begin(); } IndexList::iterator end() { return maIndexList.end(); } diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx index 1723c8aa6925..60a843031c29 100644 --- a/sc/source/filter/inc/xladdress.hxx +++ b/sc/source/filter/inc/xladdress.hxx @@ -32,11 +32,11 @@ struct XclAddress sal_uInt16 mnCol; sal_uInt32 mnRow; - inline explicit XclAddress( ScAddress::Uninitialized ) {} - inline explicit XclAddress() : mnCol( 0 ), mnRow( 0 ) {} - inline explicit XclAddress( sal_uInt16 nCol, sal_uInt32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} + explicit XclAddress( ScAddress::Uninitialized ) {} + explicit XclAddress() : mnCol( 0 ), mnRow( 0 ) {} + explicit XclAddress( sal_uInt16 nCol, sal_uInt32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} - inline void Set( sal_uInt16 nCol, sal_uInt32 nRow ) { mnCol = nCol; mnRow = nRow; } + void Set( sal_uInt16 nCol, sal_uInt32 nRow ) { mnCol = nCol; mnRow = nRow; } void Read( XclImpStream& rStrm ); void Write( XclExpStream& rStrm ) const; @@ -60,17 +60,17 @@ struct XclRange XclAddress maFirst; XclAddress maLast; - inline explicit XclRange( ScAddress::Uninitialized e ) : maFirst( e ), maLast( e ) {} - inline explicit XclRange() {} - inline explicit XclRange( const XclAddress& rPos ) : maFirst( rPos ), maLast( rPos ) {} - inline explicit XclRange( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 ) : + explicit XclRange( ScAddress::Uninitialized e ) : maFirst( e ), maLast( e ) {} + explicit XclRange() {} + explicit XclRange( const XclAddress& rPos ) : maFirst( rPos ), maLast( rPos ) {} + explicit XclRange( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 ) : maFirst( nCol1, nRow1 ), maLast( nCol2, nRow2 ) {} - inline void Set( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 ) + void Set( sal_uInt16 nCol1, sal_uInt32 nRow1, sal_uInt16 nCol2, sal_uInt32 nRow2 ) { maFirst.Set( nCol1, nRow1 ); maLast.Set( nCol2, nRow2 ); } - inline sal_uInt16 GetColCount() const { return maLast.mnCol - maFirst.mnCol + 1; } - inline sal_uInt32 GetRowCount() const { return maLast.mnRow - maFirst.mnRow + 1; } + sal_uInt16 GetColCount() const { return maLast.mnCol - maFirst.mnCol + 1; } + sal_uInt32 GetRowCount() const { return maLast.mnRow - maFirst.mnRow + 1; } bool Contains( const XclAddress& rPos ) const; void Read( XclImpStream& rStrm, bool bCol16Bit = true ); @@ -98,7 +98,7 @@ private: XclRangeVector mRanges; public: - inline explicit XclRangeList() : mRanges() {} + explicit XclRangeList() : mRanges() {} size_t size() const { return mRanges.size(); } bool empty() const { return mRanges.empty(); } @@ -137,11 +137,11 @@ public: virtual ~XclAddressConverterBase(); /** Returns whether the "some columns have been cut" warning box should be shown. */ - inline bool IsColTruncated() const { return mbColTrunc; } + bool IsColTruncated() const { return mbColTrunc; } /** Returns whether the "some rows have been cut" warning box should be shown. */ - inline bool IsRowTruncated() const { return mbRowTrunc; } + bool IsRowTruncated() const { return mbRowTrunc; } /** Returns whether the "some sheets have been cut" warning box should be shown. */ - inline bool IsTabTruncated() const { return mbTabTrunc; } + bool IsTabTruncated() const { return mbTabTrunc; } /** Checks if the passed sheet index is valid. @param nScTab The sheet index to check. diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index b47d4080d935..8aa8a47010f4 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -1227,10 +1227,10 @@ struct XclChExtTypeInfo : public XclChTypeInfo void Set( const XclChTypeInfo& rTypeInfo, bool b3dChart, bool bSpline ); /** Returns true, if this chart type supports area formatting for its series. */ - inline bool IsSeriesFrameFormat() const + bool IsSeriesFrameFormat() const { return mb3dChart ? mbSeriesIsFrame3d : mbSeriesIsFrame2d; } /** Returns the correct object type identifier for series and data points. */ - inline XclChObjectType GetSeriesObjectType() const + XclChObjectType GetSeriesObjectType() const { return IsSeriesFrameFormat() ? EXC_CHOBJTYPE_FILLEDSERIES : EXC_CHOBJTYPE_LINEARSERIES; } }; @@ -1268,7 +1268,7 @@ enum XclChTextType /** A map key for text and title objects. */ struct XclChTextKey : public ::std::pair< XclChTextType, ::std::pair< sal_uInt16, sal_uInt16 > > { - inline explicit XclChTextKey( XclChTextType eTextType, sal_uInt16 nMainIdx = 0, sal_uInt16 nSubIdx = 0 ) + explicit XclChTextKey( XclChTextType eTextType, sal_uInt16 nMainIdx = 0, sal_uInt16 nSubIdx = 0 ) { first = eTextType; second.first = nMainIdx; second.second = nSubIdx; } }; diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx index 421cd7c78b45..7ad4d40b9606 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -360,8 +360,8 @@ struct XclObjLineData explicit XclObjLineData(); - inline bool IsAuto() const { return ::get_flag( mnAuto, EXC_OBJ_LINE_AUTO ); } - inline bool IsVisible() const { return IsAuto() || (mnStyle != EXC_OBJ_LINE_NONE); } + bool IsAuto() const { return ::get_flag( mnAuto, EXC_OBJ_LINE_AUTO ); } + bool IsVisible() const { return IsAuto() || (mnStyle != EXC_OBJ_LINE_NONE); } }; XclImpStream& operator>>( XclImpStream& rStrm, XclObjLineData& rLineData ); @@ -375,8 +375,8 @@ struct XclObjFillData explicit XclObjFillData(); - inline bool IsAuto() const { return ::get_flag( mnAuto, EXC_OBJ_FILL_AUTO ); } - inline bool IsFilled() const { return IsAuto() || (mnPattern != EXC_PATT_NONE); } + bool IsAuto() const { return ::get_flag( mnAuto, EXC_OBJ_FILL_AUTO ); } + bool IsFilled() const { return IsAuto() || (mnPattern != EXC_PATT_NONE); } }; XclImpStream& operator>>( XclImpStream& rStrm, XclObjFillData& rFillData ); @@ -402,8 +402,8 @@ struct XclObjTextData /** Reads text data from a BIFF8 TXO record. */ void ReadTxo8( XclImpStream& rStrm ); - inline sal_uInt8 GetHorAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 1, 3 ); } - inline sal_uInt8 GetVerAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 4, 3 ); } + sal_uInt8 GetHorAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 1, 3 ); } + sal_uInt8 GetVerAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 4, 3 ); } }; enum XclTbxEventType diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx index a0fcc25b35c6..f1e128784d1d 100644 --- a/sc/source/filter/inc/xlformula.hxx +++ b/sc/source/filter/inc/xlformula.hxx @@ -324,15 +324,15 @@ struct XclFunctionInfo EXC_FUNCFLAG_ADDINEQUIV is set. */ /** Returns true, if the function is volatile. */ - inline bool IsVolatile() const { return ::get_flag( mnFlags, EXC_FUNCFLAG_VOLATILE ); } + bool IsVolatile() const { return ::get_flag( mnFlags, EXC_FUNCFLAG_VOLATILE ); } /** Returns true, if optional parameters are expected to appear in pairs. */ - inline bool IsParamPairs() const { return ::get_flag( mnFlags, EXC_FUNCFLAG_PARAMPAIRS ); } + bool IsParamPairs() const { return ::get_flag( mnFlags, EXC_FUNCFLAG_PARAMPAIRS ); } /** Returns true, if the function parameter count is fixed. */ - inline bool IsFixedParamCount() const { return (mnXclFunc != EXC_FUNCID_EXTERNCALL) && (mnMinParamCount == mnMaxParamCount); } + bool IsFixedParamCount() const { return (mnXclFunc != EXC_FUNCID_EXTERNCALL) && (mnMinParamCount == mnMaxParamCount); } /** Returns true, if the function is simulated by a macro call. */ - inline bool IsMacroFunc() const { return mpcMacroName != nullptr && !(mnFlags & EXC_FUNCFLAG_ADDINEQUIV); } + bool IsMacroFunc() const { return mpcMacroName != nullptr && !(mnFlags & EXC_FUNCFLAG_ADDINEQUIV); } /** Returns true, if the function is stored as an add-in call. */ - inline bool IsAddInEquivalent() const { return mpcMacroName != nullptr && (mnFlags & EXC_FUNCFLAG_ADDINEQUIV); } + bool IsAddInEquivalent() const { return mpcMacroName != nullptr && (mnFlags & EXC_FUNCFLAG_ADDINEQUIV); } /** Returns the name of the external function as string. */ OUString GetMacroFuncName() const; /** Returns the programmatical name of the Add-In function as string. */ @@ -383,13 +383,13 @@ public: explicit XclTokenArray( ScfUInt8Vec& rTokVec, ScfUInt8Vec& rExtDataVec, bool bVolatile = false ); /** Returns true, if the token array is empty. */ - inline bool Empty() const { return maTokVec.empty(); } + bool Empty() const { return maTokVec.empty(); } /** Returns the size of the token array in bytes. */ sal_uInt16 GetSize() const; /** Returns read-only access to the byte vector storing token data. */ - inline const sal_uInt8* GetData() const { return maTokVec.empty() ? nullptr : maTokVec.data(); } + const sal_uInt8* GetData() const { return maTokVec.empty() ? nullptr : maTokVec.data(); } /** Returns true, if the formula contains a volatile function. */ - inline bool IsVolatile() const { return mbVolatile; } + bool IsVolatile() const { return mbVolatile; } /** Reads the size field of the token array. */ void ReadSize( XclImpStream& rStrm ); @@ -446,11 +446,11 @@ public: void Init( const ScTokenArray& rScTokArr, bool bSkipSpaces ); - inline bool Is() const { return mppScToken != nullptr; } - inline bool operator!() const { return !Is(); } - inline const ::formula::FormulaToken* Get() const { return mppScToken ? *mppScToken : nullptr; } - inline const ::formula::FormulaToken* operator->() const { return Get(); } - inline const ::formula::FormulaToken& operator*() const { return *Get(); } + bool Is() const { return mppScToken != nullptr; } + bool operator!() const { return !Is(); } + const ::formula::FormulaToken* Get() const { return mppScToken ? *mppScToken : nullptr; } + const ::formula::FormulaToken* operator->() const { return Get(); } + const ::formula::FormulaToken& operator*() const { return *Get(); } XclTokenArrayIterator& operator++(); @@ -492,7 +492,7 @@ public: inline static sal_uInt8 GetTokenId( sal_uInt8 nBaseId, sal_uInt8 nTokenClass ); /** Returns the token class of the passed token ID. */ - inline static sal_uInt8 GetTokenClass( sal_uInt8 nTokenId ) { return nTokenId & EXC_TOKCLASS_MASK; } + static sal_uInt8 GetTokenClass( sal_uInt8 nTokenId ) { return nTokenId & EXC_TOKCLASS_MASK; } /** Changes the token class in the passed classified token ID. */ inline static void ChangeTokenClass( sal_uInt8& rnTokenId, sal_uInt8 nTokenClass ); diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 67158c3bfa52..26a7d30188eb 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -388,7 +388,7 @@ public: void SetBool( bool bValue ); /** Returns the text representation of the item. */ - inline const OUString& ConvertToText() const { return maText; } + const OUString& ConvertToText() const { return maText; } /** Returns true, if the passed term equals this item. */ bool IsEqual( const XclPCItem& rItem ) const; @@ -475,7 +475,7 @@ public: virtual ~XclPCField(); /** Returns the index of this field in the containing pivot cache. */ - inline sal_uInt16 GetFieldIndex() const { return mnFieldIdx; } + sal_uInt16 GetFieldIndex() const { return mnFieldIdx; } /** Returns true, if the type of the field is supported by Calc. */ bool IsSupportedField() const; @@ -544,7 +544,7 @@ struct XclPTCachedName OUString maName; /// The visible name, if used. bool mbUseCache; /// true = Use name in cache instead of maName. - inline explicit XclPTCachedName() : mbUseCache( true ) {} + explicit XclPTCachedName() : mbUseCache( true ) {} }; XclImpStream& operator>>( XclImpStream& rStrm, XclPTCachedName& rCachedName ); @@ -556,7 +556,7 @@ struct XclPTVisNameInfo XclPTCachedName maVisName; /// The displayed name of the item. /** Returns true, if the name is set explicitly (maVisName.mbUseCache is false). */ - inline bool HasVisName() const { return !maVisName.mbUseCache; } + bool HasVisName() const { return !maVisName.mbUseCache; } /** Returns the name, if set explicitly (maVisName.mbUseCache is false). */ const OUString* GetVisName() const; /** Sets the visible name and enables usage of cache if name is empty. */ diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index f90598f14ab4..f1b9a1085825 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -45,7 +45,7 @@ struct XclRange; struct XclDebugObjCounter { sal_Int32 mnObjCnt; - inline explicit XclDebugObjCounter() : mnObjCnt( 0 ) {} + explicit XclDebugObjCounter() : mnObjCnt( 0 ) {} ~XclDebugObjCounter(); }; #endif @@ -138,30 +138,30 @@ public: XclRoot& operator=( const XclRoot& rRoot ); /** Returns old RootData struct. Deprecated. */ - inline RootData& GetOldRoot() const { return *mrData.mxRD; } + RootData& GetOldRoot() const { return *mrData.mxRD; } /** Returns the current BIFF version of the importer/exporter. */ - inline XclBiff GetBiff() const { return mrData.meBiff; } + XclBiff GetBiff() const { return mrData.meBiff; } /** Returns the current output format of the importer/exporter. */ - inline XclOutput GetOutput() const { return mrData.meOutput; } + XclOutput GetOutput() const { return mrData.meOutput; } /** Returns true, if currently a document is imported. */ - inline bool IsImport() const { return !mrData.mbExport; } + bool IsImport() const { return !mrData.mbExport; } /** Returns the text encoding to import/export byte strings. */ - inline rtl_TextEncoding GetTextEncoding() const { return mrData.meTextEnc; } + rtl_TextEncoding GetTextEncoding() const { return mrData.meTextEnc; } /** Returns the system language, i.e. for number formats. */ - inline LanguageType GetSysLanguage() const { return mrData.meSysLang; } + LanguageType GetSysLanguage() const { return mrData.meSysLang; } /** Returns the document language. */ - inline LanguageType GetDocLanguage() const { return mrData.meDocLang; } + LanguageType GetDocLanguage() const { return mrData.meDocLang; } /** Returns the UI language. */ - inline LanguageType GetUILanguage() const { return mrData.meUILang; } + LanguageType GetUILanguage() const { return mrData.meUILang; } /** Returns the default script type, e.g. for blank cells. */ - inline sal_Int16 GetDefApiScript() const { return mrData.mnDefApiScript; } + sal_Int16 GetDefApiScript() const { return mrData.mnDefApiScript; } /** Returns the width of the '0' character (default font) for the current printer (twips). */ - inline long GetCharWidth() const { return mrData.mnCharWidth; } + long GetCharWidth() const { return mrData.mnCharWidth; } /** Returns the current Calc sheet index. */ - inline bool IsInGlobals() const { return mrData.mnScTab == SCTAB_GLOBAL; } + bool IsInGlobals() const { return mrData.mnScTab == SCTAB_GLOBAL; } /** Returns the current Calc sheet index. */ - inline SCTAB GetCurrScTab() const { return mrData.mnScTab; } + SCTAB GetCurrScTab() const { return mrData.mnScTab; } /** Calculates the width of the passed number of pixels in 1/100 mm. */ sal_Int32 GetHmmFromPixelX( double fPixelX ) const; @@ -169,16 +169,16 @@ public: sal_Int32 GetHmmFromPixelY( double fPixelY ) const; /** Returns the medium to import from. */ - inline SfxMedium& GetMedium() const { return mrData.mrMedium; } + SfxMedium& GetMedium() const { return mrData.mrMedium; } /** Returns the document URL of the imported/exported file. */ - inline const OUString& GetDocUrl() const { return mrData.maDocUrl; } + const OUString& GetDocUrl() const { return mrData.maDocUrl; } /** Returns the base path of the imported/exported file. */ - inline const OUString& GetBasePath() const { return mrData.maBasePath; } + const OUString& GetBasePath() const { return mrData.maBasePath; } /** Returns the current user name. */ - inline const OUString& GetUserName() const { return mrData.maUserName; } + const OUString& GetUserName() const { return mrData.maUserName; } /** Returns the default password used for stream encryption. */ - inline const OUString& GetDefaultPassword() const { return mrData.maDefPassword; } + const OUString& GetDefaultPassword() const { return mrData.maDefPassword; } /** Requests and verifies a password from the medium or the user. */ css::uno::Sequence< css::beans::NamedValue > RequestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const; @@ -245,25 +245,25 @@ public: XclTracer& GetTracer() const; /** Returns the highest possible cell address in a Calc document. */ - inline const ScAddress& GetScMaxPos() const { return mrData.maScMaxPos; } + const ScAddress& GetScMaxPos() const { return mrData.maScMaxPos; } /** Returns the highest possible cell address in an Excel document (using current BIFF version). */ - inline const ScAddress& GetXclMaxPos() const { return mrData.maXclMaxPos; } + const ScAddress& GetXclMaxPos() const { return mrData.maXclMaxPos; } /** Returns the highest possible cell address valid in Calc and Excel (using current BIFF version). */ - inline const ScAddress& GetMaxPos() const { return mrData.maMaxPos; } + const ScAddress& GetMaxPos() const { return mrData.maMaxPos; } /** Sets the document language. */ - inline void SetDocLanguage( LanguageType eLang ) { mrData.meDocLang = eLang; } + void SetDocLanguage( LanguageType eLang ) { mrData.meDocLang = eLang; } /** Sets the UI language, i.e. if it has been read from a file. */ - inline void SetUILanguage( LanguageType eLang ) { mrData.meUILang = eLang; } + void SetUILanguage( LanguageType eLang ) { mrData.meUILang = eLang; } /** Sets the text encoding to import/export byte strings. */ void SetTextEncoding( rtl_TextEncoding eTextEnc ); /** Sets the width of the '0' character (default font) for the current printer (twips). @param rFontData The font used for the '0' character. */ void SetCharWidth( const XclFontData& rFontData ); /** Sets the current Calc sheet index. */ - inline void SetCurrScTab( SCTAB nScTab ) { mrData.mnScTab = nScTab; } + void SetCurrScTab( SCTAB nScTab ) { mrData.mnScTab = nScTab; } /** Increases the current Calc sheet index by 1. */ - inline void IncCurrScTab() { ++mrData.mnScTab; } + void IncCurrScTab() { ++mrData.mnScTab; } private: XclRootData& mrData; /// Reference to the global data struct. diff --git a/sc/source/filter/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxx index 1052a6b7159f..6f45c5bdbfc0 100644 --- a/sc/source/filter/inc/xlstring.hxx +++ b/sc/source/filter/inc/xlstring.hxx @@ -61,8 +61,8 @@ struct XclFormatRun sal_uInt16 mnChar; /// First character this format applies to. sal_uInt16 mnFontIdx; /// Excel font index for the next characters. - explicit inline XclFormatRun() : mnChar( 0 ), mnFontIdx( 0 ) {} - explicit inline XclFormatRun( sal_uInt16 nChar, sal_uInt16 nFontIdx ) : + explicit XclFormatRun() : mnChar( 0 ), mnFontIdx( 0 ) {} + explicit XclFormatRun( sal_uInt16 nChar, sal_uInt16 nFontIdx ) : mnChar( nChar ), mnFontIdx( nFontIdx ) {} }; diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index 5a258be4023d..3770095c87fd 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -255,16 +255,16 @@ public: explicit XclDefaultPalette( const XclRoot& rRoot ); /** Returns the color count in the current palette. */ - inline sal_uInt32 GetColorCount() const { return mnTableSize - EXC_COLOR_USEROFFSET; } + sal_uInt32 GetColorCount() const { return mnTableSize - EXC_COLOR_USEROFFSET; } /** Returns the default RGB color data for a (non-zero-based) Excel color or COL_AUTO on error. */ ColorData GetDefColorData( sal_uInt16 nXclIndex ) const; /** Returns the default color for a (non-zero-based) Excel color or COL_AUTO on error. */ - inline Color GetDefColor( sal_uInt16 nXclIndex ) const + Color GetDefColor( sal_uInt16 nXclIndex ) const { return Color( GetDefColorData( nXclIndex ) ); } /** Returns true, if the passed Excel color index is a system color. */ - inline bool IsSystemColor( sal_uInt16 nXclIndex ) const { return nXclIndex >= mnTableSize; } + bool IsSystemColor( sal_uInt16 nXclIndex ) const { return nXclIndex >= mnTableSize; } private: const ColorData* mpnColorTable; /// The table with RGB values. @@ -452,7 +452,7 @@ public: explicit XclNumFmtBuffer( const XclRoot& rRoot ); /** Returns the core index of the current standard number format. */ - inline sal_uLong GetStdScNumFmt() const { return mnStdScNumFmt; } + sal_uLong GetStdScNumFmt() const { return mnStdScNumFmt; } protected: typedef ::std::map< sal_uInt16, XclNumFmt > XclNumFmtMap; @@ -461,7 +461,7 @@ protected: void InitializeImport(); /** Returns the current number format map. */ - inline const XclNumFmtMap& GetFormatMap() const { return maFmtMap; } + const XclNumFmtMap& GetFormatMap() const { return maFmtMap; } /** Inserts a new number format for the specified Excel format index. */ void InsertFormat( sal_uInt16 nXclNumFmt, const OUString& rFormat ); @@ -575,9 +575,9 @@ public: bool HasUsedFlags() const; /** Returns true, if this is a hard cell format. */ - inline bool IsCellXF() const { return mbCellXF; } + bool IsCellXF() const { return mbCellXF; } /** Returns true, if this is a cell style. */ - inline bool IsStyleXF() const { return !IsCellXF(); } + bool IsStyleXF() const { return !IsCellXF(); } protected: /** Returns true, if this object is equal to the passed. */ diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx index bc69f89a0485..38a62ac889be 100644 --- a/sc/source/filter/inc/xltracer.hxx +++ b/sc/source/filter/inc/xltracer.hxx @@ -55,7 +55,7 @@ public: ~XclTracer(); /** Returns true, if tracing is enabled. */ - inline bool IsEnabled() const { return mbEnabled; } + bool IsEnabled() const { return mbEnabled; } /** Ensure that particular traces are logged once per document. */ void ProcessTraceOnce(XclTracerId eProblem); diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx index 4de059df098b..a742bb678427 100644 --- a/sc/source/filter/inc/xlview.hxx +++ b/sc/source/filter/inc/xlview.hxx @@ -109,7 +109,7 @@ struct XclSelectionData XclRangeList maXclSelection; /// Selected cell ranges. sal_uInt16 mnCursorIdx; /// Index of cursor in selection list. - inline explicit XclSelectionData() : mnCursorIdx( 0 ) {} + explicit XclSelectionData() : mnCursorIdx( 0 ) {} }; typedef std::shared_ptr< XclSelectionData > XclSelectionDataRef; diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx index e253ca0e9329..f25b3ebfb702 100644 --- a/sc/source/filter/oox/biffhelper.cxx +++ b/sc/source/filter/oox/biffhelper.cxx @@ -40,8 +40,8 @@ union DecodedDouble double mfValue; sal_math_Double maStruct; - inline explicit DecodedDouble() {} - inline explicit DecodedDouble( double fValue ) : mfValue( fValue ) {} + explicit DecodedDouble() {} + explicit DecodedDouble( double fValue ) : mfValue( fValue ) {} }; } // namespace diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index 05dcb5ba79ad..71475c1db2ad 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -56,7 +56,7 @@ struct SheetCodeNameInfo PropertySet maSheetProps; /// Property set of the sheet without codename. OUString maPrefix; /// Prefix for the codename to be generated. - inline explicit SheetCodeNameInfo( PropertySet& rSheetProps, const OUString& rPrefix ) : + explicit SheetCodeNameInfo( PropertySet& rSheetProps, const OUString& rPrefix ) : maSheetProps( rSheetProps ), maPrefix( rPrefix ) {} }; diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index 82d9aa94f9fe..b94cd73b0221 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -466,7 +466,7 @@ protected: template< typename Type > bool pushValueOperandToken( const Type& rValue, sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr ); template< typename Type > - inline bool pushValueOperandToken( const Type& rValue ) + bool pushValueOperandToken( const Type& rValue ) { return pushValueOperandToken( rValue, OPCODE_PUSH, nullptr ); } bool pushParenthesesOperandToken( const WhiteSpaceVec* pClosingSpaces = nullptr ); bool pushUnaryPreOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr ); @@ -481,7 +481,7 @@ protected: template< typename Type > bool pushValueOperand( const Type& rValue, sal_Int32 nOpCode ); template< typename Type > - inline bool pushValueOperand( const Type& rValue ) + bool pushValueOperand( const Type& rValue ) { return pushValueOperand( rValue, OPCODE_PUSH ); } bool pushBoolOperand( bool bValue ); bool pushErrorOperand( double fEncodedError ); diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 3fb7178acd7d..2f4987890388 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -1850,7 +1850,7 @@ class NumberFormatFinalizer public: explicit NumberFormatFinalizer( const WorkbookHelper& rHelper ); - inline void operator()( NumberFormat& rNumFmt ) const + void operator()( NumberFormat& rNumFmt ) const { rNumFmt.finalizeImport( mxNumFmts, maEnUsLocale ); } private: diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index b0397f43e491..beeea7b352e5 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -385,11 +385,11 @@ public: private: /** Returns the current edit engine text object. */ - inline HFPortionInfo& getPortion() { return maPortions[ meCurrPortion ]; } + HFPortionInfo& getPortion() { return maPortions[ meCurrPortion ]; } /** Returns the start cursor of the current text range. */ - inline const Reference<text::XTextCursor>& getStartPos() { return getPortion().mxStart; } + const Reference<text::XTextCursor>& getStartPos() { return getPortion().mxStart; } /** Returns the end cursor of the current text range. */ - inline const Reference<text::XTextCursor>& getEndPos() { return getPortion().mxEnd; } + const Reference<text::XTextCursor>& getEndPos() { return getPortion().mxEnd; } /** Returns the current line height of the specified portion. */ double getCurrHeight( HFPortionId ePortion ) const; diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index c29fcede5e04..aad783f896c9 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -114,29 +114,29 @@ public: ~WorkbookGlobals(); /** Returns true, if this helper refers to a valid document. */ - inline bool isValid() const { return mxDoc.is(); } + bool isValid() const { return mxDoc.is(); } // filter ----------------------------------------------------------------- /** Returns the base filter object (base class of all filters). */ - inline FilterBase& getBaseFilter() const { return mrBaseFilter; } + FilterBase& getBaseFilter() const { return mrBaseFilter; } /** Returns the filter progress bar. */ - inline SegmentProgressBar& getProgressBar() const { return *mxProgressBar; } + SegmentProgressBar& getProgressBar() const { return *mxProgressBar; } /** Returns the VBA project storage. */ const StorageRef& getVbaProjectStorage() const { return mxVbaPrjStrg; } /** Returns the index of the current Calc sheet, if filter currently processes a sheet. */ - inline sal_Int16 getCurrentSheetIndex() const { return mnCurrSheet; } + sal_Int16 getCurrentSheetIndex() const { return mnCurrSheet; } /** Returns true when reading a file generated by a known good generator. */ - inline bool isGeneratorKnownGood() const { return mbGeneratorKnownGood; } + bool isGeneratorKnownGood() const { return mbGeneratorKnownGood; } /** Sets the VBA project storage used to import VBA source code and forms. */ - inline void setVbaProjectStorage( const StorageRef& rxVbaPrjStrg ) { mxVbaPrjStrg = rxVbaPrjStrg; } + void setVbaProjectStorage( const StorageRef& rxVbaPrjStrg ) { mxVbaPrjStrg = rxVbaPrjStrg; } /** Sets the index of the current Calc sheet, if filter currently processes a sheet. */ - inline void setCurrentSheetIndex( SCTAB nSheet ) { mnCurrSheet = nSheet; } + void setCurrentSheetIndex( SCTAB nSheet ) { mnCurrSheet = nSheet; } // document model --------------------------------------------------------- - inline ScEditEngineDefaulter& getEditEngine() const + ScEditEngineDefaulter& getEditEngine() const { return *mxEditEngine.get(); } @@ -168,58 +168,58 @@ public: // buffers ---------------------------------------------------------------- - inline FormulaBuffer& getFormulaBuffer() const { return *mxFormulaBuffer; } + FormulaBuffer& getFormulaBuffer() const { return *mxFormulaBuffer; } /** Returns the global workbook settings object. */ - inline WorkbookSettings& getWorkbookSettings() const { return *mxWorkbookSettings; } + WorkbookSettings& getWorkbookSettings() const { return *mxWorkbookSettings; } /** Returns the workbook and sheet view settings object. */ - inline ViewSettings& getViewSettings() const { return *mxViewSettings; } + ViewSettings& getViewSettings() const { return *mxViewSettings; } /** Returns the worksheet buffer containing sheet names and properties. */ - inline WorksheetBuffer& getWorksheets() const { return *mxWorksheets; } + WorksheetBuffer& getWorksheets() const { return *mxWorksheets; } /** Returns the office theme object read from the theme substorage. */ - inline ThemeBuffer& getTheme() const { return *mxTheme; } + ThemeBuffer& getTheme() const { return *mxTheme; } /** Returns all cell formatting objects read from the styles substream. */ - inline StylesBuffer& getStyles() const { return *mxStyles; } + StylesBuffer& getStyles() const { return *mxStyles; } /** Returns the shared strings read from the shared strings substream. */ - inline SharedStringsBuffer& getSharedStrings() const { return *mxSharedStrings; } + SharedStringsBuffer& getSharedStrings() const { return *mxSharedStrings; } /** Returns the external links read from the external links substream. */ - inline ExternalLinkBuffer& getExternalLinks() const { return *mxExtLinks; } + ExternalLinkBuffer& getExternalLinks() const { return *mxExtLinks; } /** Returns the defined names read from the workbook globals. */ - inline DefinedNamesBuffer& getDefinedNames() const { return *mxDefNames; } + DefinedNamesBuffer& getDefinedNames() const { return *mxDefNames; } /** Returns the tables collection (equivalent to Calc's database ranges). */ - inline TableBuffer& getTables() const { return *mxTables; } + TableBuffer& getTables() const { return *mxTables; } /** Returns the scenarios collection. */ - inline ScenarioBuffer& getScenarios() const { return *mxScenarios; } + ScenarioBuffer& getScenarios() const { return *mxScenarios; } /** Returns the collection of external data connections. */ - inline ConnectionsBuffer& getConnections() const { return *mxConnections; } + ConnectionsBuffer& getConnections() const { return *mxConnections; } /** Returns the collection of pivot caches. */ - inline PivotCacheBuffer& getPivotCaches() const { return *mxPivotCaches; } + PivotCacheBuffer& getPivotCaches() const { return *mxPivotCaches; } /** Returns the collection of pivot tables. */ - inline PivotTableBuffer& getPivotTables() { return *mxPivotTables; } + PivotTableBuffer& getPivotTables() { return *mxPivotTables; } // converters ------------------------------------------------------------- /** Returns a shared import formula parser. */ - inline FormulaParser& getFormulaParser() const { return *mxFmlaParser; } + FormulaParser& getFormulaParser() const { return *mxFmlaParser; } /** Returns an unshared import formula parser. */ - inline FormulaParser* createFormulaParser() { return new FormulaParser(*this); } + FormulaParser* createFormulaParser() { return new FormulaParser(*this); } /** Returns the measurement unit converter. */ - inline UnitConverter& getUnitConverter() const { return *mxUnitConverter; } + UnitConverter& getUnitConverter() const { return *mxUnitConverter; } /** Returns the converter for string to cell address/range conversion. */ - inline AddressConverter& getAddressConverter() const { return *mxAddrConverter; } + AddressConverter& getAddressConverter() const { return *mxAddrConverter; } /** Returns the chart object converter. */ - inline oox::drawingml::chart::ChartConverter* getChartConverter() const { return mxChartConverter.get(); } + oox::drawingml::chart::ChartConverter* getChartConverter() const { return mxChartConverter.get(); } /** Returns the page/print settings converter. */ - inline PageSettingsConverter& getPageSettingsConverter() const { return *mxPageSettConverter; } + PageSettingsConverter& getPageSettingsConverter() const { return *mxPageSettConverter; } // OOXML/BIFF12 specific -------------------------------------------------- /** Returns the base OOXML/BIFF12 filter object. */ - inline XmlFilterBase& getOoxFilter() const { return *mpOoxFilter; } + XmlFilterBase& getOoxFilter() const { return *mpOoxFilter; } // BIFF2-BIFF8 specific --------------------------------------------------- /** Returns the text encoding used to import/export byte strings. */ - inline rtl_TextEncoding getTextEncoding() const { return meTextEnc; } + rtl_TextEncoding getTextEncoding() const { return meTextEnc; } private: /** Initializes some basic members and sets needed document properties. */ diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 0f01e0d777b2..9cc3cf294e77 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -208,14 +208,14 @@ public: SCTAB nSheet ); /** Returns true, if this helper refers to an existing Calc sheet. */ - inline bool isValidSheet() const { return mxSheet.is(); } + bool isValidSheet() const { return mxSheet.is(); } /** Returns the type of this sheet. */ - inline WorksheetType getSheetType() const { return meSheetType; } + WorksheetType getSheetType() const { return meSheetType; } /** Returns the index of the current sheet. */ - inline SCTAB getSheetIndex() const { return maUsedArea.aStart.Tab(); } + SCTAB getSheetIndex() const { return maUsedArea.aStart.Tab(); } /** Returns the XSpreadsheet interface of the current sheet. */ - inline const Reference< XSpreadsheet >& getSheet() const { return mxSheet; } + const Reference< XSpreadsheet >& getSheet() const { return mxSheet; } /** Returns the XCell interface for the passed cell address. */ Reference< XCell > getCell( const ScAddress& rAddress ) const; @@ -243,25 +243,25 @@ public: ScRange getCellRangeFromRectangle( const awt::Rectangle& rRect ) const; /** Returns the buffer for cell contents and cell formatting. */ - inline SheetDataBuffer& getSheetData() { return maSheetData; } + SheetDataBuffer& getSheetData() { return maSheetData; } /** Returns the conditional formatting in this sheet. */ - inline CondFormatBuffer& getCondFormats() { return maCondFormats; } + CondFormatBuffer& getCondFormats() { return maCondFormats; } /** Returns the buffer for all cell comments in this sheet. */ - inline CommentsBuffer& getComments() { return maComments; } + CommentsBuffer& getComments() { return maComments; } /** Returns the auto filters for the sheet. */ - inline AutoFilterBuffer& getAutoFilters() { return maAutoFilters; } + AutoFilterBuffer& getAutoFilters() { return maAutoFilters; } /** Returns the buffer for all web query tables in this sheet. */ - inline QueryTableBuffer& getQueryTables() { return maQueryTables; } + QueryTableBuffer& getQueryTables() { return maQueryTables; } /** Returns the worksheet settings object. */ - inline WorksheetSettings& getWorksheetSettings() { return maSheetSett; } + WorksheetSettings& getWorksheetSettings() { return maSheetSett; } /** Returns the page/print settings for this sheet. */ - inline PageSettings& getPageSettings() { return maPageSett; } + PageSettings& getPageSettings() { return maPageSett; } /** Returns the view settings for this sheet. */ - inline SheetViewSettings& getSheetViewSettings() { return maSheetViewSett; } + SheetViewSettings& getSheetViewSettings() { return maSheetViewSett; } /** Returns the VML drawing page for this sheet (OOXML/BIFF12 only). */ - inline VmlDrawing& getVmlDrawing() { return *mxVmlDrawing; } + VmlDrawing& getVmlDrawing() { return *mxVmlDrawing; } /** returns the ExtLst entries that need to be filled */ - inline ExtLst& getExtLst() { return maExtLst; } + ExtLst& getExtLst() { return maExtLst; } /** Sets a column or row page break described in the passed struct. */ void setPageBreak( const PageBreakModel& rModel, bool bRowBreak ); diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index 22ddc9bafc71..a90f6975ed1f 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -62,10 +62,10 @@ private: ScMyImpDetectiveOpList aDetectiveOpList; public: - inline ScMyImpDetectiveOpArray() : + ScMyImpDetectiveOpArray() : aDetectiveOpList() {} - inline void AddDetectiveOp( const ScMyImpDetectiveOp& rDetOp ) + void AddDetectiveOp( const ScMyImpDetectiveOp& rDetOp ) { aDetectiveOpList.push_back( rDetOp ); } void Sort(); diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index c7998c18ef05..196d3e5fb629 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -153,10 +153,10 @@ struct ScMyAreaLink ScRange aDestRange; sal_Int32 nRefresh; - inline ScMyAreaLink() : nRefresh( 0 ) {} + ScMyAreaLink() : nRefresh( 0 ) {} - inline sal_Int32 GetColCount() const { return aDestRange.aEnd.Col() - aDestRange.aStart.Col() + 1; } - inline sal_Int32 GetRowCount() const { return aDestRange.aEnd.Row() - aDestRange.aStart.Col() + 1; } + sal_Int32 GetColCount() const { return aDestRange.aEnd.Col() - aDestRange.aStart.Col() + 1; } + sal_Int32 GetRowCount() const { return aDestRange.aEnd.Row() - aDestRange.aStart.Col() + 1; } bool Compare( const ScMyAreaLink& rAreaLink ) const; bool operator<(const ScMyAreaLink& rAreaLink ) const; @@ -174,7 +174,7 @@ public: ScMyAreaLinksContainer(); virtual ~ScMyAreaLinksContainer() override; - inline void AddNewAreaLink( const ScMyAreaLink& rAreaLink ) + void AddNewAreaLink( const ScMyAreaLink& rAreaLink ) { aAreaLinkList.push_back( rAreaLink ); } using ScMyIteratorBase::UpdateAddress; @@ -341,19 +341,19 @@ public: void Clear(); - inline void SetShapes(ScMyShapesContainer* pNewShapes) + void SetShapes(ScMyShapesContainer* pNewShapes) { pShapes = pNewShapes; } - inline void SetNoteShapes(ScMyNoteShapesContainer* pNewNoteShapes) + void SetNoteShapes(ScMyNoteShapesContainer* pNewNoteShapes) { pNoteShapes = pNewNoteShapes; } - inline void SetEmptyDatabaseRanges(ScMyEmptyDatabaseRangesContainer* pNewEmptyDatabaseRanges) + void SetEmptyDatabaseRanges(ScMyEmptyDatabaseRangesContainer* pNewEmptyDatabaseRanges) { pEmptyDatabaseRanges = pNewEmptyDatabaseRanges; } - inline void SetMergedRanges(ScMyMergedRangesContainer* pNewMergedRanges) + void SetMergedRanges(ScMyMergedRangesContainer* pNewMergedRanges) { pMergedRanges = pNewMergedRanges; } - inline void SetAreaLinks(ScMyAreaLinksContainer* pNewAreaLinks) + void SetAreaLinks(ScMyAreaLinksContainer* pNewAreaLinks) { pAreaLinks = pNewAreaLinks; } - inline void SetDetectiveObj(ScMyDetectiveObjContainer* pNewDetectiveObj) + void SetDetectiveObj(ScMyDetectiveObjContainer* pNewDetectiveObj) { pDetectiveObj = pNewDetectiveObj; } - inline void SetDetectiveOp(ScMyDetectiveOpContainer* pNewDetectiveOp) + void SetDetectiveOp(ScMyDetectiveOpContainer* pNewDetectiveOp) { pDetectiveOp = pNewDetectiveOp; } void SetCurrentTable(const SCTAB nTable, diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index f1a69c5b7e31..a02a6ee3dffe 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -235,8 +235,8 @@ public: virtual ~ScXMLExport() override; static sal_Int16 GetMeasureUnit(); - inline ScDocument* GetDocument() { return pDoc; } - inline const ScDocument* GetDocument() const { return pDoc; } + ScDocument* GetDocument() { return pDoc; } + const ScDocument* GetDocument() const { return pDoc; } bool IsMatrix (const ScAddress& aCell, ScRange& aCellAddress, bool& bIsFirst) const; diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index e11e61e5558c..7cf62782732a 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -990,8 +990,8 @@ public: ScDocumentImport& GetDoc(); - inline ScDocument* GetDocument() { return pDoc; } - inline const ScDocument* GetDocument() const { return pDoc; } + ScDocument* GetDocument() { return pDoc; } + const ScDocument* GetDocument() const { return pDoc; } ScMyTables& GetTables() { return aTables; } diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 31cb87ee0e4c..89982b3923b8 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -47,7 +47,7 @@ struct Func_SetType { sal_Int32 mnType; explicit Func_SetType( sal_Int32 nType ) : mnType( nType ) {} - inline void operator()( ScCsvColState& rState ) const + void operator()( ScCsvColState& rState ) const { rState.mnType = mnType; } }; @@ -55,7 +55,7 @@ struct Func_Select { bool mbSelect; explicit Func_Select( bool bSelect ) : mbSelect( bSelect ) {} - inline void operator()( ScCsvColState& rState ) const + void operator()( ScCsvColState& rState ) const { rState.Select( mbSelect ); } }; diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 836addd33957..234ca326f784 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -88,7 +88,7 @@ protected: virtual Rectangle GetBoundingBox() const override; /** Returns whether the object is alive. Must be called with locked mutex. */ - inline bool implIsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose && mpControl; } + bool implIsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose && mpControl; } /** @throws css::lang::DisposedException if the object is disposed/disposing or any pointer is missing. Should be used with locked mutex! */ void ensureAlive() const; @@ -444,16 +444,16 @@ private: /** Returns the count of selected columns in the table. */ sal_Int32 implGetSelColumnCount() const; /** Returns the total cell count in the table (including header). */ - inline sal_Int32 implGetCellCount() const { return implGetRowCount() * implGetColumnCount(); } + sal_Int32 implGetCellCount() const { return implGetRowCount() * implGetColumnCount(); } /** Returns the row index from cell index (including header). */ - inline sal_Int32 implGetRow( sal_Int32 nIndex ) const { return nIndex / implGetColumnCount(); } + sal_Int32 implGetRow( sal_Int32 nIndex ) const { return nIndex / implGetColumnCount(); } /** Returns the column index from cell index (including header). */ - inline sal_Int32 implGetColumn( sal_Int32 nIndex ) const { return nIndex % implGetColumnCount(); } + sal_Int32 implGetColumn( sal_Int32 nIndex ) const { return nIndex % implGetColumnCount(); } /** Returns the absolute column index of the nSelColumn-th selected column. */ sal_Int32 implGetSelColumn( sal_Int32 nSelColumn ) const; /** Returns the child index from cell position (including header). */ - inline sal_Int32 implGetIndex( sal_Int32 nRow, sal_Int32 nColumn ) const { return nRow * implGetColumnCount() + nColumn; } + sal_Int32 implGetIndex( sal_Int32 nRow, sal_Int32 nColumn ) const { return nRow * implGetColumnCount() + nColumn; } /** Returns the contents of the specified cell (including header). Indexes must be valid. */ OUString implGetCellText( sal_Int32 nRow, sal_Int32 nColumn ) const; diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 03cbaeb182a8..215341a0fcef 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -88,7 +88,7 @@ public: void RefInputDone( bool bForced ); void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton ); - inline void SetWindow(vcl::Window* _pWindow) { m_pWindow = _pWindow; } + void SetWindow(vcl::Window* _pWindow) { m_pWindow = _pWindow; } void DoClose( sal_uInt16 nId ); static void SetDispatcherLock( bool bLock ); static void EnableSpreadsheets( bool bFlag = true ); diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index ac724afa13bc..6aec2addad75 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -69,8 +69,8 @@ struct ScCsvExpData sal_Int32 mnIndex; /// Index of a column. sal_uInt8 mnType; /// External type of the column. - inline ScCsvExpData() : mnIndex( 0 ), mnType( SC_COL_STANDARD ) {} - inline ScCsvExpData( sal_Int32 nIndex, sal_uInt8 nType ) : + ScCsvExpData() : mnIndex( 0 ), mnType( SC_COL_STANDARD ) {} + ScCsvExpData( sal_Int32 nIndex, sal_uInt8 nType ) : mnIndex( nIndex ), mnType( nType ) {} }; @@ -207,14 +207,14 @@ private: sal_Int32 mnParam2; /// Second parameter. public: - inline explicit ScCsvCmd() : meType( CSVCMD_NONE ), + explicit ScCsvCmd() : meType( CSVCMD_NONE ), mnParam1( CSV_POS_INVALID ), mnParam2( CSV_POS_INVALID ) {} inline void Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nParam2 ); - inline ScCsvCmdType GetType() const { return meType; } - inline sal_Int32 GetParam1() const { return mnParam1; } - inline sal_Int32 GetParam2() const { return mnParam2; } + ScCsvCmdType GetType() const { return meType; } + sal_Int32 GetParam1() const { return mnParam1; } + sal_Int32 GetParam2() const { return mnParam2; } }; inline void ScCsvCmd::Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nParam2 ) @@ -262,11 +262,11 @@ public: // repaint helpers -------------------------------------------------------- /** Sets the graphic invalid (next Redraw() will not use cached graphic). */ - inline void InvalidateGfx() { mbValidGfx = false; } + void InvalidateGfx() { mbValidGfx = false; } /** Sets the graphic valid (next Redraw() will use cached graphic). */ - inline void ValidateGfx() { mbValidGfx = true; } + void ValidateGfx() { mbValidGfx = true; } /** Returns true, if cached graphic is valid. */ - inline bool IsValidGfx() const { return mbValidGfx; } + bool IsValidGfx() const { return mbValidGfx; } /** Repaints all controls. @param bInvalidate true = invalidates graphics of this control (not all). */ @@ -276,14 +276,14 @@ public: /** Decreases no-repaint counter and repaints if counter reaches 0. */ void EnableRepaint(); /** Returns true, if controls will not repaint. */ - inline bool IsNoRepaint() const { return mrData.mnNoRepaint > 0; } + bool IsNoRepaint() const { return mrData.mnNoRepaint > 0; } // command handling ------------------------------------------------------- /** Sets a new command handler. */ - inline void SetCmdHdl( const Link<ScCsvControl&,void>& rHdl ) { maCmdHdl = rHdl; } + void SetCmdHdl( const Link<ScCsvControl&,void>& rHdl ) { maCmdHdl = rHdl; } /** Returns data of the last command. */ - inline const ScCsvCmd& GetCmd() const { return maCmd; } + const ScCsvCmd& GetCmd() const { return maCmd; } /** Executes a command by calling command handler. */ void Execute( @@ -294,18 +294,18 @@ public: // layout helpers --------------------------------------------------------- /** Returns a reference to the current layout data. */ - inline const ScCsvLayoutData& GetLayoutData() const { return mrData; } + const ScCsvLayoutData& GetLayoutData() const { return mrData; } /** Returns true, if the Right-to-Left layout mode is active. */ - inline bool IsRTL() const { return mrData.mbAppRTL; } + bool IsRTL() const { return mrData.mbAppRTL; } /** Returns the number of available positions. */ - inline sal_Int32 GetPosCount() const { return mrData.mnPosCount; } + sal_Int32 GetPosCount() const { return mrData.mnPosCount; } /** Returns the number of visible positions. */ sal_Int32 GetVisPosCount() const; /** Returns the first visible position. */ - inline sal_Int32 GetFirstVisPos() const { return mrData.mnPosOffset; } + sal_Int32 GetFirstVisPos() const { return mrData.mnPosOffset; } /** Returns the last visible position. */ - inline sal_Int32 GetLastVisPos() const { return GetFirstVisPos() + GetVisPosCount(); } + sal_Int32 GetLastVisPos() const { return GetFirstVisPos() + GetVisPosCount(); } /** Returns highest possible position for first visible character. */ sal_Int32 GetMaxPosOffset() const; @@ -315,9 +315,9 @@ public: bool IsVisibleSplitPos( sal_Int32 nPos ) const; /** Returns the width of the header column. */ - inline sal_Int32 GetHdrWidth() const { return mrData.mnHdrWidth; } + sal_Int32 GetHdrWidth() const { return mrData.mnHdrWidth; } /** Returns the width of one character column. */ - inline sal_Int32 GetCharWidth() const { return mrData.mnCharWidth; } + sal_Int32 GetCharWidth() const { return mrData.mnCharWidth; } /** Returns the start position of the header column. */ sal_Int32 GetHdrX() const; /** Returns the X position of the first pixel of the data area. */ @@ -330,11 +330,11 @@ public: sal_Int32 GetPosFromX( sal_Int32 nX ) const; /** Returns the number of data lines. */ - inline sal_Int32 GetLineCount() const { return mrData.mnLineCount; } + sal_Int32 GetLineCount() const { return mrData.mnLineCount; } /** Returns the number of visible lines (including partly visible bottom line). */ sal_Int32 GetVisLineCount() const; /** Returns index of first visible line. */ - inline sal_Int32 GetFirstVisLine() const { return mrData.mnLineOffset; } + sal_Int32 GetFirstVisLine() const { return mrData.mnLineOffset; } /** Returns index of last visible line. */ sal_Int32 GetLastVisLine() const; /** Returns highest possible index for first line. */ @@ -346,18 +346,18 @@ public: bool IsVisibleLine( sal_Int32 nLine ) const; /** Returns the height of the header line. */ - inline sal_Int32 GetHdrHeight() const { return mrData.mnHdrHeight; } + sal_Int32 GetHdrHeight() const { return mrData.mnHdrHeight; } /** Returns the height of one line. */ - inline sal_Int32 GetLineHeight() const { return mrData.mnLineHeight; } + sal_Int32 GetLineHeight() const { return mrData.mnLineHeight; } /** Returns output Y coordinate of the specified line. */ sal_Int32 GetY( sal_Int32 nLine ) const; /** Returns line index from output coordinate. */ sal_Int32 GetLineFromY( sal_Int32 nY ) const; /** Returns the ruler cursor position. */ - inline sal_Int32 GetRulerCursorPos() const { return mrData.mnPosCursor; } + sal_Int32 GetRulerCursorPos() const { return mrData.mnPosCursor; } /** Returns the data grid cursor position (not column index!). */ - inline sal_Int32 GetGridCursorPos() const { return mrData.mnColCursor; } + sal_Int32 GetGridCursorPos() const { return mrData.mnColCursor; } // static helpers --------------------------------------------------------- diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index f813c79a8223..c75f8ef32272 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -145,7 +145,7 @@ private: // columns/column types --------------------------------------------------- public: /** Returns the number of columns. */ - inline sal_uInt32 GetColumnCount() const { return maColStates.size(); } + sal_uInt32 GetColumnCount() const { return maColStates.size(); } /** Returns the index of the first visible column. */ sal_uInt32 GetFirstVisColumn() const; /** Returns the index of the last visible column. */ @@ -162,14 +162,14 @@ public: sal_uInt32 GetColumnFromX( sal_Int32 nX ) const; /** Returns start position of the column with the specified index. */ - inline sal_Int32 GetColumnPos( sal_uInt32 nColIndex ) const { return maSplits[ nColIndex ]; } + sal_Int32 GetColumnPos( sal_uInt32 nColIndex ) const { return maSplits[ nColIndex ]; } /** Returns column index from position. A split counts to its following column. */ sal_uInt32 GetColumnFromPos( sal_Int32 nPos ) const; /** Returns the character width of the column with the specified index. */ sal_Int32 GetColumnWidth( sal_uInt32 nColIndex ) const; /** Returns the vector with the states of all columns. */ - inline const ScCsvColStateVec& GetColumnStates() const { return maColStates; } + const ScCsvColStateVec& GetColumnStates() const { return maColStates; } /** Sets all column states to the values in the passed vector. */ void SetColumnStates( const ScCsvColStateVec& rColStates ); /** Returns the data type of the selected columns. */ @@ -215,7 +215,7 @@ public: void SelectAll( bool bSelect = true ); /** Returns index of the focused column. */ - inline sal_uInt32 GetFocusColumn() const { return GetColumnFromPos( GetGridCursorPos() ); } + sal_uInt32 GetFocusColumn() const { return GetColumnFromPos( GetGridCursorPos() ); } private: /** Moves column cursor to a new position. */ @@ -268,9 +268,9 @@ public: private: /** Returns the width of the control. */ - inline sal_Int32 GetWidth() const { return maWinSize.Width(); } + sal_Int32 GetWidth() const { return maWinSize.Width(); } /** Returns the height of the control. */ - inline sal_Int32 GetHeight() const { return maWinSize.Height(); } + sal_Int32 GetHeight() const { return maWinSize.Height(); } /** Sets a clip region in the specified output device for the specified column. */ SAL_DLLPRIVATE void ImplSetColumnClipRegion( OutputDevice& rOutDev, sal_uInt32 nColIndex ); diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx index a4885f4996c4..709817c1711f 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.hxx @@ -87,18 +87,18 @@ private: // split handling --------------------------------------------------------- public: /** Returns the split array. */ - inline const ScCsvSplits& GetSplits() const { return maSplits; } + const ScCsvSplits& GetSplits() const { return maSplits; } /** Returns the number of splits. */ - inline sal_uInt32 GetSplitCount() const + sal_uInt32 GetSplitCount() const { return maSplits.Count(); } /** Returns the position of the specified split. */ - inline sal_Int32 GetSplitPos( sal_uInt32 nIndex ) const + sal_Int32 GetSplitPos( sal_uInt32 nIndex ) const { return maSplits[ nIndex ]; } /** Finds a position nearest to nPos which does not cause scrolling the visible area. */ sal_Int32 GetNoScrollPos( sal_Int32 nPos ) const; /** Returns true if at position nPos is a split. */ - inline bool HasSplit( sal_Int32 nPos ) const { return maSplits.HasSplit( nPos ); } + bool HasSplit( sal_Int32 nPos ) const { return maSplits.HasSplit( nPos ); } /** Inserts a split. */ void InsertSplit( sal_Int32 nPos ); /** Removes a split. */ @@ -149,9 +149,9 @@ public: private: /** Returns the width of the control. */ - inline sal_Int32 GetWidth() const { return maWinSize.Width(); } + sal_Int32 GetWidth() const { return maWinSize.Width(); } /** Returns the height of the control. */ - inline sal_Int32 GetHeight() const { return maWinSize.Height(); } + sal_Int32 GetHeight() const { return maWinSize.Height(); } /** Draws the background and active area to maBackgrDev (only the given X range). */ SAL_DLLPRIVATE void ImplDrawArea( sal_Int32 nPosX, sal_Int32 nWidth ); diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 472ab2b51f85..852ed39969d5 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -88,10 +88,10 @@ private: SAL_DLLPRIVATE void InitVScrollBar(); /** Calculates and sets valid position offset nearest to nPos. */ - SAL_DLLPRIVATE inline void ImplSetPosOffset( sal_Int32 nPos ) + SAL_DLLPRIVATE void ImplSetPosOffset( sal_Int32 nPos ) { maData.mnPosOffset = std::max( std::min( nPos, GetMaxPosOffset() ), sal_Int32( 0 ) ); } /** Calculates and sets valid line offset nearest to nLine. */ - SAL_DLLPRIVATE inline void ImplSetLineOffset( sal_Int32 nLine ) + SAL_DLLPRIVATE void ImplSetLineOffset( sal_Int32 nLine ) { maData.mnLineOffset = std::max( std::min( nLine, GetMaxLineOffset() ), sal_Int32( 0 ) ); } /** Moves controls (not cursors!) so that nPos becomes visible. */ SAL_DLLPRIVATE void MakePosVisible( sal_Int32 nPos ); @@ -108,7 +108,7 @@ public: /** Reads UI strings for data types from the list box. */ void InitTypes( const ListBox& rListBox ); /** Returns the data type of the selected columns. */ - inline sal_Int32 GetSelColumnType() const { return maGrid->GetSelColumnType(); } + sal_Int32 GetSelColumnType() const { return maGrid->GetSelColumnType(); } /** Fills the options object with current column data. */ void FillColumnData( ScAsciiOptions& rOptions ) const; @@ -116,9 +116,9 @@ public: // event handling --------------------------------------------------------- public: /** Sets a new handler for "update cell texts" requests. */ - inline void SetUpdateTextHdl( const Link<ScCsvTableBox&,void>& rHdl ) { maUpdateTextHdl = rHdl; } + void SetUpdateTextHdl( const Link<ScCsvTableBox&,void>& rHdl ) { maUpdateTextHdl = rHdl; } /** Sets a new handler for "column selection changed" events. */ - inline void SetColTypeHdl( const Link<ScCsvTableBox&,void>& rHdl ) { maColTypeHdl = rHdl; } + void SetColTypeHdl( const Link<ScCsvTableBox&,void>& rHdl ) { maColTypeHdl = rHdl; } protected: virtual void Resize() override; diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index 7111ddf9daf5..ea0813e6c978 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -126,13 +126,13 @@ public: /** Locks/unlocks the background layer that contains background objects. Unlocked layer is required to be able to edit the objects. */ - inline void LockBackgroundLayer( bool bLock ) { LockCalcLayer( SC_LAYER_BACK, bLock ); } + void LockBackgroundLayer( bool bLock ) { LockCalcLayer( SC_LAYER_BACK, bLock ); } /** Locks/unlocks the internal layer that contains caption objects of cell notes. Unlocked layer is required to be able to edit the contained objects. */ - inline void LockInternalLayer( bool bLock = true ) { LockCalcLayer( SC_LAYER_INTERN, bLock ); } + void LockInternalLayer( bool bLock = true ) { LockCalcLayer( SC_LAYER_INTERN, bLock ); } /** Unlocks the internal layer that contains caption objects of cell notes. */ - inline void UnlockInternalLayer() { LockInternalLayer( false ); } + void UnlockInternalLayer() { LockInternalLayer( false ); } SdrEndTextEditKind ScEndTextEdit(); // calls SetDrawTextUndo(0) css::uno::Reference< css::datatransfer::XTransferable > CopyToTransferable(); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 74fce921d8f9..3007d29ec0bc 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -69,7 +69,7 @@ private: OUString maComment; bool mbProtected; - inline explicit ScenarioEntry() : mbProtected( false ) {} + explicit ScenarioEntry() : mbProtected( false ) {} }; typedef ::std::vector< ScenarioEntry > ScenarioList; diff --git a/sc/source/ui/inc/navsett.hxx b/sc/source/ui/inc/navsett.hxx index f0236c21df09..268bb7f64858 100644 --- a/sc/source/ui/inc/navsett.hxx +++ b/sc/source/ui/inc/navsett.hxx @@ -38,14 +38,14 @@ private: public: ScNavigatorSettings(); - inline void SetExpanded( ScContentId nIndex, bool bExpand ) { maExpandedVec[ nIndex ] = bExpand; } - inline bool IsExpanded( ScContentId nIndex ) const { return maExpandedVec[ nIndex ]; } + void SetExpanded( ScContentId nIndex, bool bExpand ) { maExpandedVec[ nIndex ] = bExpand; } + bool IsExpanded( ScContentId nIndex ) const { return maExpandedVec[ nIndex ]; } - inline void SetRootSelected( ScContentId nIndex ) { mnRootSelected = nIndex; } - inline ScContentId GetRootSelected() const { return mnRootSelected; } + void SetRootSelected( ScContentId nIndex ) { mnRootSelected = nIndex; } + ScContentId GetRootSelected() const { return mnRootSelected; } - inline void SetChildSelected( sal_uLong nIndex ) { mnChildSelected = nIndex; } - inline sal_uLong GetChildSelected() const { return mnChildSelected; } + void SetChildSelected( sal_uLong nIndex ) { mnChildSelected = nIndex; } + sal_uLong GetChildSelected() const { return mnChildSelected; } }; #endif // INCLUDED_SC_SOURCE_UI_INC_NAVSETT_HXX diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index 7d120b9b97fb..cd9f49183e1a 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -78,9 +78,9 @@ private: void InitSettings(); /** Returns the calc document. */ - inline ScDocument& GetDoc() const { return *mrViewData.GetDocument(); } + ScDocument& GetDoc() const { return *mrViewData.GetDocument(); } /** Returns the current sheet index. */ - inline SCTAB GetTab() const { return mrViewData.GetTabNo(); } + SCTAB GetTab() const { return mrViewData.GetTabNo(); } /** Returns the outline array of the corresponding document. */ const ScOutlineArray* GetOutlineArray() const; /** Returns the specified outline entry. */ @@ -178,7 +178,7 @@ private: /** Starts mouse tracking after click on a button. */ void StartMouseTracking( size_t nLevel, size_t nEntry ); /** Returns whether mouse tracking mode is active. */ - inline bool IsMouseTracking() const { return mbMTActive; } + bool IsMouseTracking() const { return mbMTActive; } /** Ends mouse tracking. */ void EndMouseTracking(); diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx index 8791751697aa..cc69e10fbfce 100644 --- a/sc/source/ui/inc/selectionstate.hxx +++ b/sc/source/ui/inc/selectionstate.hxx @@ -40,12 +40,12 @@ public: explicit ScSelectionState( ScViewData& rViewData ); /** Returns the type of the selection this object contains. */ - inline ScSelectionType GetSelectionType() const { return meType; } + ScSelectionType GetSelectionType() const { return meType; } /** Returns the position of the cell cursor. */ - inline const ScAddress& GetCellCursor() const { return maCursor; } + const ScAddress& GetCellCursor() const { return maCursor; } /** Returns the edit engine selection. */ - inline const ESelection& GetEditSelection() const { return maEditSel; } + const ESelection& GetEditSelection() const { return maEditSel; } private: ScSelectionType meType; /// Type of the selection. diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index 20f96d721c94..ea1eaec98128 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -42,9 +42,9 @@ public: virtual void ConvertAll( EditView& rEditView ) = 0; /** Returns true, if at least one cell has been modified. */ - inline bool IsAnyModified() const { return mbIsAnyModified; } + bool IsAnyModified() const { return mbIsAnyModified; } /** Returns true, if the entire document/selection has been finished. */ - inline bool IsFinished() const { return mbFinished; } + bool IsFinished() const { return mbFinished; } protected: /** Implementation of cell iteration. Finds a cell that needs conversion. diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx index 061c0c2517a0..af1537a33b9d 100644 --- a/sc/source/ui/inc/spellparam.hxx +++ b/sc/source/ui/inc/spellparam.hxx @@ -52,12 +52,12 @@ public: sal_Int32 nOptions, bool bIsInteractive ); - inline ScConversionType GetType() const { return meConvType; } - inline LanguageType GetSourceLang() const { return meSourceLang; } - inline LanguageType GetTargetLang() const { return meTargetLang; } - inline const vcl::Font* GetTargetFont() const { return mbUseTargetFont ? &maTargetFont : nullptr; } - inline sal_Int32 GetOptions() const { return mnOptions; } - inline bool IsInteractive() const { return mbIsInteractive; } + ScConversionType GetType() const { return meConvType; } + LanguageType GetSourceLang() const { return meSourceLang; } + LanguageType GetTargetLang() const { return meTargetLang; } + const vcl::Font* GetTargetFont() const { return mbUseTargetFont ? &maTargetFont : nullptr; } + sal_Int32 GetOptions() const { return mnOptions; } + bool IsInteractive() const { return mbIsInteractive; } private: ScConversionType meConvType; /// Type of the conversion. diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index ab8c102ced38..86343729b4a8 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -83,11 +83,11 @@ public: const uno::Type& rVbaType ); /** Returns the VBA helper interface of the VBA collection object. */ - inline const uno::Reference< XHelperInterface >& getParent() const { return mxParent; } + const uno::Reference< XHelperInterface >& getParent() const { return mxParent; } /** Returns the component context of the VBA collection object. */ - inline const uno::Reference< uno::XComponentContext >& getContext() const { return mxContext; } + const uno::Reference< uno::XComponentContext >& getContext() const { return mxContext; } /** Returns the VBA type information of the objects in this container. */ - inline const uno::Type& getVbaType() const { return maVbaType; } + const uno::Type& getVbaType() const { return maVbaType; } /** Collects all shapes supported by this instance and inserts them into the internal shape vector. |