diff options
Diffstat (limited to 'sc/source/filter')
65 files changed, 145 insertions, 146 deletions
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index 4e5ad522dc6d..08399552c2a3 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -115,7 +115,7 @@ void ImportExcel::Formula( // This is a shared formula. Get the token array from the shared formula pool. SCCOL nSharedCol; SCROW nSharedRow; - if (pFormConv->ReadSharedFormulaPosition(maStrm, nSharedCol, nSharedRow)) + if (ExcelToSc::ReadSharedFormulaPosition(maStrm, nSharedCol, nSharedRow)) { ScAddress aRefPos(nSharedCol, nSharedRow, GetCurrScTab()); const ScTokenArray* pSharedCode = pFormConv->GetSharedFormula(aRefPos); diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index fe0afcf05c53..02d7078f30f1 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -1209,7 +1209,7 @@ FltError ImportExcel8::Read() case EXC_ID_CONDFMT: rCondFmtMgr.ReadCondfmt( maStrm ); break; case EXC_ID_CF: rCondFmtMgr.ReadCF( maStrm ); break; - case EXC_ID_DVAL: rValidMgr.ReadDval( maStrm ); break; + case EXC_ID_DVAL: XclImpValidationManager::ReadDval( maStrm ); break; case EXC_ID_DV: rValidMgr.ReadDV( maStrm ); break; case EXC_ID_QSI: rWQBfr.ReadQsi( maStrm ); break; diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 735995f53f52..4b6c300cd4a0 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -1149,10 +1149,9 @@ void XclExpChFontBase::ConvertFontBase( const XclExpChRoot& rRoot, const ScfProp ConvertFontBase( rRoot, rRoot.ConvertFont( rPropSet, rRoot.GetDefApiScript() ) ); } -void XclExpChFontBase::ConvertRotationBase( - const XclExpChRoot& rRoot, const ScfPropertySet& rPropSet, bool bSupportsStacked ) +void XclExpChFontBase::ConvertRotationBase(const ScfPropertySet& rPropSet, bool bSupportsStacked ) { - sal_uInt16 nRotation = rRoot.GetChartPropSetHelper().ReadRotationProperties( rPropSet, bSupportsStacked ); + sal_uInt16 nRotation = XclChPropSetHelper::ReadRotationProperties( rPropSet, bSupportsStacked ); SetRotation( nRotation ); } @@ -1209,7 +1208,7 @@ void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget, ConvertFontBase( GetChRoot(), nFontIdx ); // rotation - ConvertRotationBase( GetChRoot(), aTitleProp, true ); + ConvertRotationBase( aTitleProp, true ); // manual text position - only for main title mxFramePos.reset( new XclExpChFramePos( EXC_CHFRAMEPOS_PARENT, EXC_CHFRAMEPOS_PARENT ) ); @@ -1302,7 +1301,7 @@ bool XclExpChText::ConvertDataLabel( const ScfPropertySet& rPropSet, { // font settings ConvertFontBase( GetChRoot(), rPropSet ); - ConvertRotationBase( GetChRoot(), rPropSet, false ); + ConvertRotationBase( rPropSet, false ); // label placement sal_Int32 nPlacement = 0; sal_uInt16 nLabelPos = EXC_CHTEXT_POS_AUTO; @@ -1444,7 +1443,7 @@ XclExpChMarkerFormat::XclExpChMarkerFormat( const XclExpChRoot& rRoot ) : void XclExpChMarkerFormat::Convert( const XclExpChRoot& rRoot, const ScfPropertySet& rPropSet, sal_uInt16 nFormatIdx ) { - rRoot.GetChartPropSetHelper().ReadMarkerProperties( maData, rPropSet, nFormatIdx ); + XclChPropSetHelper::ReadMarkerProperties( maData, rPropSet, nFormatIdx ); /* Set marker line/fill color to series line color. TODO: remove this if OOChart supports own colors in markers. */ Color aLineColor; @@ -2995,7 +2994,7 @@ void XclExpChAxis::Convert( Reference< XAxis > xAxis, Reference< XAxis > xCrossi // axis label formatting and rotation ConvertFontBase( GetChRoot(), aAxisProp ); - ConvertRotationBase( GetChRoot(), aAxisProp, true ); + ConvertRotationBase( aAxisProp, true ); // axis number format sal_Int32 nApiNumFmt = 0; diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index fe045567bfd0..9caee24d6d43 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -473,7 +473,7 @@ void XclExpControlHelper::ConvertSheetLinks( Reference< XShape > xShape ) } } -void XclExpControlHelper::WriteFormula( XclExpStream& rStrm, const XclTokenArray& rTokArr ) const +void XclExpControlHelper::WriteFormula( XclExpStream& rStrm, const XclTokenArray& rTokArr ) { sal_uInt16 nFmlaSize = rTokArr.GetSize(); rStrm << nFmlaSize << sal_uInt32( 0 ); @@ -482,7 +482,7 @@ void XclExpControlHelper::WriteFormula( XclExpStream& rStrm, const XclTokenArray rStrm << sal_uInt8( 0 ); } -void XclExpControlHelper::WriteFormulaSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId, const XclTokenArray& rTokArr ) const +void XclExpControlHelper::WriteFormulaSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId, const XclTokenArray& rTokArr ) { rStrm.StartRecord( nSubRecId, (rTokArr.GetSize() + 5) & ~1 ); WriteFormula( rStrm, rTokArr ); diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index df22f9838c84..6fd5e8269e94 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -171,11 +171,11 @@ public: private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; - void WriteBool( XclExpStream& rStrm, bool bValue ); - void WriteDouble( XclExpStream& rStrm, double fValue ); - void WriteString( XclExpStream& rStrm, const OUString& rValue ); - void WriteError( XclExpStream& rStrm, sal_uInt8 nErrCode ); - void WriteEmpty( XclExpStream& rStrm ); + static void WriteBool( XclExpStream& rStrm, bool bValue ); + static void WriteDouble( XclExpStream& rStrm, double fValue ); + static void WriteString( XclExpStream& rStrm, const OUString& rValue ); + static void WriteError( XclExpStream& rStrm, sal_uInt8 nErrCode ); + static void WriteEmpty( XclExpStream& rStrm ); private: typedef ::std::vector< Any > CachedValues; diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 035a186a9d03..bc80de83de1b 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -837,7 +837,7 @@ void XclExpPivotCache::WriteSxdb( XclExpStream& rStrm ) const rStrm.EndRecord(); } -void XclExpPivotCache::WriteSxdbex( XclExpStream& rStrm ) const +void XclExpPivotCache::WriteSxdbex( XclExpStream& rStrm ) { rStrm.StartRecord( EXC_ID_SXDBEX, 12 ); rStrm << EXC_SXDBEX_CREATION_DATE @@ -1452,7 +1452,7 @@ void XclExpPivotTable::WriteSxview( XclExpStream& rStrm ) const rStrm.EndRecord(); } -void XclExpPivotTable::WriteSxivd( XclExpStream& rStrm, const ScfUInt16Vec& rFields ) const +void XclExpPivotTable::WriteSxivd( XclExpStream& rStrm, const ScfUInt16Vec& rFields ) { if( !rFields.empty() ) { @@ -1489,7 +1489,7 @@ void XclExpPivotTable::WriteSxdiList( XclExpStream& rStrm ) const } } -void XclExpPivotTable::WriteSxli( XclExpStream& rStrm, sal_uInt16 nLineCount, sal_uInt16 nIndexCount ) const +void XclExpPivotTable::WriteSxli( XclExpStream& rStrm, sal_uInt16 nLineCount, sal_uInt16 nIndexCount ) { if( nLineCount > 0 ) { diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 8b323b021cbe..22656a195895 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -303,7 +303,7 @@ bool XclExpRoot::IsDocumentEncrypted() const return false; } -uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( const OUString& aPass ) const +uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( const OUString& aPass ) { uno::Sequence< beans::NamedValue > aEncryptionData; diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 2eb50959e479..99706cc48fba 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -574,12 +574,12 @@ void XclExpBiff8Encrypter::Init( const Sequence< NamedValue >& rEncryptionData ) } } -sal_uInt32 XclExpBiff8Encrypter::GetBlockPos( sal_Size nStrmPos ) const +sal_uInt32 XclExpBiff8Encrypter::GetBlockPos( sal_Size nStrmPos ) { return static_cast< sal_uInt32 >( nStrmPos / EXC_ENCR_BLOCKSIZE ); } -sal_uInt16 XclExpBiff8Encrypter::GetOffsetInBlock( sal_Size nStrmPos ) const +sal_uInt16 XclExpBiff8Encrypter::GetOffsetInBlock( sal_Size nStrmPos ) { return static_cast< sal_uInt16 >( nStrmPos % EXC_ENCR_BLOCKSIZE ); } diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index f04240de2c56..46ecbfb558ec 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -261,7 +261,7 @@ public: private: /** Returns the Excel index of a 0-based color index. */ - inline sal_uInt16 GetXclIndex( sal_uInt32 nIndex ) const + static inline 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. */ diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index b0b3834d5250..4444dc0edc7b 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -922,9 +922,9 @@ void XclImpChFontBase::ConvertFontBase( const XclImpChRoot& rRoot, ScfPropertySe rRoot.ConvertFont( rPropSet, GetFontIndex(), &aFontColor ); } -void XclImpChFontBase::ConvertRotationBase( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet, bool bSupportsStacked ) const +void XclImpChFontBase::ConvertRotationBase( ScfPropertySet& rPropSet, bool bSupportsStacked ) const { - rRoot.GetChartPropSetHelper().WriteRotationProperties( rPropSet, GetRotation(), bSupportsStacked ); + XclChPropSetHelper::WriteRotationProperties( rPropSet, GetRotation(), bSupportsStacked ); } XclImpChFont::XclImpChFont() : @@ -1061,7 +1061,7 @@ void XclImpChText::ConvertFont( ScfPropertySet& rPropSet ) const void XclImpChText::ConvertRotation( ScfPropertySet& rPropSet, bool bSupportsStacked ) const { - ConvertRotationBase( GetChRoot(), rPropSet, bSupportsStacked ); + ConvertRotationBase( rPropSet, bSupportsStacked ); } void XclImpChText::ConvertFrame( ScfPropertySet& rPropSet ) const @@ -1300,11 +1300,11 @@ void XclImpChMarkerFormat::Convert( const XclImpChRoot& rRoot, default: aMarkerFmt.mnMarkerSize = EXC_CHMARKERFORMAT_SINGLESIZE; } aMarkerFmt.mnMarkerType = XclChartHelper::GetAutoMarkerType( nFormatIdx ); - rRoot.GetChartPropSetHelper().WriteMarkerProperties( rPropSet, aMarkerFmt ); + XclChPropSetHelper::WriteMarkerProperties( rPropSet, aMarkerFmt ); } else { - rRoot.GetChartPropSetHelper().WriteMarkerProperties( rPropSet, maData ); + XclChPropSetHelper::WriteMarkerProperties( rPropSet, maData ); } } @@ -3333,7 +3333,7 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup else if( const XclImpChText* pDefText = GetChartData().GetDefaultText( EXC_CHTEXTTYPE_AXISLABEL ) ) pDefText->ConvertFont( aAxisProp ); // label text rotation - ConvertRotationBase( GetChRoot(), aAxisProp, true ); + ConvertRotationBase( aAxisProp, true ); // number format sal_uInt32 nScNumFmt = GetNumFmtBuffer().GetScFormat( mnNumFmtIdx ); if( nScNumFmt != NUMBERFORMAT_ENTRY_NOT_FOUND ) diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 4f31285eacfd..1232b97de518 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -350,7 +350,7 @@ XclImpExtName::XclImpExtName( XclImpSupbook& rSupbook, XclImpStream& rStrm, XclS if( eSubType == EXC_SBTYPE_ADDIN ) { meType = xlExtAddIn; - maName = rStrm.GetRoot().GetScAddInName( maName ); + maName = XclImpRoot::GetScAddInName( maName ); } else if ( (eSubType == EXC_SBTYPE_EUROTOOL) && maName.equalsIgnoreAsciiCase( "EUROCONVERT" ) ) diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index f6507e4319d2..08380801042a 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -266,7 +266,7 @@ XclImpTabViewSettings& XclImpRoot::GetTabViewSettings() const return *mrImpData.mxTabViewSett; } -OUString XclImpRoot::GetScAddInName( const OUString& rXclName ) const +OUString XclImpRoot::GetScAddInName( const OUString& rXclName ) { OUString aScName; if( ScGlobal::GetAddInCollection()->GetCalcName( rXclName, aScName ) ) diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index dc2f79151552..f5efccef8d7e 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -304,12 +304,12 @@ sal_uInt16 XclImpBiff8Decrypter::OnRead( SvStream& rStrm, sal_uInt8* pnData, sal return nRet; } -sal_uInt32 XclImpBiff8Decrypter::GetBlock( sal_Size nStrmPos ) const +sal_uInt32 XclImpBiff8Decrypter::GetBlock( sal_Size nStrmPos ) { return static_cast< sal_uInt32 >( nStrmPos / EXC_ENCR_BLOCKSIZE ); } -sal_uInt16 XclImpBiff8Decrypter::GetOffset( sal_Size nStrmPos ) const +sal_uInt16 XclImpBiff8Decrypter::GetOffset( sal_Size nStrmPos ) { return static_cast< sal_uInt16 >( nStrmPos % EXC_ENCR_BLOCKSIZE ); } diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index dc46cca851c4..57d0743f1642 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -3119,7 +3119,7 @@ class CSSHandler public: CSSHandler(ScHTMLStyles& rStyles) : mrStyles(rStyles) {} - void at_rule_name(const char* /*p*/, size_t /*n*/) + static void at_rule_name(const char* /*p*/, size_t /*n*/) { // TODO: For now, we ignore at-rule properties. } @@ -3141,18 +3141,18 @@ public: maPropValue = MemStr(p, n); } - void begin_parse() {} + static void begin_parse() {} - void end_parse() {} + static void end_parse() {} - void begin_block() {} + static void begin_block() {} void end_block() { maSelectorNames.clear(); } - void begin_property() {} + static void begin_property() {} void end_property() { diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 0ca6fdd8e9c7..df1e4d7068c0 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -368,8 +368,8 @@ protected: const XclExpRoot& rRoot, ScChangeTrack& rChangeTrack ); - inline void Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const; - inline void Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const; + static inline void Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ); + static inline void Write2DRange( XclExpStream& rStrm, const ScRange& rRange ); inline sal_uInt16 GetTabId( SCTAB nTabId ) const; inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const; @@ -413,13 +413,13 @@ public: inline sal_uInt32 GetActionNumber() const { return nIndex; } }; -inline void XclExpChTrAction::Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const +inline void XclExpChTrAction::Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) { rStrm << (sal_uInt16) rAddress.Row() << (sal_uInt16) rAddress.Col(); } -inline void XclExpChTrAction::Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const +inline void XclExpChTrAction::Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) { rStrm << (sal_uInt16) rRange.aStart.Row() << (sal_uInt16) rRange.aEnd.Row() @@ -472,7 +472,7 @@ private: XclExpChTrData* pNewData; sal_uInt16 nOldLength; // this is not the record size - void MakeEmptyChTrData( XclExpChTrData*& rpData ); + static void MakeEmptyChTrData( XclExpChTrData*& rpData ); protected: ScAddress aPosition; diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 69d031a093e6..27f060b2f7e7 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -333,13 +333,13 @@ public: @param nSheet Sheet index to be inserted into orAddress. @return true = Cell address could be parsed from the passed string. */ - bool convertToCellAddressUnchecked( + static bool convertToCellAddressUnchecked( ::com::sun::star::table::CellAddress& orAddress, const OUString& rString, sal_Int16 nSheet ); - bool convertToCellAddressUnchecked( - com::sun::star::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ) const; + static bool convertToCellAddressUnchecked( + com::sun::star::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ); /** Tries to convert the passed string to a single cell address. @@ -380,7 +380,7 @@ public: @param rBinAddress Binary cell address struct. @param nSheet Sheet index to be inserted into orAddress. */ - void convertToCellAddressUnchecked( + static void convertToCellAddressUnchecked( ::com::sun::star::table::CellAddress& orAddress, const BinAddress& rBinAddress, sal_Int16 nSheet ); @@ -470,7 +470,7 @@ public: @param nSheet Sheet index to be inserted into orRange. @return true = Range address could be parsed from the passed string. */ - bool convertToCellRangeUnchecked( + static bool convertToCellRangeUnchecked( ::com::sun::star::table::CellRangeAddress& orRange, const OUString& rString, sal_Int16 nSheet ); @@ -512,7 +512,7 @@ public: @param rBinRange Binary cell range struct. @param nSheet Sheet index to be inserted into orRange. */ - void convertToCellRangeUnchecked( + static void convertToCellRangeUnchecked( ::com::sun::star::table::CellRangeAddress& orRange, const BinRange& rBinRange, sal_Int16 nSheet ); diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index 357ecdb8c72d..2963e7d6e53e 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -86,11 +86,11 @@ public: DATASET GetNextDataset(); - const sal_Unicode* ScanIntVal( const sal_Unicode* pStart, sal_uInt32& rRet ); + static const sal_Unicode* ScanIntVal( const sal_Unicode* pStart, sal_uInt32& rRet ); bool ScanFloatVal( const sal_Unicode* pStart ); - inline bool IsNumber( const sal_Unicode cChar ); - inline bool IsNumberEnding( const sal_Unicode cChar ); + static inline bool IsNumber( const sal_Unicode cChar ); + static inline bool IsNumberEnding( const sal_Unicode cChar ); static inline bool IsV( const sal_Unicode* pRef ); diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index bb533e9767ae..4a2362e0f808 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -61,7 +61,7 @@ public: void GetDummy( const ScTokenArray*& ); const ScTokenArray* GetBoolErr( XclBoolError ); - bool ReadSharedFormulaPosition( XclImpStream& rStrm, SCCOL& rCol, SCROW& rRow ); + static bool ReadSharedFormulaPosition( XclImpStream& rStrm, SCCOL& rCol, SCROW& rRow ); const ScTokenArray* GetSharedFormula( const ScAddress& rRefPos ) const; static void SetError( ScFormulaCell& rCell, const ConvErr eErr ); @@ -76,7 +76,7 @@ public: XclImpStream& aIn ); void ReadExtensionArray( unsigned int n, XclImpStream& aIn ); - void ReadExtensionNlr( XclImpStream& aIn ); + static void ReadExtensionNlr( XclImpStream& aIn ); void ReadExtensionMemArea( XclImpStream& aIn ); }; diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 83b7bb47ccb6..ebf67558bd9a 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -578,7 +578,7 @@ public: /** Returns the library type associated with the passed URL of a function library (function add-in). */ - FunctionLibraryType getFuncLibTypeFromLibraryName( const OUString& rLibraryName ) const; + static FunctionLibraryType getFuncLibTypeFromLibraryName( const OUString& rLibraryName ); protected: /** Returns the list of all function infos. */ diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index bb00ad9aaa06..65a4cec69103 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -160,12 +160,12 @@ class ScHTMLExport : public ScExportBase SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - OString BorderToStyle(const char* pBorderName, + static OString BorderToStyle(const char* pBorderName, const editeng::SvxBorderLine* pLine, bool& bInsertSemicolon); - sal_uInt16 GetFontSizeNumber( sal_uInt16 nHeight ); - const char* GetFontSizeCss( sal_uInt16 nHeight ); + static sal_uInt16 GetFontSizeNumber( sal_uInt16 nHeight ); + static const char* GetFontSizeCss( sal_uInt16 nHeight ); sal_uInt16 ToPixel( sal_uInt16 nTwips ); Size MMToPixel( const Size& r100thMMSize ); void IncIndent( short nVal ); diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index b582498b3458..de1ccfd3b316 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -181,7 +181,7 @@ private: DECL_LINK( HTMLImportHdl, ImportInfo* ); void NewActEntry( ScEEParseEntry* ); - void EntryEnd( ScEEParseEntry*, const ESelection& ); + static void EntryEnd( ScEEParseEntry*, const ESelection& ); void ProcToken( ImportInfo* ); void CloseEntry( ImportInfo* ); void NextRow( ImportInfo* ); @@ -526,7 +526,7 @@ private: void ImplDataOff(); /** Inserts additional formatting options from import info into the item set. */ - void ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo& rInfo ); + static void ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo& rInfo ); /** Updates the document column/row size of the specified column or row. @descr Only increases the present count, never decreases. */ diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index 81f477ee0589..6cf450d63e95 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -84,7 +84,7 @@ private: inline void Type( const sal_uInt16 nNew ) { nType = nNew; } }; - void MakeFont( ENTRY* pEntry ); + static void MakeFont( ENTRY* pEntry ); public: const static sal_uInt16 nSize = 8; void Fill( const sal_uInt8 nIndex, SfxItemSet& rItemSet ); diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index a4e0746411a5..b32407199063 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -306,8 +306,8 @@ public: private: /** Tries to write the passed value to the passed sheet position. */ - void writeItemToSourceDataCell( WorksheetHelper& rSheetHelper, - sal_Int32 nCol, sal_Int32 nRow, const PivotCacheItem& rItem ) const; + static void writeItemToSourceDataCell( WorksheetHelper& rSheetHelper, + sal_Int32 nCol, sal_Int32 nRow, const PivotCacheItem& rItem ); /** Tries to write the value of a shared item to the passed sheet position. */ void writeSharedItemToSourceDataCell( WorksheetHelper& rSheetHelper, sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nItemIdx ) const; diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx index 27bad9f26c8d..dbf575aa9c07 100644 --- a/sc/source/filter/inc/qproform.hxx +++ b/sc/source/filter/inc/qproform.hxx @@ -68,10 +68,10 @@ public: void DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtString ); void ReadSRD( ScSingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel ); void IncToken( TokenId &aParam ); - DefTokenId IndexToToken( sal_uInt16 nToken ); - FUNC_TYPE IndexToType( sal_uInt8 nToken ); - DefTokenId IndexToDLLId( sal_uInt16 nIndex ); - const sal_Char* getString( sal_uInt8 nIndex ); + static DefTokenId IndexToToken( sal_uInt16 nToken ); + static FUNC_TYPE IndexToType( sal_uInt8 nToken ); + static DefTokenId IndexToDLLId( sal_uInt16 nIndex ); + static const sal_Char* getString( sal_uInt8 nIndex ); }; #endif diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index d3c291c63495..ee5d5760e0a3 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -789,7 +789,7 @@ public: void LoadCol(SCCOL Col, SCTAB Tab); void LoadColAttr(SCCOL Col, SCTAB Tab); void LoadAttr(Sc10ColAttr& rAttr); - void ChangeFormat(sal_uInt16 nFormat, sal_uInt16 nInfo, sal_uLong& nKey); + static void ChangeFormat(sal_uInt16 nFormat, sal_uInt16 nInfo, sal_uLong& nKey); void LoadObjects(); }; diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index a7c47e20c30f..5701244767b9 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -808,8 +808,8 @@ private: /** Inserts the passed cell style object into the internal maps. */ void insertCellStyle( CellStyleRef xCellStyle ); /** Creates the style sheet described by the passed cell style object. */ - OUString createCellStyle( const CellStyleRef& rxCellStyle ) const; - ::ScStyleSheet* getCellStyleSheet( const CellStyleRef& rxCellStyle ) const; + static OUString createCellStyle( const CellStyleRef& rxCellStyle ); + static ::ScStyleSheet* getCellStyleSheet( const CellStyleRef& rxCellStyle ); private: typedef RefVector< CellStyle > CellStyleVector; diff --git a/sc/source/filter/inc/worksheetsettings.hxx b/sc/source/filter/inc/worksheetsettings.hxx index 2f6f192a95bb..f314733c7b46 100644 --- a/sc/source/filter/inc/worksheetsettings.hxx +++ b/sc/source/filter/inc/worksheetsettings.hxx @@ -82,7 +82,7 @@ public: /** Imports protection settings from the sheetProtection element. */ void importSheetProtection( const AttributeList& rAttribs ); /** Imports enhanced protection settings from the protectedRanges element. */ - void importProtectedRanges( const AttributeList& rAttribs ); + static void importProtectedRanges( const AttributeList& rAttribs ); /** Imports enhanced protection settings from the protectedRange element. */ void importProtectedRange( const AttributeList& rAttribs ); /** Imports protection settings from the sheetProtection element of a chart sheet. */ diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index c38925f18cdb..e6adff59b61e 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -482,7 +482,7 @@ public: /** Creates a CHFONT record from the passed font index, calls virtual function SetFont(). */ void ConvertFontBase( const XclExpChRoot& rRoot, const ScfPropertySet& rPropSet ); /** Converts rotation settings, calls virtual function SetRotation(). */ - void ConvertRotationBase( const XclExpChRoot& rRoot, const ScfPropertySet& rPropSet, bool bSupportsStacked ); + void ConvertRotationBase( const ScfPropertySet& rPropSet, bool bSupportsStacked ); }; /** Represents the CHTEXT record group containing text object properties. diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 8a960f5db307..07334c2122af 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -154,7 +154,7 @@ private: @param rRanges The cell range list to fill. @param xLabelRangesRef The core range list with all ranges. @param nScTab The current Calc sheet index. */ - void FillRangeList( ScRangeList& rScRanges, + static void FillRangeList( ScRangeList& rScRanges, ScRangePairListRef xLabelRangesRef, SCTAB nScTab ); private: diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 6ef12e5de038..56b183a39e82 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -179,9 +179,9 @@ protected: inline sal_uInt16 GetSourceEntryCount() const { return mnEntryCount; } /** Writes a formula with special style only valid in OBJ records. */ - void WriteFormula( XclExpStream& rStrm, const XclTokenArray& rTokArr ) const; + static void WriteFormula( XclExpStream& rStrm, const XclTokenArray& rTokArr ); /** Writes a formula subrecord with special style only valid in OBJ records. */ - void WriteFormulaSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId, const XclTokenArray& rTokArr ) const; + static void WriteFormulaSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId, const XclTokenArray& rTokArr ); private: XclTokenArrayRef mxCellLink; /// Formula for linked cell. diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 952443814a0b..dafd0884d37f 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -188,7 +188,7 @@ public: /** Writes related records into Workbook stream and creates the pivot cache storage stream. */ void Save( XclExpStream& rStrm ); - void SaveXml( XclExpXmlStream& rStrm ); + static void SaveXml( XclExpXmlStream& rStrm ); private: /** Returns read/write access to a pivot cache field. */ @@ -212,7 +212,7 @@ private: /** Writes the SXDB record. */ void WriteSxdb( XclExpStream& rStrm ) const; /** Writes the SXDBEX record. */ - void WriteSxdbex( XclExpStream& rStrm ) const; + static void WriteSxdbex( XclExpStream& rStrm ); /** Writes the SXINDEXLIST record list containing the item index table. */ void WriteSxindexlistList( XclExpStream& rStrm ) const; @@ -372,13 +372,13 @@ private: /** Writes the SXVIEW record starting the pivot table. */ void WriteSxview( XclExpStream& rStrm ) const; /** Writes an SXIVD record for row field or column field order. */ - void WriteSxivd( XclExpStream& rStrm, const ScfUInt16Vec& rFields ) const; + static void WriteSxivd( XclExpStream& rStrm, const ScfUInt16Vec& rFields ); /** Writes the SXPI record containing page field info. */ void WriteSxpi( XclExpStream& rStrm ) const; /** Writes all SXDI records containing info about the data fields. */ void WriteSxdiList( XclExpStream& rStrm ) const; /** Writes a dummy SXLI records containing item layout info. */ - void WriteSxli( XclExpStream& rStrm, sal_uInt16 nLineCount, sal_uInt16 nIndexCount ) const; + static void WriteSxli( XclExpStream& rStrm, sal_uInt16 nLineCount, sal_uInt16 nIndexCount ); /** Writes the SXEX records containing additional pivot table info. */ void WriteSxex( XclExpStream& rStrm ) const; diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index 3bd970f8b388..7f1b6dd980b5 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -171,7 +171,7 @@ public: bool IsDocumentEncrypted() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateEncryptionData( const OUString& aPass ) const; + static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateEncryptionData( const OUString& aPass ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData() const; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateDefaultEncryptionData() const; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index fd41b7362610..90549b7110ed 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -224,8 +224,8 @@ public: private: void Init( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ); - sal_uInt32 GetBlockPos( sal_Size nStrmPos ) const; - sal_uInt16 GetOffsetInBlock( sal_Size nStrmPos ) const; + static sal_uInt32 GetBlockPos( sal_Size nStrmPos ); + static sal_uInt16 GetOffsetInBlock( sal_Size nStrmPos ); private: ::msfilter::MSCodec_Std97 maCodec; /// Crypto algorithm implementation. diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 981899d36e36..b33077465fc3 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -443,7 +443,7 @@ public: /** Converts and writes the contained font settings to the passed property set. */ void ConvertFontBase( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet ) const; /** Converts and writes the contained rotation settings to the passed property set. */ - void ConvertRotationBase( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet, bool bSupportsStacked ) const; + void ConvertRotationBase( ScfPropertySet& rPropSet, bool bSupportsStacked ) const; }; /** The CHFONT record containing a font index for text objects. */ diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx index 2e376f94c51a..181a199745eb 100644 --- a/sc/source/filter/inc/xicontent.hxx +++ b/sc/source/filter/inc/xicontent.hxx @@ -170,7 +170,7 @@ public: explicit XclImpValidationManager( const XclImpRoot& rRoot ); /** Reads a DVAL record and sets marks the dropdown arrow control to be ignored. */ - void ReadDval( XclImpStream& rStrm ); + static void ReadDval( XclImpStream& rStrm ); /** Reads a DV record and inserts validation data into the document. */ void ReadDV( XclImpStream& rStrm ); diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx index 949750a0eb36..7db16978b8d2 100644 --- a/sc/source/filter/inc/xiroot.hxx +++ b/sc/source/filter/inc/xiroot.hxx @@ -201,7 +201,7 @@ public: XclImpTabViewSettings& GetTabViewSettings() const; /** Returns the Calc add-in function name for an Excel function name. */ - OUString GetScAddInName( const OUString& rXclName ) const; + static OUString GetScAddInName( const OUString& rXclName ); /** Returns true, if the document contains a VB project. */ inline bool HasBasic() const { return mrImpData.mbHasBasic; } diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 85e949888b80..72bb9ab6e986 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -139,9 +139,9 @@ private: virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) SAL_OVERRIDE; /** Returns the block number corresponding to the passed stream position. */ - sal_uInt32 GetBlock( sal_Size nStrmPos ) const; + static sal_uInt32 GetBlock( sal_Size nStrmPos ); /** Returns the block offset corresponding to the passed stream position. */ - sal_uInt16 GetOffset( sal_Size nStrmPos ) const; + static sal_uInt16 GetOffset( sal_Size nStrmPos ); private: ::msfilter::MSCodec_Std97 maCodec; /// Crypto algorithm implementation. diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index a527284042aa..f7ffec4d4049 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -1336,12 +1336,12 @@ public: const ScfPropertySet& rPropSet, XclChPropertyMode ePropMode ); /** Reads all marker properties from the passed property set. */ - void ReadMarkerProperties( + static void ReadMarkerProperties( XclChMarkerFormat& rMarkerFmt, const ScfPropertySet& rPropSet, sal_uInt16 nFormatIdx ); /** Reads rotation properties from the passed property set. */ - sal_uInt16 ReadRotationProperties( + static sal_uInt16 ReadRotationProperties( const ScfPropertySet& rPropSet, bool bSupportsStacked ); @@ -1367,11 +1367,11 @@ public: sal_uInt32 nDffFillType, XclChPropertyMode ePropMode ); /** Writes all marker properties to the passed property set. */ - void WriteMarkerProperties( + static void WriteMarkerProperties( ScfPropertySet& rPropSet, const XclChMarkerFormat& rMarkerFmt ); /** Writes rotation properties to the passed property set. */ - void WriteRotationProperties( + static void WriteRotationProperties( ScfPropertySet& rPropSet, sal_uInt16 nRotation, bool bSupportsStacked ); diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index 920476511e83..95319ce19566 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -348,7 +348,7 @@ bool AddressConverter::convertToCellAddressUnchecked( CellAddress& orAddress, } bool AddressConverter::convertToCellAddressUnchecked( - com::sun::star::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ) const + com::sun::star::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ) { orAddress.Sheet = nSheet; return parseOoxAddress2d(orAddress.Column, orAddress.Row, pStr); diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index b4453464265b..982daa1a7466 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -534,14 +534,14 @@ AutoFilter::AutoFilter( const WorkbookHelper& rHelper ) : void AutoFilter::importAutoFilter( const AttributeList& rAttribs, sal_Int16 nSheet ) { OUString aRangeStr = rAttribs.getString( XML_ref, OUString() ); - getAddressConverter().convertToCellRangeUnchecked( maRange, aRangeStr, nSheet ); + AddressConverter::convertToCellRangeUnchecked( maRange, aRangeStr, nSheet ); } void AutoFilter::importAutoFilter( SequenceInputStream& rStrm, sal_Int16 nSheet ) { BinRange aBinRange; rStrm >> aBinRange; - getAddressConverter().convertToCellRangeUnchecked( maRange, aBinRange, nSheet ); + AddressConverter::convertToCellRangeUnchecked( maRange, aBinRange, nSheet ); } FilterColumn& AutoFilter::createFilterColumn() diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index 9f74748c5779..d126cf02098a 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -104,7 +104,7 @@ void Comment::importComment( const AttributeList& rAttribs ) { maModel.mnAuthorId = rAttribs.getInteger( XML_authorId, -1 ); // cell range will be checked while inserting the comment into the document - getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex() ); + AddressConverter::convertToCellRangeUnchecked( maModel.maRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex() ); } void Comment::importCommentPr( const AttributeList& rAttribs ) @@ -124,7 +124,7 @@ void Comment::importComment( SequenceInputStream& rStrm ) maModel.mnAuthorId = rStrm.readInt32(); rStrm >> aBinRange; // cell range will be checked while inserting the comment into the document - getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, aBinRange, getSheetIndex() ); + AddressConverter::convertToCellRangeUnchecked( maModel.maRange, aBinRange, getSheetIndex() ); } RichStringRef Comment::createText() diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index ca1715c08181..896c898307b0 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -567,7 +567,7 @@ void ExternalLink::setExternalTargetUrl( const OUString& rTargetUrl, const OUStr else if( rTargetType == CREATE_MSOFFICE_RELATION_TYPE( "xlExternalLinkPath/xlLibrary" ) ) { meLinkType = LINKTYPE_LIBRARY; - meFuncLibType = getFormulaParser().getFuncLibTypeFromLibraryName( rTargetUrl ); + meFuncLibType = FunctionProvider::getFuncLibTypeFromLibraryName( rTargetUrl ); } OSL_ENSURE( meLinkType != LINKTYPE_UNKNOWN, "ExternalLink::setExternalTargetUrl - empty target URL or unknown target type" ); diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 408d5e170457..a590a3c29f05 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -1146,7 +1146,7 @@ const FunctionInfo* FunctionProvider::getFuncInfoFromMacroName( const OUString& return mxFuncImpl->maMacroFuncs.get( rFuncName ).get(); } -FunctionLibraryType FunctionProvider::getFuncLibTypeFromLibraryName( const OUString& rLibraryName ) const +FunctionLibraryType FunctionProvider::getFuncLibTypeFromLibraryName( const OUString& rLibraryName ) { #define OOX_XLS_IS_LIBNAME( libname, basename ) (libname.equalsIgnoreAsciiCase( basename ".XLA" ) || libname.equalsIgnoreAsciiCase( basename ".XLAM" )) diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index 63ff5be43f79..4a48cf257e92 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -530,7 +530,7 @@ private: // reference conversion --------------------------------------------------- void initReference2d( SingleReference& orApiRef ) const; - void initReference3d( SingleReference& orApiRef, sal_Int32 nSheet, bool bSameSheet ) const; + static void initReference3d( SingleReference& orApiRef, sal_Int32 nSheet, bool bSameSheet ); void convertReference( SingleReference& orApiRef, const BinSingleRef2d& rRef, bool bDeleted, bool bRelativeAsOffset ) const; void convertReference( ComplexReference& orApiRef, const BinSingleRef2d& rRef1, const BinSingleRef2d& rRef2, bool bDeleted, bool bRelativeAsOffset ) const; void convertReference2d( SingleReference& orApiRef, const BinSingleRef2d& rRef, bool bDeleted, bool bRelativeAsOffset ) const; @@ -1108,7 +1108,7 @@ void FormulaParserImpl::initReference2d( SingleReference& orApiRef ) const } } -void FormulaParserImpl::initReference3d( SingleReference& orApiRef, sal_Int32 nSheet, bool bSameSheet ) const +void FormulaParserImpl::initReference3d( SingleReference& orApiRef, sal_Int32 nSheet, bool bSameSheet ) { orApiRef.Flags = SHEET_3D; if( nSheet < 0 ) diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index da6e770d8905..e35eaaeb00f0 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -996,7 +996,7 @@ void PivotCacheField::importPCItemIndex( BiffInputStream& rStrm, WorksheetHelper // private -------------------------------------------------------------------- void PivotCacheField::writeItemToSourceDataCell( WorksheetHelper& rSheetHelper, - sal_Int32 nCol, sal_Int32 nRow, const PivotCacheItem& rItem ) const + sal_Int32 nCol, sal_Int32 nRow, const PivotCacheItem& rItem ) { if( rItem.getType() != XML_m ) { @@ -1094,7 +1094,7 @@ void PivotCache::importWorksheetSource( const AttributeList& rAttribs, const Rel // resolve URL of external document maTargetUrl = rRelations.getExternalTargetFromRelId( maSheetSrcModel.maRelId ); // store range address unchecked with sheet index 0, will be resolved/checked later - getAddressConverter().convertToCellRangeUnchecked( maSheetSrcModel.maRange, rAttribs.getString( XML_ref, OUString() ), 0 ); + AddressConverter::convertToCellRangeUnchecked( maSheetSrcModel.maRange, rAttribs.getString( XML_ref, OUString() ), 0 ); } void PivotCache::importPCDefinition( SequenceInputStream& rStrm ) @@ -1149,7 +1149,7 @@ void PivotCache::importPCDSheetSource( SequenceInputStream& rStrm, const Relatio BinRange aBinRange; rStrm >> aBinRange; // store range address unchecked with sheet index 0, will be resolved/checked later - getAddressConverter().convertToCellRangeUnchecked( maSheetSrcModel.maRange, aBinRange, 0 ); + AddressConverter::convertToCellRangeUnchecked( maSheetSrcModel.maRange, aBinRange, 0 ); } else { diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index ec574e36b327..04b02687de07 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -962,7 +962,7 @@ void PivotTable::importPivotTableDefinition( const AttributeList& rAttribs ) void PivotTable::importLocation( const AttributeList& rAttribs, sal_Int16 nSheet ) { - getAddressConverter().convertToCellRangeUnchecked( maLocationModel.maRange, rAttribs.getString( XML_ref, OUString() ), nSheet ); + AddressConverter::convertToCellRangeUnchecked( maLocationModel.maRange, rAttribs.getString( XML_ref, OUString() ), nSheet ); maLocationModel.mnFirstHeaderRow = rAttribs.getInteger( XML_firstHeaderRow, 0 ); maLocationModel.mnFirstDataRow = rAttribs.getInteger( XML_firstDataRow, 0 ); maLocationModel.mnFirstDataCol = rAttribs.getInteger( XML_firstDataCol, 0 ); @@ -1087,7 +1087,7 @@ void PivotTable::importPTLocation( SequenceInputStream& rStrm, sal_Int16 nSheet maLocationModel.mnFirstDataCol = rStrm.readInt32(); maLocationModel.mnRowPageCount = rStrm.readInt32(); maLocationModel.mnColPageCount = rStrm.readInt32(); - getAddressConverter().convertToCellRangeUnchecked( maLocationModel.maRange, aBinRange, nSheet ); + AddressConverter::convertToCellRangeUnchecked( maLocationModel.maRange, aBinRange, nSheet ); } void PivotTable::importPTRowFields( SequenceInputStream& rStrm ) diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx index 946fad940a08..2308953879a8 100644 --- a/sc/source/filter/oox/scenariobuffer.cxx +++ b/sc/source/filter/oox/scenariobuffer.cxx @@ -70,7 +70,7 @@ void Scenario::importScenario( const AttributeList& rAttribs ) void Scenario::importInputCells( const AttributeList& rAttribs ) { ScenarioCellModel aModel; - getAddressConverter().convertToCellAddressUnchecked( aModel.maPos, rAttribs.getString( XML_r, OUString() ), mnSheet ); + AddressConverter::convertToCellAddressUnchecked( aModel.maPos, rAttribs.getString( XML_r, OUString() ), mnSheet ); aModel.maValue = rAttribs.getXString( XML_val, OUString() ); aModel.mnNumFmtId = rAttribs.getInteger( XML_numFmtId, 0 ); aModel.mbDeleted = rAttribs.getBool( XML_deleted, false ); @@ -95,7 +95,7 @@ void Scenario::importInputCells( SequenceInputStream& rStrm ) rStrm.skip( 8 ); aModel.mnNumFmtId = rStrm.readuInt16(); rStrm >> aModel.maValue; - getAddressConverter().convertToCellAddressUnchecked( aModel.maPos, aPos, mnSheet ); + AddressConverter::convertToCellAddressUnchecked( aModel.maPos, aPos, mnSheet ); maCells.push_back( aModel ); } diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 39995a1a9504..5e73b6856359 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -2839,7 +2839,7 @@ void CellStyleBuffer::insertCellStyle( CellStyleRef xCellStyle ) } } -::ScStyleSheet* CellStyleBuffer::getCellStyleSheet( const CellStyleRef& rxCellStyle ) const +::ScStyleSheet* CellStyleBuffer::getCellStyleSheet( const CellStyleRef& rxCellStyle ) { ::ScStyleSheet* pStyleSheet = NULL; if ( rxCellStyle.get() ) @@ -2847,7 +2847,7 @@ void CellStyleBuffer::insertCellStyle( CellStyleRef xCellStyle ) return pStyleSheet; } -OUString CellStyleBuffer::createCellStyle( const CellStyleRef& rxCellStyle ) const +OUString CellStyleBuffer::createCellStyle( const CellStyleRef& rxCellStyle ) { if( rxCellStyle.get() ) { diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index d70c8c532a83..65aaf64ee6f9 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -52,7 +52,7 @@ Table::Table( const WorkbookHelper& rHelper ) : void Table::importTable( const AttributeList& rAttribs, sal_Int16 nSheet ) { - getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, rAttribs.getString( XML_ref, OUString() ), nSheet ); + AddressConverter::convertToCellRangeUnchecked( maModel.maRange, rAttribs.getString( XML_ref, OUString() ), nSheet ); maModel.maProgName = rAttribs.getXString( XML_name, OUString() ); maModel.maDisplayName = rAttribs.getXString( XML_displayName, OUString() ); maModel.mnId = rAttribs.getInteger( XML_id, -1 ); @@ -73,7 +73,7 @@ void Table::importTable( SequenceInputStream& rStrm, sal_Int16 nSheet ) rStrm.skip( 32 ); rStrm >> maModel.maProgName >> maModel.maDisplayName; - getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, aBinRange, nSheet ); + AddressConverter::convertToCellRangeUnchecked( maModel.maRange, aBinRange, nSheet ); static const sal_Int32 spnTypes[] = { XML_worksheet, XML_TOKEN_INVALID, XML_TOKEN_INVALID, XML_queryTable }; maModel.mnType = STATIC_ARRAY_SELECT( spnTypes, nType, XML_TOKEN_INVALID ); } diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index c25004ecff3c..96db289d4e7f 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -663,7 +663,7 @@ void WorkbookGlobals::recalcFormulaCells() { // Ask the user if full re-calculation is desired. ScopedVclPtrInstance<QueryBox> aBox( - rDocSh.GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), + ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), ScGlobal::GetRscString(STR_QUERY_FORMULA_RECALC_ONLOAD_XLS)); aBox->SetCheckBoxText(ScGlobal::GetRscString(STR_ALWAYS_PERFORM_SELECTED)); diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index 666550f4b7da..1eb803d678e5 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -244,7 +244,7 @@ ContextHandlerRef WorksheetFragment::onCreateContext( sal_Int32 nElement, const case XLS_TOKEN( dimension ): importDimension( rAttribs ); break; case XLS_TOKEN( sheetFormatPr ): importSheetFormatPr( rAttribs ); break; case XLS_TOKEN( sheetProtection ): getWorksheetSettings().importSheetProtection( rAttribs ); break; - case XLS_TOKEN( protectedRanges ): getWorksheetSettings().importProtectedRanges( rAttribs ); return this; + case XLS_TOKEN( protectedRanges ): WorksheetSettings::importProtectedRanges( rAttribs ); return this; case XLS_TOKEN( phoneticPr ): getWorksheetSettings().importPhoneticPr( rAttribs ); break; case XLS_TOKEN( printOptions ): getPageSettings().importPrintOptions( rAttribs ); break; case XLS_TOKEN( pageMargins ): getPageSettings().importPageMargins( rAttribs ); break; @@ -499,7 +499,7 @@ void WorksheetFragment::importPageSetUpPr( const AttributeList& rAttribs ) void WorksheetFragment::importDimension( const AttributeList& rAttribs ) { CellRangeAddress aRange; - getAddressConverter().convertToCellRangeUnchecked( aRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex() ); + AddressConverter::convertToCellRangeUnchecked( aRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex() ); /* OOXML stores the used area, if existing, or "A1" if the sheet is empty. In case of "A1", the dimension at the WorksheetHelper object will not be set. If the cell A1 exists, the used area will be updated while @@ -611,7 +611,7 @@ void WorksheetFragment::importDimension( SequenceInputStream& rStrm ) BinRange aBinRange; aBinRange.read( rStrm ); CellRangeAddress aRange; - getAddressConverter().convertToCellRangeUnchecked( aRange, aBinRange, getSheetIndex() ); + AddressConverter::convertToCellRangeUnchecked( aRange, aBinRange, getSheetIndex() ); /* BIFF12 stores the used area, if existing, or "A1" if the sheet is empty. In case of "A1", the dimension at the WorksheetHelper object will not be set. If the cell A1 exists, the used area will be updated diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 793bec5de0a8..e887f7a7f86f 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -66,7 +66,7 @@ ScXMLExportDataPilot::~ScXMLExportDataPilot() } OUString ScXMLExportDataPilot::getDPOperatorXML( - const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) const + const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) { switch (aFilterOperator) { diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx index 33ef30b7799c..e7fbf755407b 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.hxx +++ b/sc/source/filter/xml/XMLExportDataPilot.hxx @@ -41,7 +41,7 @@ class ScXMLExportDataPilot ScXMLExport& rExport; ScDocument* pDoc; - OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) const; + static OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const bool bUseRegularExpressions); void WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions); void WriteDPFilter(const ScQueryParam& aQueryParam); diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index f7c0aa6d11eb..e9bf1236546c 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -363,7 +363,7 @@ private: } } - OUString getOperatorXML(const ScQueryEntry& rEntry, bool bRegExp) const + static OUString getOperatorXML(const ScQueryEntry& rEntry, bool bRegExp) { switch (rEntry.eOp) { diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index 20b9c9a7d3dc..2f44ce658fc0 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -84,16 +84,16 @@ private: const OUString sMacroName; public: - ScMyValidationsContainer(); - ~ScMyValidationsContainer(); - bool AddValidation(const com::sun::star::uno::Any& aAny, + ScMyValidationsContainer(); + ~ScMyValidationsContainer(); + bool AddValidation(const com::sun::star::uno::Any& aAny, sal_Int32& nValidationIndex); - OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); - OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); - void WriteMessage(ScXMLExport& rExport, + static OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); + static OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); + static void WriteMessage(ScXMLExport& rExport, const OUString& sTitle, const OUString& sMessage, const bool bShowMessage, const bool bIsHelpMessage); - void WriteValidations(ScXMLExport& rExport); + void WriteValidations(ScXMLExport& rExport); const OUString& GetValidationName(const sal_Int32 nIndex); }; @@ -115,7 +115,7 @@ class ScMyDefaultStyles { ScMyDefaultStyleList maColDefaults; - sal_Int32 GetStyleNameIndex(const ScFormatRangeStyles* pCellStyles, + static sal_Int32 GetStyleNameIndex(const ScFormatRangeStyles* pCellStyles, const sal_Int32 nTable, const sal_Int32 nPos, const sal_Int32 i, bool& bIsAutoStyle); public: diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index c404d4722aeb..bb1b11effad1 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -94,7 +94,7 @@ class ScMyStyleRanges : public SvRefBase ::boost::shared_ptr<ScSimpleRangeList> mpUndefinedList; ScMyCurrencyStylesSet* pCurrencyList; - void SetStylesToRanges(const ::std::list<ScRange>& rList, + static void SetStylesToRanges(const ::std::list<ScRange>& rList, const OUString* pStyleName, const sal_Int16 nCellType, const OUString* pCurrency, ScXMLImport& rImport); public: @@ -147,7 +147,7 @@ class ScMyStylesImportHelper void AddDefaultRange(const ScRange& rRange); void AddSingleRange(const ScRange& rRange); void AddRange(); - bool IsEqual(const OUString* pFirst, const OUString* pSecond) + static bool IsEqual(const OUString* pFirst, const OUString* pSecond) { return ((pFirst && pSecond && pFirst->equals(*pSecond)) || (!pFirst && !pSecond) || diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index ed6e28d6f807..6280175b73f4 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -52,7 +52,7 @@ XMLTableShapeImportHelper::~XMLTableShapeImportHelper() { } -void XMLTableShapeImportHelper::SetLayer(uno::Reference<drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType) const +void XMLTableShapeImportHelper::SetLayer(uno::Reference<drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType) { if ( sType == "com.sun.star.drawing.ControlShape" ) nLayerID = SC_LAYER_CONTROLS; @@ -159,7 +159,7 @@ void XMLTableShapeImportHelper::finishShape( // also when anchored to the sheet // -> call AddOLE with invalid cell position (checked in ScMyShapeResizer::ResizeShapes) - if (rTables.IsOLE(rShape)) + if (ScMyTables::IsOLE(rShape)) rTables.AddOLE(rShape, *pRangeList); } diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index de9ac029d0b3..41634f06d9f7 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -37,7 +37,7 @@ public: XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper=0 ); virtual ~XMLTableShapeImportHelper(); - void SetLayer(com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType) const; + static void SetLayer(com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType); virtual void finishShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) SAL_OVERRIDE; diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 8cdbd82e8cc4..3ddd5bfe618a 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3656,12 +3656,12 @@ void ScXMLExport::SetRepeatAttribute(sal_Int32 nEqualCellCount, bool bIncProgres } } -bool ScXMLExport::IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const +bool ScXMLExport::IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) { return (aCell1.nType == aCell2.nType); } -bool ScXMLExport::IsEditCell(ScMyCell& rCell) const +bool ScXMLExport::IsEditCell(ScMyCell& rCell) { return rCell.maBaseCell.meType == CELLTYPE_EDIT; } diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 2a5a6ea2dc52..e4630b44122f 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -147,7 +147,7 @@ class ScXMLExport : public SvXMLExport void CollectInternalShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - com::sun::star::table::CellRangeAddress GetEndAddress(const com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& xTable, + static com::sun::star::table::CellRangeAddress GetEndAddress(const com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& xTable, const sal_Int32 nTable); // ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges(); void GetAreaLinks( ScMyAreaLinksContainer& rAreaLinks ); @@ -176,7 +176,7 @@ class ScXMLExport : public SvXMLExport void GetColumnRowHeader(bool& bHasColumnHeader, com::sun::star::table::CellRangeAddress& aColumnHeaderRange, bool& bHasRowHeader, com::sun::star::table::CellRangeAddress& aRowHeaderRange, OUString& rPrintRanges) const; - void FillFieldGroup(ScOutlineArray* pFields, ScMyOpenCloseColumnRowGroup* pGroups); + static void FillFieldGroup(ScOutlineArray* pFields, ScMyOpenCloseColumnRowGroup* pGroups); void FillColumnRowGroups(); bool GetMerged (const com::sun::star::table::CellRangeAddress* pCellRange, @@ -194,8 +194,8 @@ class ScXMLExport : public SvXMLExport void WriteTableShapes(); void SetRepeatAttribute(sal_Int32 nEqualCellCount, bool bIncProgress); - bool IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const; - bool IsEditCell(ScMyCell& rCell) const; + static bool IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2); + static bool IsEditCell(ScMyCell& rCell); bool IsCellEqual(ScMyCell& aCell1, ScMyCell& aCell2); void WriteCalculationSettings(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc); diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index f48894257f3c..f500690c9ed1 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -382,7 +382,7 @@ SvXMLImportContext *ScXMLConditionContext::CreateChildContext( sal_uInt16 nPrefi } void ScXMLConditionContext::GetOperator( - const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const + const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) { rParam.bRegExp = false; if (IsXMLToken(aOpStr, XML_MATCH)) @@ -822,7 +822,7 @@ SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( sal_uInt16 nPre } void ScXMLDPConditionContext::getOperatorXML( - const OUString& sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const + const OUString& sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) { bUseRegularExpressions = false; if (IsXMLToken(sTempOperator, XML_MATCH)) diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index e22fe1e6d81b..2df7a49d20e7 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -169,7 +169,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - void GetOperator(const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const; + static void GetOperator(const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry); void AddSetItem(const ScQueryEntry::Item& rItem); }; @@ -341,8 +341,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - void getOperatorXML( - const OUString& sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const; + static void getOperatorXML( + const OUString& sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions); virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 5823cd3c42fc..777e68b6dce6 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -3022,7 +3022,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE UnlockSolarMutex(); } -sal_Int32 ScXMLImport::GetRangeType(const OUString& sRangeType) const +sal_Int32 ScXMLImport::GetRangeType(const OUString& sRangeType) { sal_Int32 nRangeType(0); OUStringBuffer sBuffer; @@ -3108,7 +3108,7 @@ public: using namespace formula; const OUString& aType = r.sRangeType; - sal_uInt32 nUnoType = mrXmlImport.GetRangeType(aType); + sal_uInt32 nUnoType = ScXMLImport::GetRangeType(aType); sal_uInt16 nNewType = RT_NAME; if ( nUnoType & sheet::NamedRangeFlag::FILTER_CRITERIA ) nNewType |= RT_CRITERIA; diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 766ab01a6927..c26a71016a81 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -1214,7 +1214,7 @@ public: void SetRangeOverflowType(sal_uInt32 nType); - sal_Int32 GetRangeType(const OUString& sRangeType) const; + static sal_Int32 GetRangeType(const OUString& sRangeType); void SetNamedRanges(); void SetSheetNamedRanges(); void SetLabelRanges(); diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx index d3656d8c6b72..2e4e98a3234a 100644 --- a/sc/source/filter/xml/xmlsubti.hxx +++ b/sc/source/filter/xml/xmlsubti.hxx @@ -79,7 +79,7 @@ public: void SetRowStyle(const OUString& rCellStyleName); void AddColumn(bool bIsCovered); void FixupOLEs() { aFixupOLEs.FixupOLEs(); } - bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) const + static bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) { return ScMyOLEFixer::IsOLE(rShape); } void DeleteTable(); ScAddress GetCurrentCellPos() const { return maCurrentCellPos; }; |