diff options
Diffstat (limited to 'sc/source/filter/excel')
-rw-r--r-- | sc/source/filter/excel/xechart.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/excel/xeformula.cxx | 44 | ||||
-rw-r--r-- | sc/source/filter/excel/xelink.cxx | 12 | ||||
-rw-r--r-- | sc/source/filter/excel/xename.cxx | 8 | ||||
-rw-r--r-- | sc/source/filter/excel/xestring.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/excel/xestyle.cxx | 32 | ||||
-rw-r--r-- | sc/source/filter/excel/xichart.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xilink.cxx | 8 | ||||
-rw-r--r-- | sc/source/filter/excel/xistyle.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xltools.cxx | 8 |
11 files changed, 63 insertions, 63 deletions
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; }; |