diff options
51 files changed, 106 insertions, 106 deletions
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index 69b6b5a8d40f..5391d320ce09 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -42,7 +42,7 @@ private: bool bAddUndo; bool bInCreate; bool bDoInsert; // is set to FALSE for first update - static bool FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const OUString& rAreaName ); + static bool FindExtRange( ScRange& rRange, const ScDocument* pSrcDoc, const OUString& rAreaName ); public: ScAreaLink( SfxObjectShell* pShell, const OUString& rFile, diff --git a/sc/inc/datamapper.hxx b/sc/inc/datamapper.hxx index 55390fc5a39b..f872f50143b8 100644 --- a/sc/inc/datamapper.hxx +++ b/sc/inc/datamapper.hxx @@ -85,7 +85,7 @@ public: const OUString& getID() const; double getUpdateFrequency() const; OUString getDBName() const; - void setDBData(ScDBData* pDBData); + void setDBData(const ScDBData* pDBData); void refresh(ScDocument* pDoc, bool bDeterministic = false); }; diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 5a63a0030797..30bc8136b034 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -398,7 +398,7 @@ public: class SC_DLLPUBLIC ApiGuard { public: - ApiGuard(ScDocument* pDoc); + ApiGuard(const ScDocument* pDoc); ~ApiGuard(); private: ScExternalRefManager* mpMgr; @@ -745,7 +745,7 @@ private: * @return range token array */ ScExternalRefCache::TokenArrayRef getDoubleRefTokensFromSrcDoc( - ScDocument* pSrcDoc, const OUString& rTabName, ScRange& rRange, + const ScDocument* pSrcDoc, const OUString& rTabName, ScRange& rRange, ::std::vector<ScExternalRefCache::SingleRangeData>& rCacheData); /** @@ -761,7 +761,7 @@ private: * @return range name token array */ static ScExternalRefCache::TokenArrayRef getRangeNameTokensFromSrcDoc( - sal_uInt16 nFileId, ScDocument* pSrcDoc, OUString& rName); + sal_uInt16 nFileId, const ScDocument* pSrcDoc, OUString& rName); ScDocument* getInMemorySrcDocument(sal_uInt16 nFileId); ScDocument* getSrcDocument(sal_uInt16 nFileId); diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index 6684a5ff3b43..043f10c1b708 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -96,7 +96,7 @@ public: */ static SfxMedium* CreateMedium( const OUString& rFileName, std::shared_ptr<const SfxFilter> const & pFilter, const OUString& rOptions ); - static OUString GetOptions( SfxMedium& rMedium ); + static OUString GetOptions( const SfxMedium& rMedium ); /** Returns the filter name and options from a file name. @param bWithContent diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index cb0c0e8c4f88..15c52b83f1cc 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -781,7 +781,7 @@ void ScMenuFloatingWindow::fireMenuHighlightedEvent() FireVclEvent(aEvent); } -void ScMenuFloatingWindow::setSubMenuFocused(ScMenuFloatingWindow* pSubMenu) +void ScMenuFloatingWindow::setSubMenuFocused(const ScMenuFloatingWindow* pSubMenu) { maCloseTimer.reset(); size_t nMenuPos = getSubMenuPos(pSubMenu); diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index b318a1e19802..b41b2cd21e49 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -49,7 +49,7 @@ void GetType(const ListBox& rLstBox, const Edit& rEd, ScColorScaleEntry* pEntry, } } -OUString convertNumberToString(double nVal, ScDocument* pDoc) +OUString convertNumberToString(double nVal, const ScDocument* pDoc) { SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); OUString aText; @@ -57,7 +57,7 @@ OUString convertNumberToString(double nVal, ScDocument* pDoc) return aText; } -void SetValue( ScDocument* pDoc, ScColorScaleEntry* pEntry, Edit& aEdit) +void SetValue( const ScDocument* pDoc, const ScColorScaleEntry* pEntry, Edit& aEdit) { if(pEntry->GetType() == COLORSCALE_FORMULA) aEdit.SetText(pEntry->GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index eb13fc2eeb50..1e4e27272119 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -451,7 +451,7 @@ void ScConditionFrmtEntry::SetInactive() namespace { -void UpdateStyleList(ListBox& rLbStyle, ScDocument* pDoc) +void UpdateStyleList(ListBox& rLbStyle, const ScDocument* pDoc) { OUString aSelectedStyle = rLbStyle.GetSelectEntry(); for(sal_Int32 i = rLbStyle.GetEntryCount(); i >= 1; --i) @@ -653,7 +653,7 @@ OUString convertNumberToString(double nVal, const ScDocument* pDoc) return aText; } -void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Edit& rEdit, SvxColorListBox& rLbCol, ScDocument* pDoc ) +void SetColorScaleEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Edit& rEdit, SvxColorListBox& rLbCol, const ScDocument* pDoc ) { // entry Automatic is not available for color scales sal_Int32 nIndex = static_cast<sal_Int32>(rEntry.GetType()); diff --git a/sc/source/ui/dataprovider/dataprovider.cxx b/sc/source/ui/dataprovider/dataprovider.cxx index 57b22ce7d4d7..f7631107abf2 100644 --- a/sc/source/ui/dataprovider/dataprovider.cxx +++ b/sc/source/ui/dataprovider/dataprovider.cxx @@ -99,7 +99,7 @@ OUString ExternalDataSource::getDBName() const return OUString(); } -void ExternalDataSource::setDBData(ScDBData* pDBData) +void ExternalDataSource::setDBData(const ScDBData* pDBData) { if (!mpDBDataManager) { diff --git a/sc/source/ui/dataprovider/datatransformation.cxx b/sc/source/ui/dataprovider/datatransformation.cxx index 15e30b0f13c7..0ed27e568d3c 100644 --- a/sc/source/ui/dataprovider/datatransformation.cxx +++ b/sc/source/ui/dataprovider/datatransformation.cxx @@ -17,7 +17,7 @@ DataTransformation::~DataTransformation() { } -SCROW DataTransformation::getLastRow(ScDocument& rDoc, SCCOL nCol) +SCROW DataTransformation::getLastRow(const ScDocument& rDoc, SCCOL nCol) { SCROW nStartRow = 0; SCROW nEndRow = MAXROW; diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index 7d8ea4e3563e..c98ed9dc5f3c 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -34,7 +34,7 @@ ScItemValue::ScItemValue(OUString const & aName, SCCOL nColumn, PivotFunc nFunct mpOriginalItemValue(this) {} -ScItemValue::ScItemValue(ScItemValue* pInputItemValue) : +ScItemValue::ScItemValue(const ScItemValue* pInputItemValue) : maName(pInputItemValue->maName), maFunctionData(pInputItemValue->maFunctionData), mpOriginalItemValue(this) @@ -46,7 +46,7 @@ ScItemValue::~ScItemValue() namespace { -ScRange lclGetRangeForNamedRange(OUString const & aName, ScDocument* pDocument) +ScRange lclGetRangeForNamedRange(OUString const & aName, const ScDocument* pDocument) { ScRange aInvalidRange(ScAddress::INITIALIZE_INVALID); ScRangeName* pRangeName = pDocument->GetRangeName(); @@ -387,7 +387,7 @@ bool ScPivotLayoutDialog::IsRefInputMode() const return mbDialogLostFocus; } -void ScPivotLayoutDialog::ItemInserted(ScItemValue* pItemValue, ScPivotLayoutTreeList::SvPivotTreeListType eType) +void ScPivotLayoutDialog::ItemInserted(const ScItemValue* pItemValue, ScPivotLayoutTreeList::SvPivotTreeListType eType) { if (pItemValue == nullptr) return; @@ -570,7 +570,7 @@ void ScPivotLayoutDialog::ApplySaveData(ScDPSaveData& rSaveData) &aColFieldVector, &aRowFieldVector, &aPageFieldVector); } -void ScPivotLayoutDialog::ApplyLabelData(ScDPSaveData& rSaveData) +void ScPivotLayoutDialog::ApplyLabelData(const ScDPSaveData& rSaveData) { ScDPLabelDataVector& rLabelDataVector = GetLabelDataVector(); @@ -728,7 +728,7 @@ void ScPivotLayoutDialog::ToggleDestination() mpDestinationEdit->Enable(bSelection); } -ScPivotLayoutTreeListBase* ScPivotLayoutDialog::FindListBoxFor(SvTreeListEntry *pEntry) +ScPivotLayoutTreeListBase* ScPivotLayoutDialog::FindListBoxFor(const SvTreeListEntry *pEntry) { if (mpListBoxPage->HasEntry(pEntry)) return mpListBoxPage.get(); diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx index d136318d6eb0..cb7a1580050b 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx @@ -68,7 +68,7 @@ TriState ScPivotLayoutTreeListBase::NotifyCopying(SvTreeListEntry* /*pTarget*/, return TRISTATE_FALSE; } -bool ScPivotLayoutTreeListBase::HasEntry(SvTreeListEntry* pEntry) +bool ScPivotLayoutTreeListBase::HasEntry(const SvTreeListEntry* pEntry) { SvTreeListEntry* pEachEntry; for (pEachEntry = First(); pEachEntry != nullptr; pEachEntry = Next(pEachEntry)) @@ -103,7 +103,7 @@ void ScPivotLayoutTreeListBase::InsertEntryForSourceTarget(SvTreeListEntry* /*pS void ScPivotLayoutTreeListBase::InsertEntryForItem(ScItemValue* /*pItemValue*/, sal_uLong /*nPosition*/) {} -void ScPivotLayoutTreeListBase::RemoveEntryForItem(ScItemValue* pItemValue) +void ScPivotLayoutTreeListBase::RemoveEntryForItem(const ScItemValue* pItemValue) { SvTreeListEntry* pEachEntry; for (pEachEntry = First(); pEachEntry != nullptr; pEachEntry = Next(pEachEntry)) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index fb5bf5954e50..59507799a2c9 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -101,7 +101,7 @@ ScValidationDlg::~ScValidationDlg() disposeOnce(); } -void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pDoc ) +void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , const ScDocument* pDoc ) { if ( rRange.aStart != rRange.aEnd ) if ( ScValidationDlg *pValidationDlg = GetValidationDlg() ) @@ -126,7 +126,7 @@ void ScTPValidationValue:: SetActiveHdl() } } -void ScTPValidationValue::RefInputStartPreHdl( formula::RefEdit* pEdit, formula::RefButton* pButton ) +void ScTPValidationValue::RefInputStartPreHdl( formula::RefEdit* pEdit, const formula::RefButton* pButton ) { if ( ScValidationDlg *pValidationDlg = GetValidationDlg() ) { @@ -942,7 +942,7 @@ void ScTPValidationValue::ScRefButtonEx::Click() formula::RefButton::Click(); } -void ScTPValidationValue::OnClick( Button *pBtn ) +void ScTPValidationValue::OnClick( const Button *pBtn ) { if( pBtn == m_pBtnRef ) SetupRefDlg(); diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 425af099b597..4e4c8ab847af 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -194,7 +194,7 @@ bool ScAreaLink::IsEqual( const OUString& rFile, const OUString& rFilter, const } // find a range with name >rAreaName< in >pSrcDoc<, return it in >rRange< -bool ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const OUString& rAreaName ) +bool ScAreaLink::FindExtRange( ScRange& rRange, const ScDocument* pSrcDoc, const OUString& rAreaName ) { bool bFound = false; OUString aUpperName = ScGlobal::pCharClass->uppercase(rAreaName); diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 11c53f1c8278..df07acaebfc3 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1580,7 +1580,7 @@ bool ScDBDocFunc::UpdatePivotTable(ScDPObject& rDPObj, bool bRecord, bool bApi) return true; } -void ScDBDocFunc::RefreshPivotTables(ScDPObject* pDPObj, bool bApi) +void ScDBDocFunc::RefreshPivotTables(const ScDPObject* pDPObj, bool bApi) { ScDPCollection* pDPs = rDocShell.GetDocument().GetDPCollection(); if (!pDPs) diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 60c379ed0174..8979252bb5d3 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -64,7 +64,7 @@ using namespace com::sun::star; #define SC_DBPROP_COMMAND "Command" #define SC_DBPROP_COMMANDTYPE "CommandType" -void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame ) +void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, const SfxViewFrame* pFrame ) { // called after opening the database beamer diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index c9e19236a699..6cc3ae4db697 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2997,7 +2997,7 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, return true; } -uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, OUString& sCodeName ) +uno::Reference< uno::XInterface > GetDocModuleObject( const SfxObjectShell& rDocSh, const OUString& sCodeName ) { uno::Reference< lang::XMultiServiceFactory> xSF(rDocSh.GetModel(), uno::UNO_QUERY); uno::Reference< container::XNameAccess > xVBACodeNamedObjectAccess; @@ -3011,7 +3011,7 @@ uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, OU } -static script::ModuleInfo lcl_InitModuleInfo( SfxObjectShell& rDocSh, OUString& sModule ) +static script::ModuleInfo lcl_InitModuleInfo( const SfxObjectShell& rDocSh, const OUString& sModule ) { script::ModuleInfo sModuleInfo; sModuleInfo.ModuleType = script::ModuleType::DOCUMENT; diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 2e26e5d2386e..3c9d8c5d3c73 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2951,7 +2951,7 @@ ScFormatSaveData* ScDocShell::GetFormatSaveData() namespace { -void removeKeysIfExists(Reference<ui::XAcceleratorConfiguration>& xScAccel, const vector<const awt::KeyEvent*>& rKeys) +void removeKeysIfExists(const Reference<ui::XAcceleratorConfiguration>& xScAccel, const vector<const awt::KeyEvent*>& rKeys) { vector<const awt::KeyEvent*>::const_iterator itr = rKeys.begin(), itrEnd = rKeys.end(); for (; itr != itrEnd; ++itr) diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 341cd921a87f..a0c76fced7b1 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1534,7 +1534,7 @@ void ScDocShell::PageStyleModified( const OUString& rStyleName, bool bApi ) } } -void ScDocShell::ExecutePageStyle( SfxViewShell& rCaller, +void ScDocShell::ExecutePageStyle( const SfxViewShell& rCaller, SfxRequest& rReq, SCTAB nCurTab ) { diff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx index feb34d0b41bf..22e1ed7027ff 100644 --- a/sc/source/ui/docshell/editable.cxx +++ b/sc/source/ui/docshell/editable.cxx @@ -29,7 +29,7 @@ ScEditableTester::ScEditableTester() : { } -ScEditableTester::ScEditableTester( ScDocument* pDoc, SCTAB nTab, +ScEditableTester::ScEditableTester( const ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) : mbIsEditable(true), mbOnlyMatrix(true) @@ -37,7 +37,7 @@ ScEditableTester::ScEditableTester( ScDocument* pDoc, SCTAB nTab, TestBlock( pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow ); } -ScEditableTester::ScEditableTester( ScDocument* pDoc, +ScEditableTester::ScEditableTester( const ScDocument* pDoc, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ) : mbIsEditable(true), @@ -46,14 +46,14 @@ ScEditableTester::ScEditableTester( ScDocument* pDoc, TestSelectedBlock( pDoc, nStartCol, nStartRow, nEndCol, nEndRow, rMark ); } -ScEditableTester::ScEditableTester( ScDocument* pDoc, const ScRange& rRange ) : +ScEditableTester::ScEditableTester( const ScDocument* pDoc, const ScRange& rRange ) : mbIsEditable(true), mbOnlyMatrix(true) { TestRange( pDoc, rRange ); } -ScEditableTester::ScEditableTester( ScDocument* pDoc, const ScMarkData& rMark ) : +ScEditableTester::ScEditableTester( const ScDocument* pDoc, const ScMarkData& rMark ) : mbIsEditable(true), mbOnlyMatrix(true) { @@ -80,7 +80,7 @@ ScEditableTester::ScEditableTester( TestBlockForAction(rDoc, eAction, nStart, nEnd, rMark); } -void ScEditableTester::TestBlock( ScDocument* pDoc, SCTAB nTab, +void ScEditableTester::TestBlock( const ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) { if (mbIsEditable || mbOnlyMatrix) @@ -95,7 +95,7 @@ void ScEditableTester::TestBlock( ScDocument* pDoc, SCTAB nTab, } } -void ScEditableTester::TestSelectedBlock( ScDocument* pDoc, +void ScEditableTester::TestSelectedBlock( const ScDocument* pDoc, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ) { @@ -105,7 +105,7 @@ void ScEditableTester::TestSelectedBlock( ScDocument* pDoc, TestBlock( pDoc, *itr, nStartCol, nStartRow, nEndCol, nEndRow ); } -void ScEditableTester::TestRange( ScDocument* pDoc, const ScRange& rRange ) +void ScEditableTester::TestRange( const ScDocument* pDoc, const ScRange& rRange ) { SCCOL nStartCol = rRange.aStart.Col(); SCROW nStartRow = rRange.aStart.Row(); @@ -117,7 +117,7 @@ void ScEditableTester::TestRange( ScDocument* pDoc, const ScRange& rRange ) TestBlock( pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow ); } -void ScEditableTester::TestSelection( ScDocument* pDoc, const ScMarkData& rMark ) +void ScEditableTester::TestSelection( const ScDocument* pDoc, const ScMarkData& rMark ) { if (mbIsEditable || mbOnlyMatrix) { diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index cc2018961f66..9c82c94dcdd0 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1511,7 +1511,7 @@ void ScExternalRefLink::SetDoReferesh(bool b) mbDoRefresh = b; } -static FormulaToken* convertToToken( ScDocument* pHostDoc, ScDocument* pSrcDoc, ScRefCellValue& rCell ) +static FormulaToken* convertToToken( ScDocument* pHostDoc, const ScDocument* pSrcDoc, ScRefCellValue& rCell ) { if (rCell.hasEmptyValue()) { @@ -1555,7 +1555,7 @@ static FormulaToken* convertToToken( ScDocument* pHostDoc, ScDocument* pSrcDoc, } static std::unique_ptr<ScTokenArray> convertToTokenArray( - ScDocument* pHostDoc, ScDocument* pSrcDoc, ScRange& rRange, vector<ScExternalRefCache::SingleRangeData>& rCacheData ) + ScDocument* pHostDoc, const ScDocument* pSrcDoc, ScRange& rRange, vector<ScExternalRefCache::SingleRangeData>& rCacheData ) { ScAddress& s = rRange.aStart; ScAddress& e = rRange.aEnd; @@ -1701,7 +1701,7 @@ ScExternalRefManager::LinkListener::~LinkListener() { } -ScExternalRefManager::ApiGuard::ApiGuard(ScDocument* pDoc) : +ScExternalRefManager::ApiGuard::ApiGuard(const ScDocument* pDoc) : mpMgr(pDoc->GetExternalRefManager()), mbOldInteractionEnabled(mpMgr->mbUserInteractionEnabled) { @@ -2080,7 +2080,7 @@ ScExternalRefCache::TokenArrayRef ScExternalRefManager::getRangeNameTokens( namespace { -bool hasRangeName(ScDocument& rDoc, const OUString& rName) +bool hasRangeName(const ScDocument& rDoc, const OUString& rName) { ScRangeName* pExtNames = rDoc.GetRangeName(); OUString aUpperName = ScGlobal::pCharClass->uppercase(rName); @@ -2149,7 +2149,7 @@ void ScExternalRefManager::refreshAllRefCells(sal_uInt16 nFileId) namespace { void insertRefCellByIterator( - ScExternalRefManager::RefCellMap::iterator& itr, ScFormulaCell* pCell) + const ScExternalRefManager::RefCellMap::iterator& itr, ScFormulaCell* pCell) { if (pCell) { @@ -2262,7 +2262,7 @@ ScExternalRefCache::TokenRef ScExternalRefManager::getSingleRefTokenFromSrcDoc( } ScExternalRefCache::TokenArrayRef ScExternalRefManager::getDoubleRefTokensFromSrcDoc( - ScDocument* pSrcDoc, const OUString& rTabName, ScRange& rRange, + const ScDocument* pSrcDoc, const OUString& rTabName, ScRange& rRange, vector<ScExternalRefCache::SingleRangeData>& rCacheData) { ScExternalRefCache::TokenArrayRef pArray; @@ -2306,7 +2306,7 @@ ScExternalRefCache::TokenArrayRef ScExternalRefManager::getDoubleRefTokensFromSr } ScExternalRefCache::TokenArrayRef ScExternalRefManager::getRangeNameTokensFromSrcDoc( - sal_uInt16 nFileId, ScDocument* pSrcDoc, OUString& rName) + sal_uInt16 nFileId, const ScDocument* pSrcDoc, OUString& rName) { ScRangeName* pExtNames = pSrcDoc->GetRangeName(); OUString aUpperName = ScGlobal::pCharClass->uppercase(rName); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index f992c18061c0..a202ce30b36a 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -929,8 +929,8 @@ static bool lcl_PutString( ScDocumentImport& rDocImport, bool bUseDocImport, SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rStr, sal_uInt8 nColFormat, SvNumberFormatter* pFormatter, bool bDetectNumFormat, - ::utl::TransliterationWrapper& rTransliteration, CalendarWrapper& rCalendar, - ::utl::TransliterationWrapper* pSecondTransliteration, CalendarWrapper* pSecondCalendar ) + const ::utl::TransliterationWrapper& rTransliteration, CalendarWrapper& rCalendar, + const ::utl::TransliterationWrapper* pSecondTransliteration, CalendarWrapper* pSecondCalendar ) { ScDocument* pDoc = &rDocImport.getDoc(); bool bMultiLine = false; diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 5c5e3a1f4d32..19b1f68d62f2 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -416,7 +416,7 @@ IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink&, rLink, void ) // === ScDocumentLoader ================================================== -OUString ScDocumentLoader::GetOptions( SfxMedium& rMedium ) +OUString ScDocumentLoader::GetOptions( const SfxMedium& rMedium ) { SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 7d0b8ea9385e..c70adf6a8966 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -89,7 +89,7 @@ void ScDrawShell::StateDisableItems( SfxItemSet &rSet ) } } -static void lcl_setModified( SfxObjectShell* pShell ) +static void lcl_setModified( const SfxObjectShell* pShell ) { if ( pShell ) { diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 35c0230818f4..edaab55c8ee0 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -139,7 +139,7 @@ void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink rSet.Put(aHLinkItem); } -void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) +void ScDrawShell::ExecuteHLink( const SfxRequest& rReq ) { const SfxItemSet* pReqArgs = rReq.GetArgs(); @@ -622,7 +622,7 @@ IMPL_LINK( ScDrawShell, NameObjectHdl, AbstractSvxObjectNameDialog&, rDialog, bo return true; // name is valid } -void ScDrawShell::ExecFormText(SfxRequest& rReq) +void ScDrawShell::ExecFormText(const SfxRequest& rReq) { ScDrawView* pDrView = pViewData->GetScDrawView(); const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList(); @@ -638,7 +638,7 @@ void ScDrawShell::ExecFormText(SfxRequest& rReq) } } -void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq ) +void ScDrawShell::ExecFormatPaintbrush( const SfxRequest& rReq ) { ScViewFunc* pView = pViewData->GetView(); if ( pView->HasPaintBrush() ) diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 20e47e079b18..41821ece63ef 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -1183,7 +1183,7 @@ void ScDrawTextObjectBar::GetAttrState( SfxItemSet& rDestSet ) } } -void ScDrawTextObjectBar::ExecuteTrans( SfxRequest& rReq ) +void ScDrawTextObjectBar::ExecuteTrans( const SfxRequest& rReq ) { TransliterationFlags nType = ScViewUtil::GetTransliterationType( rReq.GetSlot() ); if ( nType != TransliterationFlags::NONE ) diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index 8783ef9c27ba..2fbbf289be8b 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -181,7 +181,7 @@ void ScDrawTextObjectBar::ExecuteExtra( SfxRequest &rReq ) } } -void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq) +void ScDrawTextObjectBar::ExecFormText(const SfxRequest& rReq) { ScTabView* pTabView = pViewData->GetView(); ScDrawView* pDrView = pTabView->GetScDrawView(); diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index dce2e752d041..5239102cae0a 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -58,7 +58,7 @@ FuConstRectangle::~FuConstRectangle() namespace { -::basegfx::B2DPolyPolygon getPolygon(const char* pResId, SdrModel* pDoc) +::basegfx::B2DPolyPolygon getPolygon(const char* pResId, const SdrModel* pDoc) { ::basegfx::B2DPolyPolygon aRetval; XLineEndListRef pLineEndList = pDoc->GetLineEndList(); @@ -214,7 +214,7 @@ void FuConstRectangle::Activate() FuConstruct::Activate(); } -void FuConstRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt16 nSlotId) +void FuConstRectangle::SetLineEnds(SfxItemSet& rAttr, const SdrObject* pObj, sal_uInt16 nSlotId) { SdrModel *pDoc = pObj->GetModel(); diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 9e0a46337638..e508e2ff5ec7 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -37,7 +37,7 @@ #define SC_MAXDRAGMOVE 3 FuConstruct::FuConstruct(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, SfxRequest& rReq) : + SdrModel* pDoc, const SfxRequest& rReq) : FuDraw(pViewSh, pWin, pViewP, pDoc, rReq) { } diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 7da26ee75f5f..32095599dc71 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -43,7 +43,7 @@ // base class for draw module specific functions FuDraw::FuDraw(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, SfxRequest& rReq) : + SdrModel* pDoc, const SfxRequest& rReq) : FuPoor (pViewSh, pWin, pViewP, pDoc, rReq), aNewPointer ( PointerStyle::Arrow ), aOldPointer ( PointerStyle::Arrow ) @@ -622,7 +622,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) } // toggle mouse-pointer -static bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, vcl::Window* pWindow ) +static bool lcl_UrlHit( const SdrView* pView, const Point& rPosPixel, const vcl::Window* pWindow ) { SdrViewEvent aVEvt; MouseEvent aMEvt( rPosPixel, 1, MouseEventModifiers::NONE, MOUSE_LEFT ); diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 71474a37b6e1..1177c90e9d84 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -90,7 +90,7 @@ void ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& rPage ) static void lcl_InsertGraphic( const Graphic& rGraphic, const OUString& rFileName, const OUString& rFilterName, bool bAsLink, bool bApi, - ScTabViewShell* pViewSh, vcl::Window* pWindow, SdrView* pView ) + ScTabViewShell* pViewSh, const vcl::Window* pWindow, SdrView* pView ) { ScDrawView* pDrawView = pViewSh->GetScDrawView(); @@ -174,7 +174,7 @@ static void lcl_InsertGraphic( const Graphic& rGraphic, } static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi, - ScTabViewShell* pViewSh, vcl::Window* pWindow, SdrView* pView, + ScTabViewShell* pViewSh, const vcl::Window* pWindow, SdrView* pView, const Size& rPrefSize, bool const bLink ) { SdrPageView* pPV = pView->GetSdrPageView(); @@ -293,7 +293,7 @@ FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, - SfxRequest& rReq ) : + const SfxRequest& rReq ) : FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) { OUString aURL; diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 24f6f40a9f36..ded7e20ba678 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -729,7 +729,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV } FuInsertChartFromFile::FuInsertChartFromFile( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, SfxRequest& rReq, const OUString& rURL): + SdrModel* pDoc, const SfxRequest& rReq, const OUString& rURL): FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) { uno::Reference< io::XInputStream > xStorage = comphelper::OStorageHelper::GetInputStreamFromURL( diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index be4f229c5beb..e1bd9481634b 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -31,7 +31,7 @@ #include <svx/sdrhittesthelper.hxx> FuPoor::FuPoor(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, SfxRequest& rReq) : + SdrModel* pDoc, const SfxRequest& rReq) : pView(pViewP), pViewShell(pViewSh), pWindow(pWin), diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index f7db2b9c8a04..1cfe586a262c 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -58,7 +58,7 @@ using namespace com::sun::star; FuSelection::FuSelection(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, - SdrModel* pDoc, SfxRequest& rReq ) : + SdrModel* pDoc, const SfxRequest& rReq ) : FuDraw(pViewSh, pWin, pViewP, pDoc, rReq) { } diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index 360dac6e1a67..f6ee34d3b619 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -46,7 +46,7 @@ inline long Diff( const Point& rP1, const Point& rP2 ) return nX+nY; } -bool FuSelection::TestDetective( SdrPageView* pPV, const Point& rPos ) +bool FuSelection::TestDetective( const SdrPageView* pPV, const Point& rPos ) { if (!pPV) return false; diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 4d0a21a976ce..2029cd71fd0f 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -92,7 +92,7 @@ static void lcl_InvalidateAttribs( SfxBindings& rBindings ) rBindings.Invalidate( SID_ATTR_CHAR_SHADOWED ); } -static void lcl_UpdateHyphenator( Outliner& rOutliner, SdrObject* pObj ) +static void lcl_UpdateHyphenator( Outliner& rOutliner, const SdrObject* pObj ) { // use hyphenator only if hyphenation attribute is set if ( pObj && static_cast<const SfxBoolItem&>(pObj->GetMergedItem(EE_PARA_HYPHENATE)).GetValue() ) { diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 0c0267c05bf0..6696e39b9113 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -32,7 +32,7 @@ public: ScItemValue* mpOriginalItemValue; ScItemValue(OUString const & aName, SCCOL nColumn, PivotFunc nFunctionMask); - ScItemValue(ScItemValue* pInputItemValue); + ScItemValue(const ScItemValue* pInputItemValue); ~ScItemValue(); }; @@ -115,13 +115,13 @@ public: virtual void SetActive() override; virtual bool IsRefInputMode() const override; - void ItemInserted(ScItemValue* pItemValue, ScPivotLayoutTreeList::SvPivotTreeListType eType); + void ItemInserted(const ScItemValue* pItemValue, ScPivotLayoutTreeList::SvPivotTreeListType eType); void UpdateSourceRange(); void ApplyChanges(); void ApplySaveData(ScDPSaveData& rSaveData); - void ApplyLabelData(ScDPSaveData& rSaveData); + void ApplyLabelData(const ScDPSaveData& rSaveData); ScItemValue* GetItem(SCCOL nColumn); bool IsDataElement(SCCOL nColumn); @@ -130,7 +130,7 @@ public: ScDPLabelDataVector& GetLabelDataVector() { return maPivotParameters.maLabelArray;} void PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames); - ScPivotLayoutTreeListBase* FindListBoxFor(SvTreeListEntry *pEntry); + ScPivotLayoutTreeListBase* FindListBoxFor(const SvTreeListEntry *pEntry); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx index 43c8cecc2d72..39d0d69d3bc9 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx @@ -55,9 +55,9 @@ public: void PushEntriesToPivotFieldVector(ScPivotFieldVector& rVector); - void RemoveEntryForItem(ScItemValue* pItemValue); + void RemoveEntryForItem(const ScItemValue* pItemValue); - bool HasEntry(SvTreeListEntry* pEntry); + bool HasEntry(const SvTreeListEntry* pEntry); protected: virtual void InsertEntryForSourceTarget(SvTreeListEntry* pSource, SvTreeListEntry* pTarget); diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index fb6a15573a80..51771ec6a429 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -125,7 +125,7 @@ private: * close timer is not active, and the correct menu item associated with * the submenu is highlighted. */ - void setSubMenuFocused(ScMenuFloatingWindow* pSubMenu); + void setSubMenuFocused(const ScMenuFloatingWindow* pSubMenu); /** * When a menu item of an invisible submenu is selected, we need to make diff --git a/sc/source/ui/inc/datatransformation.hxx b/sc/source/ui/inc/datatransformation.hxx index 88c81e345182..d647fecb8e5d 100644 --- a/sc/source/ui/inc/datatransformation.hxx +++ b/sc/source/ui/inc/datatransformation.hxx @@ -23,7 +23,7 @@ class SC_DLLPUBLIC DataTransformation { protected: - static SCROW getLastRow(ScDocument& rDoc, SCCOL nCol); + static SCROW getLastRow(const ScDocument& rDoc, SCCOL nCol); public: virtual ~DataTransformation(); diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index d720301086b3..5e8c6adc9bbb 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.hxx @@ -65,7 +65,7 @@ public: bool DoImportUno( const ScAddress& rPos, const css::uno::Sequence<css::beans::PropertyValue>& aArgs ); - static void ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame ); + static void ShowInBeamer( const ScImportParam& rParam, const SfxViewFrame* pFrame ); SC_DLLPUBLIC bool Sort( SCTAB nTab, const ScSortParam& rSortParam, bool bRecord, bool bPaint, bool bApi ); @@ -96,7 +96,7 @@ public: * Reload the referenced pivot cache, and refresh all pivot tables that * reference the cache. */ - void RefreshPivotTables(ScDPObject* pDPObj, bool bApi); + void RefreshPivotTables(const ScDPObject* pDPObj, bool bApi); /** * Refresh the group dimensions of all pivot tables referencing the same diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index f857a786b0a2..6061967f2e31 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -227,7 +227,7 @@ public: void Execute( SfxRequest& rReq ); void GetState( SfxItemSet &rSet ); - void ExecutePageStyle ( SfxViewShell& rCaller, SfxRequest& rReq, SCTAB nCurTab ); + void ExecutePageStyle ( const SfxViewShell& rCaller, SfxRequest& rReq, SCTAB nCurTab ); void GetStatePageStyle( SfxItemSet& rSet, SCTAB nCurTab ); void CompareDocument( ScDocument& rOtherDoc ); diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index b1955160e734..d6d6af465083 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -69,13 +69,13 @@ public: void GetDrawFuncState(SfxItemSet &rSet); void GetState(SfxItemSet &rSet); - void ExecFormText(SfxRequest& rReq); // StarFontWork + void ExecFormText(const SfxRequest& rReq); // StarFontWork void GetFormTextState(SfxItemSet& rSet); - void ExecuteHLink(SfxRequest& rReq); // Hyperlink + void ExecuteHLink(const SfxRequest& rReq); // Hyperlink void GetHLinkState(SfxItemSet& rSet); - void ExecFormatPaintbrush(SfxRequest& rReq); + void ExecFormatPaintbrush(const SfxRequest& rReq); void StateFormatPaintbrush(SfxItemSet& rSet); void ExecuteMacroAssign( SdrObject* pObj, vcl::Window* pWin ); diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx index bc29dc93e528..53025d951b3f 100644 --- a/sc/source/ui/inc/drtxtob.hxx +++ b/sc/source/ui/inc/drtxtob.hxx @@ -54,7 +54,7 @@ public: static void StateDisableItems( SfxItemSet &rSet ); void Execute( SfxRequest &rReq ); - void ExecuteTrans( SfxRequest& rReq ); + void ExecuteTrans( const SfxRequest& rReq ); void GetState( SfxItemSet& rSet ); void GetClipState( SfxItemSet& rSet ); @@ -67,7 +67,7 @@ public: bool ExecuteParaDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet ); void ExecuteExtra( SfxRequest &rReq ); - void ExecFormText(SfxRequest& rReq); // StarFontWork + void ExecFormText(const SfxRequest& rReq); // StarFontWork void GetFormTextState(SfxItemSet& rSet); private: diff --git a/sc/source/ui/inc/editable.hxx b/sc/source/ui/inc/editable.hxx index 6e2fb0bd5e88..189fbbf227dd 100644 --- a/sc/source/ui/inc/editable.hxx +++ b/sc/source/ui/inc/editable.hxx @@ -42,19 +42,19 @@ public: ScEditableTester(); // calls TestBlock - ScEditableTester( ScDocument* pDoc, SCTAB nTab, + ScEditableTester( const ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); // calls TestSelectedBlock - ScEditableTester( ScDocument* pDoc, + ScEditableTester( const ScDocument* pDoc, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ); // calls TestRange - ScEditableTester( ScDocument* pDoc, const ScRange& rRange ); + ScEditableTester( const ScDocument* pDoc, const ScRange& rRange ); // calls TestSelection - ScEditableTester( ScDocument* pDoc, const ScMarkData& rMark ); + ScEditableTester( const ScDocument* pDoc, const ScMarkData& rMark ); // calls TestView ScEditableTester( ScViewFunc* pView ); @@ -65,13 +65,13 @@ public: // Several calls to the Test... methods check if *all* of the ranges // are editable. For several independent checks, Reset() has to be used. - void TestBlock( ScDocument* pDoc, SCTAB nTab, + void TestBlock( const ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void TestSelectedBlock( ScDocument* pDoc, + void TestSelectedBlock( const ScDocument* pDoc, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ); - void TestRange( ScDocument* pDoc, const ScRange& rRange ); - void TestSelection( ScDocument* pDoc, const ScMarkData& rMark ); + void TestRange( const ScDocument* pDoc, const ScRange& rRange ); + void TestSelection( const ScDocument* pDoc, const ScMarkData& rMark ); void TestBlockForAction( const ScDocument& rDoc, sc::ColRowEditAction eAction, SCCOLROW nStart, SCCOLROW nEnd, diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx index a44201151b05..c5bfb16c6911 100644 --- a/sc/source/ui/inc/fuconrec.hxx +++ b/sc/source/ui/inc/fuconrec.hxx @@ -36,7 +36,7 @@ class FuConstRectangle : public FuConstruct virtual void Activate() override; virtual void Deactivate() override; - static void SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj, sal_uInt16 nSlotId); + static void SetLineEnds(SfxItemSet& rAttr, const SdrObject* pObj, sal_uInt16 nSlotId); // Create default drawing objects via keyboard virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const tools::Rectangle& rRectangle) override; diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index ddb741866107..2cf0fe54a734 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -27,7 +27,7 @@ class FuConstruct : public FuDraw { public: FuConstruct(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, SfxRequest& rReq); + SdrModel* pDoc, const SfxRequest& rReq); virtual ~FuConstruct() override; // Mouse- & Key-Events diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index 729014e1f78d..5de3b95cbc2e 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -32,7 +32,7 @@ class FuDraw : public FuPoor public: FuDraw(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, SfxRequest& rReq); + SdrModel* pDoc, const SfxRequest& rReq); virtual ~FuDraw() override; virtual bool KeyInput(const KeyEvent& rKEvt) override; diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx index f79144aa077c..67a582de71b8 100644 --- a/sc/source/ui/inc/fuinsert.hxx +++ b/sc/source/ui/inc/fuinsert.hxx @@ -49,14 +49,14 @@ class FuInsertChartFromFile : public FuPoor { public: FuInsertChartFromFile( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, SfxRequest& rReq, const OUString& rURL); + SdrModel* pDoc, const SfxRequest& rReq, const OUString& rURL); }; class FuInsertMedia : public FuPoor { public: FuInsertMedia( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, SfxRequest& rReq); + SdrModel* pDoc, const SfxRequest& rReq); virtual ~FuInsertMedia() override; }; diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 3bbbdf4a4fc0..f7fa2b018f12 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -66,7 +66,7 @@ private: public: FuPoor(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, SfxRequest& rReq); + SdrModel* pDoc, const SfxRequest& rReq); virtual ~FuPoor(); // see member diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index 63c2cf19d5e8..986e98565268 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.hxx @@ -29,7 +29,7 @@ class FuSelection : public FuDraw { public: FuSelection(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, SfxRequest& rReq ); + SdrModel* pDoc, const SfxRequest& rReq ); virtual ~FuSelection() override; // Mouse- & Key-Events @@ -40,7 +40,7 @@ public: void ActivateNoteHandles(SdrObject* pObj); private: - bool TestDetective( SdrPageView* pPV, const Point& rPos ); // -> fusel2 + bool TestDetective( const SdrPageView* pPV, const Point& rPos ); // -> fusel2 bool IsNoteCaptionMarked() const; bool IsNoteCaptionClicked( const Point& rPos ) const; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 9829a1922ed9..678a68313d70 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -41,18 +41,18 @@ protected: #ifdef SAL_W32 #pragma pack(push, 16) #endif - void (ScRefHandlerCaller::*m_pSetReferenceHdl)( const ScRange& , ScDocument* ); + void (ScRefHandlerCaller::*m_pSetReferenceHdl)( const ScRange& , const ScDocument* ); void (ScRefHandlerCaller::*m_pSetActiveHdl)(); - void (ScRefHandlerCaller::*m_pRefInputStartPreHdl)( formula::RefEdit* pEdit, formula::RefButton* pButton ); + void (ScRefHandlerCaller::*m_pRefInputStartPreHdl)( formula::RefEdit* pEdit, const formula::RefButton* pButton ); void (ScRefHandlerCaller::*m_pRefInputDonePostHdl)(); #if defined( SAL_W32) #pragma pack(pop) #endif public: - typedef void (ScRefHandlerCaller::*PFUNCSETREFHDLTYPE)( const ScRange& , ScDocument* ); + typedef void (ScRefHandlerCaller::*PFUNCSETREFHDLTYPE)( const ScRange& , const ScDocument* ); typedef void (ScRefHandlerCaller::*PCOMMONHDLTYPE)(); - typedef void (ScRefHandlerCaller::*PINPUTSTARTDLTYPE)( formula::RefEdit* pEdit, formula::RefButton* pButton ); + typedef void (ScRefHandlerCaller::*PINPUTSTARTDLTYPE)( formula::RefEdit* pEdit, const formula::RefButton* pButton ); void SetSetRefHdl( PFUNCSETREFHDLTYPE pNewHdl ) { @@ -125,7 +125,7 @@ private: DECL_LINK( EditSetFocusHdl, Control&, void ); DECL_LINK( KillFocusHdl, Control&, void ); - void OnClick( Button *pBtn ); + void OnClick( const Button *pBtn ); VclPtr<formula::RefEdit> m_pRefEdit; public: class ScRefButtonEx : public ::formula::RefButton @@ -153,9 +153,9 @@ private: VclPtr<ScRefButtonEx> m_pBtnRef; VclPtr<VclContainer> m_pRefGrid; friend class ScRefButtonEx; - void SetReferenceHdl( const ScRange& , ScDocument* ); + void SetReferenceHdl( const ScRange& , const ScDocument* ); void SetActiveHdl(); - void RefInputStartPreHdl( formula::RefEdit* pEdit, formula::RefButton* pButton ); + void RefInputStartPreHdl( formula::RefEdit* pEdit, const formula::RefButton* pButton ); void RefInputDonePostHdl(); ScValidationDlg * GetValidationDlg(); public: |