diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-29 15:57:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-05 09:30:40 +0200 |
| commit | 03e6cc9130864adcea5a1ae5440f24a9c128e8d6 (patch) | |
| tree | 4d8245b295c316bc71dc713c4691322c27a37d12 /sc/source/ui | |
| parent | 6ca16a4cad999dbb0296ea64db2263a26e52f36c (diff) | |
loplugin:staticmethods
Change-Id: I912187d6c481a2ba61fed9c01998bf6f3c08a6a0
Diffstat (limited to 'sc/source/ui')
70 files changed, 183 insertions, 185 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 4b1c96b071c9..a4e94cc9ecab 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -133,7 +133,7 @@ struct ScShapeDataLess msZOrder( "ZOrder" ) { } - void ConvertLayerId(sal_Int16& rLayerID) const // changes the number of the LayerId so it the accessibility order + static void ConvertLayerId(sal_Int16& rLayerID) // changes the number of the LayerId so it the accessibility order { switch (rLayerID) { @@ -330,8 +330,8 @@ private: bool FindShape(const uno::Reference<drawing::XShape>& xShape, SortedShapes::iterator& rItr) const; - sal_Int8 Compare(const ScAccessibleShapeData* pData1, - const ScAccessibleShapeData* pData2) const; + static sal_Int8 Compare(const ScAccessibleShapeData* pData1, + const ScAccessibleShapeData* pData2); }; ScChildrenShapes::ScChildrenShapes(ScAccessibleDocument* pAccessibleDocument, ScTabViewShell* pViewShell, ScSplitPos eSplitPos) @@ -1361,7 +1361,7 @@ bool ScChildrenShapes::FindShape(const uno::Reference<drawing::XShape>& xShape, } sal_Int8 ScChildrenShapes::Compare(const ScAccessibleShapeData* pData1, - const ScAccessibleShapeData* pData2) const + const ScAccessibleShapeData* pData2) { ScShapeDataLess aLess; @@ -2343,7 +2343,7 @@ OUString ScAccessibleDocument::GetCurrentCellName() const return sName; } -OUString ScAccessibleDocument::GetCurrentCellDescription() const +OUString ScAccessibleDocument::GetCurrentCellDescription() { return OUString(); } diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 08db9aa7fc63..c127841e54f0 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -106,8 +106,8 @@ private: ::accessibility::AccessibleTextHelper* CreateTextHelper(const OUString& rString, const Rectangle& rVisRect, const ScAddress& aCellPos, bool bMarkNote, sal_Int32 nChildOffset) const; sal_Int32 AddNotes(const ScPreviewLocationData& rData, const Rectangle& rVisRect, bool bMark, ScAccNotes& rNotes); - sal_Int8 CompareCell(const ScAddress& aCell1, const ScAddress& aCell2); - void CollectChildren(const ScAccNote& rNote, ScXAccList& rList); + static sal_Int8 CompareCell(const ScAddress& aCell1, const ScAddress& aCell2); + static void CollectChildren(const ScAccNote& rNote, ScXAccList& rList); sal_Int32 CheckChanges(const ScPreviewLocationData& rData, const Rectangle& rVisRect, bool bMark, ScAccNotes& rOldNotes, ScAccNotes& rNewNotes, ScXAccList& rOldParas, ScXAccList& rNewParas); diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index db2c1bb1b52d..83452ead290b 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -307,7 +307,7 @@ void ScInputWindow::SetInputHandler( ScInputHandler* pNew ) } } -bool ScInputWindow::UseSubTotal(ScRangeList* pRangeList) const +bool ScInputWindow::UseSubTotal(ScRangeList* pRangeList) { bool bSubTotal = false; ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); @@ -2289,9 +2289,9 @@ static ScNameInputType lcl_GetInputType( const OUString& rText ) eRet = SC_NAME_INPUT_RANGE; else if ( aAddress.Parse( rText, pDoc, eConv ) & SCA_VALID ) eRet = SC_NAME_INPUT_CELL; - else if ( aRangeUtil.MakeRangeFromName( rText, pDoc, nTab, aRange, RUTL_NAMES, eConv ) ) + else if ( ScRangeUtil::MakeRangeFromName( rText, pDoc, nTab, aRange, RUTL_NAMES, eConv ) ) eRet = SC_NAME_INPUT_NAMEDRANGE; - else if ( aRangeUtil.MakeRangeFromName( rText, pDoc, nTab, aRange, RUTL_DBASE, eConv ) ) + else if ( ScRangeUtil::MakeRangeFromName( rText, pDoc, nTab, aRange, RUTL_DBASE, eConv ) ) eRet = SC_NAME_INPUT_DATABASE; else if ( comphelper::string::isdigitAsciiString( rText ) && ( nNumeric = rText.toInt32() ) > 0 && nNumeric <= MAXROW+1 ) diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 116aada89a07..a31b5280faa2 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1004,7 +1004,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) { pAppCfg->SetKeyBindingType(eNew); bSaveAppOptions = true; - pDocSh->ResetKeyBindings(eNew); + ScDocShell::ResetKeyBindings(eNew); } } @@ -1283,7 +1283,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) if ( pDoc && bCalcAll ) { - WaitObject aWait( pDocSh->GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); pDoc->CalcAll(); if ( pViewSh ) pViewSh->UpdateCharts( true ); diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 943900dfeea0..069aed3e0e39 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -351,7 +351,7 @@ void ScConditionFrmtEntry::Deselect() } -sal_Int32 ScConditionFrmtEntry::ConditionModeToEntryPos( ScConditionMode eMode ) const +sal_Int32 ScConditionFrmtEntry::ConditionModeToEntryPos( ScConditionMode eMode ) { for ( sal_Int32 i = 0; i < NUM_COND_ENTRIES; ++i ) { @@ -364,13 +364,13 @@ sal_Int32 ScConditionFrmtEntry::ConditionModeToEntryPos( ScConditionMode eMode ) return 0; } -ScConditionMode ScConditionFrmtEntry::EntryPosToConditionMode( sal_Int32 aEntryPos ) const +ScConditionMode ScConditionFrmtEntry::EntryPosToConditionMode( sal_Int32 aEntryPos ) { assert( 0 <= aEntryPos && aEntryPos < NUM_COND_ENTRIES ); return mpEntryToCond[aEntryPos]; } -sal_Int32 ScConditionFrmtEntry::GetNumberEditFields( ScConditionMode eMode ) const +sal_Int32 ScConditionFrmtEntry::GetNumberEditFields( ScConditionMode eMode ) { switch(eMode) { diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 1b84ae626154..03fb45ce8d04 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -325,15 +325,15 @@ bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd ) if ( pEd == pEdDataArea ) { - bEditOk = pRangeUtil->IsAbsArea( pEd->GetText(), pDoc, + bEditOk = ScRangeUtil::IsAbsArea( pEd->GetText(), pDoc, nTab, &theCompleteStr, NULL, NULL, eConv ); } else if ( pEd == pEdDestArea ) { OUString aPosStr; - pRangeUtil->CutPosString( pEd->GetText(), aPosStr ); - bEditOk = pRangeUtil->IsAbsPos( aPosStr, pDoc, + ScRangeUtil::CutPosString( pEd->GetText(), aPosStr ); + bEditOk = ScRangeUtil::IsAbsPos( aPosStr, pDoc, nTab, &theCompleteStr, NULL, eConv ); } @@ -374,7 +374,7 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) OUString aDestPosStr( pEdDestArea->GetText() ); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - if ( pRangeUtil->IsAbsPos( aDestPosStr, pDoc, nTab, NULL, &aDestAddress, eConv ) ) + if ( ScRangeUtil::IsAbsPos( aDestPosStr, pDoc, nTab, NULL, &aDestAddress, eConv ) ) { ScConsolidateParam theOutParam( theConsData ); ScArea** ppDataAreas = new ScArea*[nDataAreaCount]; @@ -384,7 +384,7 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) for ( i=0; i<nDataAreaCount; i++ ) { pArea = new ScArea; - pRangeUtil->MakeArea( pLbConsAreas->GetEntry( i ), + ScRangeUtil::MakeArea( pLbConsAreas->GetEntry( i ), *pArea, pDoc, nTab, eConv ); ppDataAreas[i] = pArea; } @@ -435,7 +435,7 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn ) sal_uInt16 nAreaCount = 0; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - if ( pRangeUtil->IsAbsTabArea( aNewEntry, pDoc, &ppAreas, &nAreaCount, true, eConv ) ) + if ( ScRangeUtil::IsAbsTabArea( aNewEntry, pDoc, &ppAreas, &nAreaCount, true, eConv ) ) { // IsAbsTabArea() creates an array of ScArea pointers, // which have been created dynamically as well. @@ -511,7 +511,7 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb ) OUString aString( pAreaData[nSelPos-1].aStrArea ); if ( pLb == pLbDestArea ) - pRangeUtil->CutPosString( aString, aString ); + ScRangeUtil::CutPosString( aString, aString ); pEd->SetText( aString ); diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index b859d0be9b05..1aaf8e19eddd 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -79,10 +79,10 @@ public: CSVHandler( DataStream::Line& rLine, size_t nColCount ) : mrLine(rLine), mnColCount(nColCount), mnCols(0), mpLineHead(rLine.maLine.getStr()) {} - void begin_parse() {} - void end_parse() {} - void begin_row() {} - void end_row() {} + static void begin_parse() {} + static void end_parse() {} + static void begin_row() {} + static void end_row() {} void cell(const char* p, size_t n) { diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 17b61326f4f2..95f33cf9882b 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -524,7 +524,7 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, // ausfuehren - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // Adjust aLocalParam cols/rows to used data area. Keep sticky top row or // column (depending on direction) in any case, not just if it has headers, @@ -710,7 +710,7 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, // ausfuehren - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); bool bKeepSub = false; // bestehende Teilergebnisse wiederholen? ScSubTotalParam aSubTotalParam; @@ -987,7 +987,7 @@ bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, if (rParam.bReplace) if (rDoc.TestRemoveSubTotals( nTab, rParam )) { - bOk = ( MessBox( rDocShell.GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), + bOk = ( MessBox( ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), // "StarCalc" "Daten loeschen?" ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_1 ) ).Execute() @@ -996,7 +996,7 @@ bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, if (bOk) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScDocShellModificator aModificator( rDocShell ); ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert @@ -1229,7 +1229,7 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb OSL_ASSERT(pOldObj && pNewObj && pOldObj != pNewObj); ScDocShellModificator aModificator( rDocShell ); - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScRangeList aRanges; aRanges.Append(pOldObj->GetOutRange()); @@ -1278,7 +1278,7 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb // OutRange of pOldObj (pDestObj) is still old area if (!lcl_EmptyExcept(&rDoc, aNewOut, pOldObj->GetOutRange())) { - ScopedVclPtrInstance<QueryBox> aBox( rDocShell.GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), + ScopedVclPtrInstance<QueryBox> aBox( ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), ScGlobal::GetRscString(STR_PIVOT_NOTEMPTY) ); if (aBox->Execute() == RET_NO) { @@ -1312,7 +1312,7 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb bool ScDBDocFunc::RemovePivotTable(ScDPObject& rDPObj, bool bRecord, bool bApi) { ScDocShellModificator aModificator(rDocShell); - WaitObject aWait(rDocShell.GetActiveDialogParent()); + WaitObject aWait(ScDocShell::GetActiveDialogParent()); if (!isEditable(rDocShell, rDPObj.GetOutRange(), bApi)) return false; @@ -1363,7 +1363,7 @@ bool ScDBDocFunc::RemovePivotTable(ScDPObject& rDPObj, bool bRecord, bool bApi) bool ScDBDocFunc::CreatePivotTable(const ScDPObject& rDPObj, bool bRecord, bool bApi) { ScDocShellModificator aModificator(rDocShell); - WaitObject aWait(rDocShell.GetActiveDialogParent()); + WaitObject aWait(ScDocShell::GetActiveDialogParent()); // At least one cell in the output range should be editable. Check in advance. if (!isEditable(rDocShell, ScRange(rDPObj.GetOutRange().aStart), bApi)) @@ -1431,7 +1431,7 @@ bool ScDBDocFunc::CreatePivotTable(const ScDPObject& rDPObj, bool bRecord, bool if (!bEmpty) { ScopedVclPtrInstance<QueryBox> aBox( - rDocShell.GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), + ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), ScGlobal::GetRscString(STR_PIVOT_NOTEMPTY)); if (aBox->Execute() == RET_NO) @@ -1464,7 +1464,7 @@ bool ScDBDocFunc::CreatePivotTable(const ScDPObject& rDPObj, bool bRecord, bool bool ScDBDocFunc::UpdatePivotTable(ScDPObject& rDPObj, bool bRecord, bool bApi) { ScDocShellModificator aModificator( rDocShell ); - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); if (!isEditable(rDocShell, rDPObj.GetOutRange(), bApi)) return false; @@ -1504,7 +1504,7 @@ bool ScDBDocFunc::UpdatePivotTable(ScDPObject& rDPObj, bool bRecord, bool bApi) { if (!lcl_EmptyExcept(&rDoc, aNewOut, rDPObj.GetOutRange())) { - ScopedVclPtrInstance<QueryBox> aBox( rDocShell.GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), + ScopedVclPtrInstance<QueryBox> aBox( ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), ScGlobal::GetRscString(STR_PIVOT_NOTEMPTY) ); if (aBox->Execute() == RET_NO) { @@ -1602,7 +1602,7 @@ void ScDBDocFunc::UpdateImport( const OUString& rTarget, const svx::ODataAccessD const ScDBData* pData = rDBColl.getNamedDBs().findByUpperName(ScGlobal::pCharClass->uppercase(rTarget)); if (!pData) { - ScopedVclPtrInstance<InfoBox> aInfoBox( rDocShell.GetActiveDialogParent(), + ScopedVclPtrInstance<InfoBox> aInfoBox( ScDocShell::GetActiveDialogParent(), ScGlobal::GetRscString( STR_TARGETNOTFOUND ) ); aInfoBox->Execute(); return; diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index f45baa6a6029..b7ea4ca7022e 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -137,7 +137,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } } - vcl::Window* pWaitWin = rDocShell.GetActiveDialogParent(); + vcl::Window* pWaitWin = ScDocShell::GetActiveDialogParent(); if (pWaitWin) pWaitWin->EnterWait(); ScDocShellModificator aModificator( rDocShell ); @@ -635,7 +635,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, nErrStringId = STR_MSSG_IMPORTDATA_0; aErrorMessage = ScGlobal::GetRscString( nErrStringId ); } - ScopedVclPtrInstance< InfoBox > aInfoBox( rDocShell.GetActiveDialogParent(), aErrorMessage ); + ScopedVclPtrInstance< InfoBox > aInfoBox( ScDocShell::GetActiveDialogParent(), aErrorMessage ); aInfoBox->Execute(); } diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 305ab149d229..5546bb95c875 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -373,7 +373,7 @@ bool ScDocFunc::DetectiveMarkInvalid(SCTAB nTab) bool bUndo (rDoc.IsUndoEnabled()); ScDrawLayer* pModel = rDoc.GetDrawLayer(); - vcl::Window* pWaitWin = rDocShell.GetActiveDialogParent(); + vcl::Window* pWaitWin = ScDocShell::GetActiveDialogParent(); if (pWaitWin) pWaitWin->EnterWait(); if (bUndo) @@ -1755,7 +1755,7 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, return false; } - WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference ScDocument* pRefUndoDoc = NULL; ScRefUndoData* pUndoData = NULL; @@ -2321,7 +2321,7 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, // ausfuehren - WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference ScDocument* pUndoDoc = NULL; ScDocument* pRefUndoDoc = NULL; @@ -2974,7 +2974,7 @@ void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ) bool ScDocFunc::InsertTable( SCTAB nTab, const OUString& rName, bool bRecord, bool bApi ) { bool bSuccess = false; - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScDocShellModificator aModificator( rDocShell ); @@ -3026,7 +3026,7 @@ bool ScDocFunc::InsertTable( SCTAB nTab, const OUString& rName, bool bRecord, bo bool ScDocFunc::DeleteTable( SCTAB nTab, bool bRecord, bool /* bApi */ ) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScDocShellModificator aModificator( rDocShell ); @@ -3756,7 +3756,7 @@ bool ScDocFunc::Unprotect( SCTAB nTab, const OUString& rPassword, bool bApi ) { if (!bApi) { - ScopedVclPtrInstance< InfoBox > aBox( rDocShell.GetActiveDialogParent(), OUString( ScResId( SCSTR_WRONGPASSWORD ) ) ); + ScopedVclPtrInstance< InfoBox > aBox( ScDocShell::GetActiveDialogParent(), OUString( ScResId( SCSTR_WRONGPASSWORD ) ) ); aBox->Execute(); } return false; @@ -3786,7 +3786,7 @@ bool ScDocFunc::Unprotect( SCTAB nTab, const OUString& rPassword, bool bApi ) { if (!bApi) { - ScopedVclPtrInstance< InfoBox > aBox( rDocShell.GetActiveDialogParent(), OUString( ScResId( SCSTR_WRONGPASSWORD ) ) ); + ScopedVclPtrInstance< InfoBox > aBox( ScDocShell::GetActiveDialogParent(), OUString( ScResId( SCSTR_WRONGPASSWORD ) ) ); aBox->Execute(); } return false; @@ -3951,7 +3951,7 @@ bool ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark, ScEditableTester aTester( &rDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); if ( nFormatNo < pAutoFormat->size() && aTester.IsEditable() ) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); bool bSize = pAutoFormat->findByIndex(nFormatNo)->GetIncludeWidthHeight(); @@ -4055,7 +4055,7 @@ bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark, ScEditableTester aTester( &rDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); if ( aTester.IsEditable() ) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScDocument* pUndoDoc = NULL; @@ -4142,7 +4142,7 @@ bool ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark, ScEditableTester aTester( &rDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); if ( aTester.IsEditable() ) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); rDoc.SetDirty( rRange, false ); if ( bRecord ) { @@ -4285,7 +4285,7 @@ bool ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark, ScEditableTester aTester( &rDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); if ( aTester.IsEditable() ) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScRange aSourceArea = aRange; ScRange aDestArea = aRange; @@ -4393,7 +4393,7 @@ bool ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark, ScEditableTester aTester( &rDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); if ( aTester.IsEditable() ) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScRange aSourceArea = rRange; ScRange aDestArea = rRange; @@ -4573,7 +4573,7 @@ bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e return false; } - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScDocument* pUndoDoc = NULL; if ( bRecord ) @@ -4920,7 +4920,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList, aMessage += aName; aMessage += aTemplate.getToken( 1, '#' ); - short nResult = QueryBox( rDocShell.GetActiveDialogParent(), + short nResult = QueryBox( ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO_CANCEL | WB_DEF_YES), aMessage ).Execute(); if ( nResult == RET_YES ) diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index b97bf8675e89..2bb995f36829 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -1091,7 +1091,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck ScChangeAction* pAct = pThisTrack->GetLast(); if ( pAct && pAct->GetActionNumber() > nOldActionMax ) { - pThisTrack->MergeActionState( pAct, pSourceAction ); + ScChangeTrack::MergeActionState( pAct, pSourceAction ); } } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 515ed542a921..994c51fda678 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1194,7 +1194,7 @@ void ScDocShell::DoRecalc( bool bApi ) } else { - pSh->UpdateInputLine(); // InputEnterHandler + ScTabView::UpdateInputLine(); // InputEnterHandler pSh->UpdateInputHandler(); } } @@ -1225,7 +1225,7 @@ void ScDocShell::DoHardRecalc( bool /* bApi */ ) ScTabViewShell* pSh = GetBestViewShell(); if ( pSh ) { - pSh->UpdateInputLine(); // InputEnterHandler + ScTabView::UpdateInputLine(); // InputEnterHandler pSh->UpdateInputHandler(); } aDocument.CalcAll(); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 74e1e3251153..85bcad965b24 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -3018,9 +3018,7 @@ void ScExternalRefManager::Notify( SfxBroadcaster&, const SfxHint& rHint ) { case SFX_EVENT_PREPARECLOSEDOC: { - SfxObjectShell* pObjShell = static_cast<const SfxEventHint&>( rHint ).GetObjShell(); - ScDocShell* pDocShell = static_cast< ScDocShell* >( pObjShell ); - ScopedVclPtrInstance<WarningBox> aBox( pDocShell->GetActiveDialogParent(), WinBits( WB_OK ), + ScopedVclPtrInstance<WarningBox> aBox( ScDocShell::GetActiveDialogParent(), WinBits( WB_OK ), ScGlobal::GetRscString( STR_CLOSE_WITH_UNSAVED_REFS ) ); aBox->Execute(); } diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index e11b6be89f79..6e75c9bacc0d 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1452,7 +1452,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) if ( !mbApi && nStartCol != nEndCol && !pDoc->IsBlockEmpty( nTab, nStartCol + 1, nStartRow, nEndCol, nRow ) ) { - ScopedVclPtrInstance< ScReplaceWarnBox > aBox( pDocSh->GetActiveDialogParent() ); + ScopedVclPtrInstance< ScReplaceWarnBox > aBox( ScDocShell::GetActiveDialogParent() ); if ( aBox->Execute() != RET_YES ) { return false; diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index e9f160fb13f8..0e216a34fa1f 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -107,9 +107,9 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, pInputHdl->NotifyChange( NULL ); ScFormulaReferenceHelper::enableInput( false ); - m_aHelper.EnableSpreadsheets(); + ScFormulaReferenceHelper::EnableSpreadsheets(); m_aHelper.Init(); - m_aHelper.SetDispatcherLock( true ); + ScFormulaReferenceHelper::SetDispatcherLock( true ); notifyChange(); fill(); @@ -495,7 +495,7 @@ void ScFormulaDlg::HideReference( bool bDoneRefMode ) } void ScFormulaDlg::ViewShellChanged() { - m_aHelper.ViewShellChanged(); + ScFormulaReferenceHelper::ViewShellChanged(); } void ScFormulaDlg::AddRefEntry( ) { @@ -525,7 +525,7 @@ void ScFormulaDlg::dispatch(bool _bOK, bool _bMatrixChecked) if ( aStrItem.GetValue().isEmpty() ) aRetItem.SetValue( false ); // sal_False = Cancel - m_aHelper.SetDispatcherLock( false ); // turn off modal-mode + ScFormulaReferenceHelper::SetDispatcherLock( false ); // turn off modal-mode clear(); @@ -535,7 +535,7 @@ void ScFormulaDlg::dispatch(bool _bOK, bool _bMatrixChecked) } void ScFormulaDlg::setDispatcherLock( bool bLock ) { - m_aHelper.SetDispatcherLock( bLock ); + ScFormulaReferenceHelper::SetDispatcherLock( bLock ); } void ScFormulaDlg::setReferenceInput(const formula::FormEditData* _pData) { diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 75bd457b4ad0..d5206a5fc60a 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -169,7 +169,7 @@ private: ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); bool IsSelected(); - ScDocument* GetDocument(ScTabViewShell* mpViewShell); + static ScDocument* GetDocument(ScTabViewShell* mpViewShell); ::std::unique_ptr< SvxEditSource > CreateEditSource(ScTabViewShell* pViewShell, ScAddress aCell, ScSplitPos eSplitPos); diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index a8f3180b3090..a181c241c276 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -109,7 +109,7 @@ protected: ScCsvControl& implGetControl() const; /** Returns the first child of rxParentObj, which has the role nRole. */ - XAccessibleRef implGetChildByRole( const XAccessibleRef& rxParentObj, sal_uInt16 nRole ) + static XAccessibleRef implGetChildByRole( const XAccessibleRef& rxParentObj, sal_uInt16 nRole ) throw( ::com::sun::star::uno::RuntimeException ); /** Creates a StateSetHelper and fills it with DEFUNC, OPAQUE, ENABLED, SHOWING and VISIBLE. */ ::utl::AccessibleStateSetHelper* implCreateStateSet(); diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index 0d47e004205c..154aaa11eafe 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -312,7 +312,7 @@ private: void RemoveChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, bool bFireEvent); OUString GetCurrentCellName() const; - OUString GetCurrentCellDescription() const; + static OUString GetCurrentCellDescription(); Rectangle GetVisibleArea_Impl() const; com::sun::star::uno::Sequence< com::sun::star::uno::Any > GetScAccFlowToSequence(); diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index b74360f5c743..3bc2d3c43772 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -291,8 +291,8 @@ private: void CreateSortedMarkedCells(); void AddMarkedRange(const ScRange& rRange); - ScDocument* GetDocument(ScTabViewShell* pViewShell); - Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos); + static ScDocument* GetDocument(ScTabViewShell* pViewShell); + static Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos); Rectangle GetVisCells(const Rectangle& rVisArea); typedef std::vector<ScMyAddress> VEC_MYADDR; @@ -339,8 +339,8 @@ public: bool IsScAddrFormulaSel (const ScAddress &addr) const; bool IsFormulaMode(); ScMyAddress CalcScAddressFromRangeList(ScRangeList *pMarkedRanges,sal_Int32 nSelectedChildIndex); - bool CalcScRangeDifferenceMax(ScRange *pSrc,ScRange *pDest,int nMax,VEC_MYADDR &vecRet,int &nSize); - bool CalcScRangeListDifferenceMax(ScRangeList *pSrc,ScRangeList *pDest,int nMax,VEC_MYADDR &vecRet); + static bool CalcScRangeDifferenceMax(ScRange *pSrc,ScRange *pDest,int nMax,VEC_MYADDR &vecRet,int &nSize); + static bool CalcScRangeListDifferenceMax(ScRangeList *pSrc,ScRangeList *pDest,int nMax,VEC_MYADDR &vecRet); }; #endif diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 2d4601b6c92b..649e79e17261 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -105,7 +105,7 @@ private: ScAccessibleCell* mpAccessibleCell; using ScAccessibleCellBaseTextData::GetDocShell; - ScDocShell* GetDocShell(ScTabViewShell* pViewShell); + static ScDocShell* GetDocShell(ScTabViewShell* pViewShell); }; class ScAccessibleEditObjectTextData : public ScAccessibleTextData @@ -179,7 +179,7 @@ private: ScPreviewShell* mpViewShell; using ScAccessibleCellBaseTextData::GetDocShell; - ScDocShell* GetDocShell(ScPreviewShell* pViewShell); + static ScDocShell* GetDocShell(ScPreviewShell* pViewShell); }; class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextData @@ -205,7 +205,7 @@ private: bool mbRowHeader; using ScAccessibleCellBaseTextData::GetDocShell; - ScDocShell* GetDocShell(ScPreviewShell* pViewShell); + static ScDocShell* GetDocShell(ScPreviewShell* pViewShell); }; class ScAccessibleHeaderTextData : public ScAccessibleTextData diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index 0b1d068149aa..3a5d75bab737 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -42,7 +42,7 @@ private: AnovaFactor meFactor; - void RowColumn(ScRangeList& rRangeList, AddressWalkerWriter& aOutput, + static void RowColumn(ScRangeList& rRangeList, AddressWalkerWriter& aOutput, FormulaTemplate& aTemplate, OUString& sFormula, GroupedBy aGroupedBy, ScRange* pResultRange); diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 833b541709dc..0c2363a0b5a1 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -89,9 +89,9 @@ public: inline void SetWindow(vcl::Window* _pWindow) { m_pWindow = _pWindow; } bool DoClose( sal_uInt16 nId ); - void SetDispatcherLock( bool bLock ); - void EnableSpreadsheets( bool bFlag = true, bool bChildren = true ); - void ViewShellChanged(); + static void SetDispatcherLock( bool bLock ); + static void EnableSpreadsheets( bool bFlag = true, bool bChildren = true ); + static void ViewShellChanged(); static void enableInput(bool _bInput); @@ -99,7 +99,7 @@ protected: vcl::Window* GetWindow(){ return m_pWindow; } public: - bool CanInputStart( const formula::RefEdit *pEdit ){ return !!pEdit; } + static bool CanInputStart( const formula::RefEdit *pEdit ){ return !!pEdit; } bool CanInputDone( bool bForced ){ return pRefEdit && (bForced || !pRefBtn); } }; @@ -129,7 +129,7 @@ private: protected: bool DoClose( sal_uInt16 nId ); - void SetDispatcherLock( bool bLock ); + static void SetDispatcherLock( bool bLock ); virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; @@ -166,7 +166,7 @@ public: public: bool EnterRefMode(); bool LeaveRefMode(); - inline bool CanInputStart( const formula::RefEdit *pEdit ); + static inline bool CanInputStart( const formula::RefEdit *pEdit ); inline bool CanInputDone( bool bForced ); }; @@ -310,7 +310,7 @@ struct ScAnyRefDlg : ::ScRefHdlrImpl< ScAnyRefDlg, SfxModelessDialog> inline bool ScRefHandler::CanInputStart( const formula::RefEdit *pEdit ) { - return m_aHelper.CanInputStart( pEdit ); + return ScFormulaReferenceHelper::CanInputStart( pEdit ); } inline bool ScRefHandler::CanInputDone( bool bForced ) diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index 2318cf86acc5..3beb0784296a 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.hxx @@ -104,7 +104,7 @@ public: void ExecutePage( SfxRequest& rReq ); void ExecutePageSel( SfxRequest& rReq ); void ExecuteMove( SfxRequest& rReq ); - void GetStateCursor( SfxItemSet& rSet ); + static void GetStateCursor( SfxItemSet& rSet ); }; #endif diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index e0d1e8cb187f..22ddf7ddeea1 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -108,11 +108,11 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener DECL_LINK( OnEdChanged, Edit* ); // Searches the lookup table for the entry position, given condition mode - sal_Int32 ConditionModeToEntryPos( ScConditionMode eMode ) const; + static sal_Int32 ConditionModeToEntryPos( ScConditionMode eMode ); // Accesses the lookup table for the condition mode, given entry position - ScConditionMode EntryPosToConditionMode( sal_Int32 aEntryPos ) const; + static ScConditionMode EntryPosToConditionMode( sal_Int32 aEntryPos ); // Returns the number of edit fields used for a given condition mode - sal_Int32 GetNumberEditFields( ScConditionMode eMode ) const; + static sal_Int32 GetNumberEditFields( ScConditionMode eMode ); protected: virtual void Select() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 3c429d11a021..229c12055b42 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -145,7 +145,7 @@ private: OUString GetActionString( const ScChangeAction* pAction, ScDocument* pDoc ); void HandleListBoxSelection( bool bSelectHandle ); - void SetConflictAction( SvTreeListEntry* pRootEntry, ScConflictAction eConflictAction ); + static void SetConflictAction( SvTreeListEntry* pRootEntry, ScConflictAction eConflictAction ); void KeepHandler( bool bMine ); void KeepAllHandler( bool bMine ); diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index c71f7e979927..0c09811eb3dd 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -97,8 +97,8 @@ private: DECL_LINK( ModifyHdl, formula::RefEdit* ); DECL_LINK( SelectHdl, ListBox* ); - ScSubTotalFunc LbPosToFunc( sal_uInt16 nPos ); - sal_uInt16 FuncToLbPos( ScSubTotalFunc eFunc ); + static ScSubTotalFunc LbPosToFunc( sal_uInt16 nPos ); + static sal_uInt16 FuncToLbPos( ScSubTotalFunc eFunc ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_CONSDLG_HXX diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index f0c8be5e8374..f103f12c4de0 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -245,7 +245,7 @@ public: void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt ); void GetSbxState( SfxItemSet &rSet ); - void GetDrawObjState( SfxItemSet &rSet ); + static void GetDrawObjState( SfxItemSet &rSet ); void Execute( SfxRequest& rReq ); void GetState( SfxItemSet &rSet ); @@ -276,7 +276,7 @@ public: void NotifyStyle( const SfxStyleSheetHint& rHint ); void DoAutoStyle( const ScRange& rRange, const OUString& rStyle ); - vcl::Window* GetActiveDialogParent(); + static vcl::Window* GetActiveDialogParent(); void ErrorMessage( sal_uInt16 nGlobStrId ); bool IsEditable() const; @@ -419,7 +419,7 @@ public: void SetSolverSaveData( const ScOptSolverSave& rData ); ScSheetSaveData* GetSheetSaveData(); - void ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ); + static void ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ); // password protection for Calc (derived from SfxObjectShell) // see also: FID_CHG_RECORD, SID_CHG_PROTECT diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 3f12fe64bb86..ec203b227a52 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -59,7 +59,7 @@ public: ScDrawShell(ScViewData* pData); virtual ~ScDrawShell(); - void StateDisableItems( SfxItemSet &rSet ); + static void StateDisableItems( SfxItemSet &rSet ); void ExecDrawAttr(SfxRequest& rReq); void GetDrawAttrState(SfxItemSet &rSet); @@ -85,7 +85,7 @@ public: ScDrawView* GetDrawView(); - bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark); + static bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark); void GetDrawAttrStateForIFBX( SfxItemSet& rSet ); ::rtl::OUString GetSidebarContextName(); diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx index 65dbeadfe3a3..16c718c0b32c 100644 --- a/sc/source/ui/inc/drtxtob.hxx +++ b/sc/source/ui/inc/drtxtob.hxx @@ -52,7 +52,7 @@ public: ScDrawTextObjectBar(ScViewData* pData); virtual ~ScDrawTextObjectBar(); - void StateDisableItems( SfxItemSet &rSet ); + static void StateDisableItems( SfxItemSet &rSet ); void Execute( SfxRequest &rReq ); void ExecuteTrans( SfxRequest& rReq ); @@ -73,7 +73,7 @@ public: private: void ExecuteGlobal( SfxRequest &rReq ); // called by Execute for all objects - void GetGlobalClipState( SfxItemSet& rSet ); + static void GetGlobalClipState( SfxItemSet& rSet ); void ExecutePasteContents( SfxRequest &rReq ); bool IsNoteEdit(); }; diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index b525b189c18f..0f069f8d435c 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -102,10 +102,10 @@ public: protected: virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; - void SaveLRUEntry(const ScFuncDesc* pFuncDesc); + static void SaveLRUEntry(const ScFuncDesc* pFuncDesc); - bool IsInputHdl(ScInputHandler* pHdl); - ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh); + static bool IsInputHdl(ScInputHandler* pHdl); + static ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FORMULA_HXX diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index e38ca5c08f74..d6edc1c4c73b 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -100,7 +100,7 @@ public: virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); protected: - void ImpForceQuadratic(Rectangle& rRect); + static void ImpForceQuadratic(Rectangle& rRect); public: // #i33136# diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index e311e15f8141..3aca0c89fefd 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -142,7 +142,7 @@ public: bool ImportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId=SotClipboardFormatId::STRING ); bool ExportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId=SotClipboardFormatId::STRING ); - bool ImportData( const OUString& rMimeType, + static bool ImportData( const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ); bool ExportData( const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ); diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index dfad789dcf40..e5820b8ed39d 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -134,7 +134,7 @@ private: bool StartTable( sal_Unicode cTyped, bool bFromCommand, bool bInputActivated ); void RemoveSelection(); void UpdateFormulaMode(); - void InvalidateAttribs(); + static void InvalidateAttribs(); void ImplCreateEditEngine(); DECL_LINK( DelayTimer, Timer* ); void GetColData(); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index bd1650a3e877..aba78346df6b 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -285,7 +285,7 @@ protected: virtual void SetText( const OUString& rString ) SAL_OVERRIDE; virtual OUString GetText() const SAL_OVERRIDE; - bool UseSubTotal( ScRangeList* pRangeList ) const; + static bool UseSubTotal( ScRangeList* pRangeList ); bool IsPointerAtResizePos(); private: VclPtr<ScPosWnd> aWndPos; diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index f87e3dd99519..f9827f8dc63c 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -56,7 +56,7 @@ private: InitListener* mpInitListener; - void GetLine(ScRangeNameLine& aLine, SvTreeListEntry* pEntry); + static void GetLine(ScRangeNameLine& aLine, SvTreeListEntry* pEntry); void Init(); void CheckForFormulaString(); const ScRangeData* findRangeData(const ScRangeNameLine& rLine); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index a7d801741c0c..cb23e7ab61b9 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -140,9 +140,9 @@ private: void EvalText (); void ExecuteCol (); - SCCOL AlphaToNum ( OUString& rStr ); - SCCOL NumStrToAlpha ( OUString& rStr ); - SCCOL NumToAlpha ( SCCOL nColNo, OUString& rStr ); + static SCCOL AlphaToNum ( OUString& rStr ); + static SCCOL NumStrToAlpha ( OUString& rStr ); + static SCCOL NumToAlpha ( SCCOL nColNo, OUString& rStr ); }; // class RowEdit @@ -272,8 +272,8 @@ private: void SetCurrentObject( const OUString& rName ); void SetCurrentDoc( const OUString& rDocName ); - ScTabViewShell* GetTabViewShell() const; - ScNavigatorSettings* GetNavigatorSettings(); + static ScTabViewShell* GetTabViewShell(); + static ScNavigatorSettings* GetNavigatorSettings(); bool GetViewData(); void UpdateColumn ( const SCCOL* pCol = NULL ); diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index a5f25ec50955..fa0cc5dfc913 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -95,8 +95,8 @@ private: void RemoveFromDefinedList(); void SetSelectDefinedList(); bool IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj); - bool IsDateEntry(EditTextObject* pTextObj); - bool IsExtFileNameEntry(EditTextObject* pTextObj); + static bool IsDateEntry(EditTextObject* pTextObj); + static bool IsExtFileNameEntry(EditTextObject* pTextObj); DECL_LINK( ListHdl_Impl, ListBox* ); DECL_LINK( ClickHdl, PushButton* ); DECL_LINK( MenuHdl, ScExtIButton* ); diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 98109e1cf086..7b00360bcfd1 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -304,7 +304,7 @@ public: void UpdateDrawTextOutliner(); void DigitLanguageChanged(); - void UpdateInputLine(); + static void UpdateInputLine(); void InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType, bool bPaint = true ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index c06fdf2a44d9..4bc50e5ed59a 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -278,7 +278,7 @@ public: void GetImageMapState( SfxItemSet& rSet ); void ExecTbx( SfxRequest& rReq ); - void GetTbxState( SfxItemSet& rSet ); + static void GetTbxState( SfxItemSet& rSet ); void ExecuteSave( SfxRequest& rReq ); void GetSaveState( SfxItemSet& rSet ); @@ -287,8 +287,8 @@ public: void ExecuteUndo(SfxRequest& rReq); void GetUndoState(SfxItemSet &rSet); - void ExecuteSbx( SfxRequest& rReq ); - void GetSbxState( SfxItemSet& rSet ); + static void ExecuteSbx( SfxRequest& rReq ); + static void GetSbxState( SfxItemSet& rSet ); void ExecuteObject(SfxRequest& rReq); void GetObjectState(SfxItemSet &rSet); @@ -382,11 +382,11 @@ public: void ForceMove() { Move(); } - SvxNumberInfoItem* MakeNumberInfoItem( ScDocument* pDoc, ScViewData* pViewData ); + static SvxNumberInfoItem* MakeNumberInfoItem( ScDocument* pDoc, ScViewData* pViewData ); - void UpdateNumberFormatter ( const SvxNumberInfoItem& rInfoItem ); + static void UpdateNumberFormatter( const SvxNumberInfoItem& rInfoItem ); - void ExecuteCellFormatDlg ( SfxRequest& rReq, const OString &rTabPage = OString()); + void ExecuteCellFormatDlg( SfxRequest& rReq, const OString &rTabPage = OString()); bool GetFunction( OUString& rFuncStr, sal_uInt16 nErrCode = 0 ); diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index ecc8e0305483..a54536c11f79 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -65,8 +65,8 @@ protected: private: void Init (); void FillListBoxes (); - ScSubTotalFunc LbPosToFunc ( sal_uInt16 nPos ); - sal_uInt16 FuncToLbPos ( ScSubTotalFunc eFunc ); + static ScSubTotalFunc LbPosToFunc ( sal_uInt16 nPos ); + static sal_uInt16 FuncToLbPos ( ScSubTotalFunc eFunc ); sal_uInt16 GetFieldSelPos ( SCCOL nField ); // Handler ------------------------ diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 682fc0c3421f..a0c8663df0d9 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -85,7 +85,7 @@ private: void Init (); size_t UpdateUserListBox (); void UpdateEntries ( size_t nList ); - void MakeListStr ( OUString& rListStr ); + static void MakeListStr ( OUString& rListStr ); void AddNewList ( const OUString& rEntriesStr ); void RemoveList ( size_t nList ); void ModifyList ( size_t nSelList, diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index c768dbcfc393..2e696f189014 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -340,7 +340,7 @@ public: void UpdateSelectionArea( const ScMarkData& rSel, ScPatternAttr* pAttr = NULL ); // Internal helper functions protected: - void UpdateLineAttrs( ::editeng::SvxBorderLine& rLine, + static void UpdateLineAttrs( ::editeng::SvxBorderLine& rLine, const ::editeng::SvxBorderLine* pDestLine, const ::editeng::SvxBorderLine* pSrcLine, bool bColor ); diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index d2084b4b79e6..6ea1343fc242 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -165,7 +165,7 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const OUStr aRange.aEnd.SetTab( aRange.aStart.Tab() ); rRanges.Append( aRange ); } - else if ( aRangeUtil.MakeRangeFromName( aRangeStr, pDoc, nRefTab, aRange, RUTL_NAMES, aDetails ) ) + else if ( ScRangeUtil::MakeRangeFromName( aRangeStr, pDoc, nRefTab, aRange, RUTL_NAMES, aDetails ) ) rRanges.Append( aRange ); else bError = true; @@ -812,11 +812,11 @@ bool ScRefHandler::EnterRefMode() ScFormulaReferenceHelper::enableInput( false ); - m_aHelper.EnableSpreadsheets(); + ScFormulaReferenceHelper::EnableSpreadsheets(); m_aHelper.Init(); - m_aHelper.SetDispatcherLock( true ); + ScFormulaReferenceHelper::SetDispatcherLock( true ); return m_bInRefMode = true; } @@ -898,12 +898,12 @@ bool ScRefHandler::DoClose( sal_uInt16 nId ) void ScRefHandler::SetDispatcherLock( bool bLock ) { - m_aHelper.SetDispatcherLock( bLock ); + ScFormulaReferenceHelper::SetDispatcherLock( bLock ); } void ScRefHandler::ViewShellChanged() { - m_aHelper.ViewShellChanged(); + ScFormulaReferenceHelper::ViewShellChanged(); } void ScRefHandler::AddRefEntry() @@ -952,14 +952,14 @@ void ScRefHandler::stateChanged(const StateChangedType nStateChange, const bool if(m_rWindow->IsVisible()) { ScFormulaReferenceHelper::enableInput( false ); - m_aHelper.EnableSpreadsheets(); - m_aHelper.SetDispatcherLock( true ); + ScFormulaReferenceHelper::EnableSpreadsheets(); + ScFormulaReferenceHelper::SetDispatcherLock( true ); aIdle.Start(); } else { ScFormulaReferenceHelper::enableInput( true ); - m_aHelper.SetDispatcherLock( false ); /*//! here and in DoClose ?*/ + ScFormulaReferenceHelper::SetDispatcherLock( false ); /*//! here and in DoClose ?*/ } } } diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 8bc45a74e074..361c92b5937b 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -834,7 +834,7 @@ bool ScOptSolverDlg::ParseRef( ScRange& rRange, const OUString& rInput, bool bAl rRange.aEnd.SetTab( rRange.aStart.Tab() ); return ( bAllowRange || rRange.aStart == rRange.aEnd ); } - else if ( aRangeUtil.MakeRangeFromName( rInput, &mrDoc, mnCurTab, rRange, RUTL_NAMES, aDetails ) ) + else if ( ScRangeUtil::MakeRangeFromName( rInput, &mrDoc, mnCurTab, rRange, RUTL_NAMES, aDetails ) ) return ( bAllowRange || rRange.aStart == rRange.aEnd ); return false; // not recognized diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 58f875a0d97f..4b8149cf555d 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -495,7 +495,7 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt ) ScTabViewShell* pScTabViewShell = NULL; ScDrawView* pScDrawView = NULL; if (pScNavigatorDlg!=NULL) - pScTabViewShell=pScNavigatorDlg->GetTabViewShell(); + pScTabViewShell = ScNavigatorDlg::GetTabViewShell(); if(pScTabViewShell !=NULL) pScDrawView =pScTabViewShell->GetViewData().GetScDrawView(); if(pScDrawView!=NULL) @@ -981,7 +981,7 @@ void ScContentTree::GetDrawNames( sal_uInt16 nType ) if(pWindow) pScNavigatorDlg = static_cast<ScNavigatorDlg*>(pWindow); if (pScNavigatorDlg!=NULL) - pScTabViewShell=pScNavigatorDlg->GetTabViewShell(); + pScTabViewShell = ScNavigatorDlg::GetTabViewShell(); if(pScTabViewShell !=NULL) pScDrawView =pScTabViewShell->GetViewData().GetScDrawView(); if(pScDrawView!=NULL) @@ -1623,7 +1623,7 @@ void ScContentTree::SelectDoc(const OUString& rName) // rName wie im Menue/ void ScContentTree::ApplySettings() { - const ScNavigatorSettings* pSettings = pParentWindow->GetNavigatorSettings(); + const ScNavigatorSettings* pSettings = ScNavigatorDlg::GetNavigatorSettings(); if( pSettings ) { sal_uInt16 nRootSel = pSettings->GetRootSelected(); @@ -1658,7 +1658,7 @@ void ScContentTree::ApplySettings() void ScContentTree::StoreSettings() const { - ScNavigatorSettings* pSettings = pParentWindow->GetNavigatorSettings(); + ScNavigatorSettings* pSettings = ScNavigatorDlg::GetNavigatorSettings(); if( pSettings ) { for( sal_uInt16 nEntry = 1; nEntry < SC_CONTENT_COUNT; ++nEntry ) diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 298359111626..02fc9c1a8ac7 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -992,7 +992,7 @@ void ScNavigatorDlg::SetCurrentDoc( const OUString& rDocName ) // activat &aDocItem, 0L ); } -ScTabViewShell* ScNavigatorDlg::GetTabViewShell() const +ScTabViewShell* ScNavigatorDlg::GetTabViewShell() { return PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); } diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index fc96ec7aca05..fa1611d17310 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -669,7 +669,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) if ( !theAreaStr.isEmpty() ) { - bAreaOk = pRangeUtil->IsAbsArea( theAreaStr, + bAreaOk = ScRangeUtil::IsAbsArea( theAreaStr, pDoc, pViewData->GetTabNo(), &theAreaStr, @@ -678,7 +678,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) pDoc->GetAddressConvention() ); if ( !bAreaOk ) { - bAreaOk = pRangeUtil->IsAbsPos( theAreaStr, + bAreaOk = ScRangeUtil::IsAbsPos( theAreaStr, pDoc, pViewData->GetTabNo(), &theAreaStr, diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index dab38a72a3ef..9296c25d4936 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -99,7 +99,7 @@ private: DECL_LINK( ClickStackHdl, void * ); void Initialize(); - void FormatDegrees(double& dTmp); + static void FormatDegrees(double& dTmp); }; } } // end of namespace ::sc::sidebar diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index fbf3d5a251a5..2154466e9732 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -280,7 +280,7 @@ void ScUndoInsertCells::Undo() if ( pPasteUndo ) pPasteUndo->Undo(); // undo paste first - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important due to TrackFormulas in UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // important due to TrackFormulas in UpdateReference BeginUndo(); DoChange( true ); EndUndo(); @@ -292,7 +292,7 @@ void ScUndoInsertCells::Undo() void ScUndoInsertCells::Redo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important due to TrackFormulas in UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // important due to TrackFormulas in UpdateReference BeginRedo(); DoChange( false ); EndRedo(); @@ -511,7 +511,7 @@ void ScUndoDeleteCells::DoChange( const bool bUndo ) void ScUndoDeleteCells::Undo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference BeginUndo(); DoChange( true ); EndUndo(); @@ -534,7 +534,7 @@ void ScUndoDeleteCells::Undo() void ScUndoDeleteCells::Redo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference BeginRedo(); DoChange( false); EndRedo(); @@ -658,7 +658,7 @@ void ScUndoDeleteMulti::SetChangeTrack() void ScUndoDeleteMulti::Undo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference BeginUndo(); ScDocument& rDoc = pDocShell->GetDocument(); @@ -702,7 +702,7 @@ void ScUndoDeleteMulti::Undo() void ScUndoDeleteMulti::Redo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference BeginRedo(); ScDocument& rDoc = pDocShell->GetDocument(); diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index f3b1634ae21b..f387534cc952 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -511,7 +511,7 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds( aNewOpts.SetLRUFuncList(pFuncs.get(), nCount); pScMod->SetAppOptions(aNewOpts); - pScMod->RecentFunctionsChanged(); // update function list child window + ScModule::RecentFunctionsChanged(); // update function list child window } sal_Int32 SAL_CALL ScRecentFunctionsObj::getMaxRecentFunctions() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index ddcced241548..1201939eafbb 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -4991,8 +4991,8 @@ uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName( else { ScRangeUtil aRangeUtil; - if ( aRangeUtil.MakeRangeFromName( aString, &rDoc, nTab, aCellRange, RUTL_NAMES ) || - aRangeUtil.MakeRangeFromName( aString, &rDoc, nTab, aCellRange, RUTL_DBASE ) ) + if ( ScRangeUtil::MakeRangeFromName( aString, &rDoc, nTab, aCellRange, RUTL_NAMES ) || + ScRangeUtil::MakeRangeFromName( aString, &rDoc, nTab, aCellRange, RUTL_DBASE ) ) bFound = true; } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index be94fd2463c2..72b19665bd0a 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -936,7 +936,7 @@ public: } private: - bool splitRangeToken(const ScTokenRef& pToken, ScTokenRef& rStart, ScTokenRef& rEnd) const + static bool splitRangeToken(const ScTokenRef& pToken, ScTokenRef& rStart, ScTokenRef& rEnd) { ScComplexRefData aData; bool bIsRefToken = ScRefTokenHelper::getDoubleRefDataFromToken(aData, pToken); @@ -969,7 +969,7 @@ private: return true; } - void setRelative(ScSingleRefData& rData) const + static void setRelative(ScSingleRefData& rData) { rData.SetColRel(true); rData.SetRowRel(true); diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 226f9fe3feea..10dc39106a11 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -69,7 +69,7 @@ static SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, SCTAB nTab, const OU SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->GetObjIdentifier() == OBJ_OLE2 && rDoc.IsChart(pObject) ) + if ( pObject->GetObjIdentifier() == OBJ_OLE2 && ScDocument::IsChart(pObject) ) { uno::Reference < embed::XEmbeddedObject > xObj = static_cast<SdrOle2Obj*>(pObject)->GetObjRef(); if ( xObj.is() ) @@ -131,7 +131,7 @@ ScChartObj* ScChartsObj::GetObjectByIndex_Impl(long nIndex) const SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->GetObjIdentifier() == OBJ_OLE2 && rDoc.IsChart(pObject) ) + if ( pObject->GetObjIdentifier() == OBJ_OLE2 && ScDocument::IsChart(pObject) ) { if ( nPos == nIndex ) { @@ -343,7 +343,7 @@ sal_Int32 SAL_CALL ScChartsObj::getCount() throw(uno::RuntimeException, std::exc SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->GetObjIdentifier() == OBJ_OLE2 && rDoc.IsChart(pObject) ) + if ( pObject->GetObjIdentifier() == OBJ_OLE2 && ScDocument::IsChart(pObject) ) ++nCount; pObject = aIter.Next(); } @@ -412,7 +412,7 @@ uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno::Runti SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->GetObjIdentifier() == OBJ_OLE2 && rDoc.IsChart(pObject) ) + if ( pObject->GetObjIdentifier() == OBJ_OLE2 && ScDocument::IsChart(pObject) ) { OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = static_cast<SdrOle2Obj*>(pObject)->GetObjRef(); diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index f2978b0caced..fccb164a672f 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -2211,7 +2211,7 @@ void ScDataPilotFieldObj::setSubtotals( const Sequence< GeneralFunction >& rSubt } } -OUString ScDataPilotFieldObj::getCurrentPage() const +OUString ScDataPilotFieldObj::getCurrentPage() { return OUString(); } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 48266e7594fb..73f674effbc1 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -999,8 +999,8 @@ static bool lcl_ParseTarget( const OUString& rTarget, ScRange& rTargetRange, Rec rTargetRange = aAddress; bRangeValid = true; // cell reference } - else if ( aRangeUtil.MakeRangeFromName( rTarget, pDoc, nSourceTab, rTargetRange, RUTL_NAMES ) || - aRangeUtil.MakeRangeFromName( rTarget, pDoc, nSourceTab, rTargetRange, RUTL_DBASE ) ) + else if ( ScRangeUtil::MakeRangeFromName( rTarget, pDoc, nSourceTab, rTargetRange, RUTL_NAMES ) || + ScRangeUtil::MakeRangeFromName( rTarget, pDoc, nSourceTab, rTargetRange, RUTL_DBASE ) ) { bRangeValid = true; // named range or database range } @@ -1778,7 +1778,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal( aResult.Divergence = DBL_MAX; // nichts gefunden if (pDocShell) { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); OUString aGoalString(aGoalValue); ScDocument& rDoc = pDocShell->GetDocument(); double fValue = 0.0; diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index a4b345d1a90b..da36330cb404 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -114,12 +114,12 @@ private: return xProps; } - bool getReplaceCellsWarning() throw ( uno::RuntimeException ) + static bool getReplaceCellsWarning() throw ( uno::RuntimeException ) { return getGlobalSheetSettings()->getReplaceCellsWarning(); } - void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException ) + static void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException ) { getGlobalSheetSettings()->setReplaceCellsWarning( bState ); } diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index 62cd53c85546..02b79e909a0d 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -50,7 +50,7 @@ friend class ScVbaAxis; css::uno::Reference< css::chart::XTwoAxisXSupplier > xTwoAxisXSupplier; css::uno::Reference< css::chart::XTwoAxisYSupplier > xTwoAxisYSupplier; - css::uno::Sequence< OUString > getDefaultSeriesDescriptions( sal_Int32 nCount ); + static css::uno::Sequence< OUString > getDefaultSeriesDescriptions( sal_Int32 nCount ); css::uno::Sequence< css::uno::Sequence< double > > dblValues; void setDefaultChartType()throw ( css::script::BasicErrorException ) ; void setDiagram( const OUString& _sDiagramType) throw( css::script::BasicErrorException ); diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 1098d5e8da86..f300761c1b51 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -112,13 +112,13 @@ ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1) throw ( script::B { // getA1Formula *SHOULD* detect whether the formula is r1c1 or A1 syntax // and if R1C1 convert to A1 - ScVbaFormatCondition_BASE::setFormula1( uno::makeAny( lcl_getScVbaFormatConditionsPtr( moFormatConditions )->getA1Formula(_aFormula1) ) ); + ScVbaFormatCondition_BASE::setFormula1( uno::makeAny( ScVbaFormatConditions::getA1Formula(_aFormula1) ) ); } void ScVbaFormatCondition::setFormula2( const uno::Any& _aFormula2) throw ( script::BasicErrorException ) { - ScVbaFormatCondition_BASE::setFormula1( uno::makeAny( lcl_getScVbaFormatConditionsPtr( moFormatConditions )->getA1Formula(_aFormula2)) ); + ScVbaFormatCondition_BASE::setFormula1( uno::makeAny( ScVbaFormatConditions::getA1Formula(_aFormula2)) ); } ::sal_Int32 SAL_CALL diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index 446453d18a40..d8dfef49250d 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.hxx @@ -52,7 +52,7 @@ class ScVbaFormatConditions: public ScVbaFormatConditions_BASE public: void notifyRange() throw ( css::script::BasicErrorException ); css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); + static OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); OUString getStyleName(); void removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle) throw ( css::script::BasicErrorException ); css::uno::Reference< css::sheet::XSheetConditionalEntries > getSheetConditionalEntries() const { return mxSheetConditionalEntries; } diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 8647f9505b65..aa2fe734748b 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -241,7 +241,7 @@ ScVbaInterior::GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 GetMixedColorComp( rFore.GetBlue(), rBack.GetBlue(), nTrans )); } sal_uInt8 -ScVbaInterior::GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans ) const +ScVbaInterior::GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans ) { sal_uInt32 nTemp = ((static_cast< sal_Int32 >( nBack ) - nFore) * nTrans) / 0x80 + nFore; return static_cast< sal_uInt8 >( nTemp ); diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index 61006de52b3d..59e03b45319b 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -43,13 +43,13 @@ class ScVbaInterior : public ScVbaInterior_BASE css::uno::Reference< css::container::XIndexAccess > getPalette(); css::uno::Reference< css::container::XNameContainer > GetAttributeContainer(); - css::uno::Any SetAttributeData( sal_Int32 nValue ); - sal_Int32 GetAttributeData( css::uno::Any aValue ); + static css::uno::Any SetAttributeData( sal_Int32 nValue ); + static sal_Int32 GetAttributeData( css::uno::Any aValue ); Color GetBackColor(); protected: - Color GetPatternColor( const Color& rPattColor, const Color& rBackColor, sal_uInt32 nXclPattern ); - Color GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 nTrans ); - sal_uInt8 GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans ) const; + static Color GetPatternColor( const Color& rPattColor, const Color& rBackColor, sal_uInt32 nXclPattern ); + static Color GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 nTrans ); + static sal_uInt8 GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans ); css::uno::Any GetIndexColor( const sal_Int32& nColorIndex ); sal_Int32 GetColorIndex( const sal_Int32 nColor ); css::uno::Any GetUserDefinedAttributes( const OUString& sName ); diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index 61c8bcbb036b..6512f5cd02d6 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -29,8 +29,8 @@ typedef cppu::ImplInheritanceHelper1< VbaDocumentBase, ov::excel::XWorkbook > Sc class ScVbaWorkbook : public ScVbaWorkbook_BASE { static css::uno::Sequence< sal_Int32 > ColorData; - bool setFilterPropsFromFormat( sal_Int32 nFormat, css::uno::Sequence< css::beans::PropertyValue >& rProps ); - void initColorData( const css::uno::Sequence< sal_Int32 >& sColors ); + static bool setFilterPropsFromFormat( sal_Int32 nFormat, css::uno::Sequence< css::beans::PropertyValue >& rProps ); + static void initColorData( const css::uno::Sequence< sal_Int32 >& sColors ); void init(); public: diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index c7240e580354..080af1f6e187 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.hxx @@ -31,8 +31,8 @@ class ScVbaWorkbooks : public ScVbaWorkbooks_BASE { private: OUString getFileFilterType( const OUString& rString ); - bool isTextFile( const OUString& rString ); - bool isSpreadSheetFile( const OUString& rString ); + static bool isTextFile( const OUString& rString ); + static bool isSpreadSheetFile( const OUString& rString ); static sal_Int16& getCurrentDelim(){ static sal_Int16 nDelim = 44; return nDelim; } public: ScVbaWorkbooks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ); diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index 13da170b07c5..7c9f27987bbb 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.cxx @@ -45,7 +45,7 @@ sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bo SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->GetObjIdentifier() == OBJ_OLE2 && pDoc->IsChart( pObject ) ) + if ( pObject->GetObjIdentifier() == OBJ_OLE2 && ScDocument::IsChart( pObject ) ) { OUString aName = static_cast<SdrOle2Obj*>(pObject)->GetPersistName(); bool bHit = true; diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index e7d08f966401..19b541ac3458 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -397,7 +397,7 @@ void ScDrawView::MarkListHasChanged() if (pObj->GetObjIdentifier() == OBJ_OLE2) { pOle2Obj = static_cast<SdrOle2Obj*>(pObj); - if (!pDoc->IsChart(pObj) ) + if (!ScDocument::IsChart(pObj) ) pViewSh->SetOleObjectShell(true); else pViewSh->SetChartShell(true); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 056d2ca5d3b5..a0fb39694450 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -818,7 +818,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) } boost::scoped_ptr<SvxNumberInfoItem> pNumberInfoItem( - pTabViewShell->MakeNumberInfoItem(&rDoc, GetViewData())); + ScTabViewShell::MakeNumberInfoItem(&rDoc, GetViewData())); pDocSh->PutItem( *pNumberInfoItem ); nRsc = RID_SCDLG_STYLES_PAR; @@ -927,7 +927,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) if ( SFX_STYLE_FAMILY_PARA == eFam ) { - pTabViewShell->UpdateNumberFormatter( + ScTabViewShell::UpdateNumberFormatter( static_cast<const SvxNumberInfoItem&>( *(pDocSh->GetItem(SID_ATTR_NUMBERFORMAT_INFO)) )); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 81b6d32627cf..6ec461d681e0 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -1016,7 +1016,7 @@ void ScGridWindow::SetCellSelectionPixel(int nType, int nPixelX, int nPixelY) if (pInputHandler && pInputHandler->IsInputMode()) { // we need to switch off the editeng - pViewShell->UpdateInputLine(); + ScTabView::UpdateInputLine(); pViewShell->UpdateInputHandler(); } diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 3ea3d0dfeafd..41604f9f6182 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -329,7 +329,7 @@ vcl::Window* ScSpellingEngine::GetDialogParent() return pWin; // fall back to standard dialog parent - return mrDocShell.GetActiveDialogParent(); + return ScDocShell::GetActiveDialogParent(); } ScConversionParam::ScConversionParam( ScConversionType eConvType ) : diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index d4d3068818d1..88b2fc6fb9e9 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -295,8 +295,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { ScRangeUtil aRangeUtil; formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - if( aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_NAMES, eConv ) || - aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_DBASE, eConv ) ) + if( ScRangeUtil::MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_NAMES, eConv ) || + ScRangeUtil::MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_DBASE, eConv ) ) { nResult |= SCA_VALID; if( aScRange.aStart.Tab() != nTab ) diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index d2c9d38ab3a3..da021a2c9e56 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -498,7 +498,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, if ( bOptChanged ) { pScMod->SetAppOptions(aAppOpt); - pScMod->RecentFunctionsChanged(); + ScModule::RecentFunctionsChanged(); } } |