From 07d6f4cb864210010ff402b1f16e7fd913f4faec Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 25 Sep 2019 15:14:55 +0100 Subject: TODO rename to GetFrameWeld MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I28527b6773075fe682682a4812cf86bb7ac13180 Reviewed-on: https://gerrit.libreoffice.org/79560 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sc/source/ui/dbgui/tpsort.cxx | 2 +- sc/source/ui/dbgui/validate.cxx | 2 +- sc/source/ui/optdlg/tpcalc.cxx | 4 ++-- sc/source/ui/optdlg/tpformula.cxx | 2 +- sc/source/ui/optdlg/tpusrlst.cxx | 8 ++++---- sc/source/ui/pagedlg/tphf.cxx | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sc') diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index d0daf6debbc0..09f02925fbaf 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -747,7 +747,7 @@ DeactivateRC ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) if ( !bPosInputOk ) { - std::unique_ptr xBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Ok, ScResId(STR_INVALID_TABREF))); xBox->run(); diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index f669a9c247c0..b6d880b92bd1 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -816,7 +816,7 @@ IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl, weld::Button&, void) { // Use static SfxApplication method to bring up selector dialog for // choosing a script - OUString aScriptURL = SfxApplication::ChooseScript(GetDialogFrameWeld()); + OUString aScriptURL = SfxApplication::ChooseScript(GetFrameWeld()); if ( !aScriptURL.isEmpty() ) { diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 923e11f60130..54fb769a6234 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -182,7 +182,7 @@ bool ScTpCalcOptions::FillItemSet( SfxItemSet* rCoreAttrs ) xBatch->commit(); SolarMutexGuard aGuard; if (svtools::executeRestartDialog( - comphelper::getProcessComponentContext(), GetDialogFrameWeld(), + comphelper::getProcessComponentContext(), GetFrameWeld(), svtools::RESTART_REASON_THREADING)) GetDialogController()->response(RET_OK); } @@ -208,7 +208,7 @@ DeactivateRC ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) if ( nReturn == DeactivateRC::KeepPage ) { - std::unique_ptr xBox(Application::CreateMessageDialog(GetDialogFrameWeld(), VclMessageType::Warning, + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Ok, ScResId(STR_INVALID_EPS))); xBox->run(); diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 42e1e6e10dec..c745d748bfb0 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -114,7 +114,7 @@ void ScTpFormulaOptions::UpdateCustomCalcRadioButtons(bool bDefault) void ScTpFormulaOptions::LaunchCustomCalcSettings() { - ScCalcOptionsDialog aDlg(GetDialogFrameWeld(), maCurrentConfig, maCurrentDocOptions.IsWriteCalcConfig()); + ScCalcOptionsDialog aDlg(GetFrameWeld(), maCurrentConfig, maCurrentDocOptions.IsWriteCalcConfig()); if (aDlg.run() == RET_OK) { maCurrentConfig = aDlg.GetConfig(); diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index b243095191ea..8aec1aa7e1dc 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -336,7 +336,7 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, if ( (nStartCol != nEndCol) && (nStartRow != nEndRow) ) { - ScColOrRowDlg aDialog(GetDialogFrameWeld(), aStrCopyList, aStrCopyFrom); + ScColOrRowDlg aDialog(GetFrameWeld(), aStrCopyList, aStrCopyFrom); nCellDir = aDialog.run(); } else if ( nStartCol != nEndCol ) @@ -397,7 +397,7 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, if ( bValueIgnored ) { - std::unique_ptr xInfoBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr xInfoBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Info, VclButtonsType::Ok, aStrCopyErr)); xInfoBox->run(); @@ -594,7 +594,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, weld::Button&, rBtn, void ) + mxLbLists->get_text( nRemovePos ) + aStrQueryRemove.getToken( 1, '#' ); - std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, aMsg)); xQueryBox->set_default_response(RET_YES); @@ -675,7 +675,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, weld::Button&, rBtn, void ) } else { - std::unique_ptr xBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Ok, ScResId(STR_INVALID_TABREF))); diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index f037e0c2ee08..d130d26d26d1 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -168,7 +168,7 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void) ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); VclPtr pDlg(pFact->CreateScHFEditDlg( - GetDialogFrameWeld(), aDataSet, aStrPageStyle, nResId)); + GetFrameWeld(), aDataSet, aStrPageStyle, nResId)); pDlg->StartExecuteAsync([this, pDlg](sal_Int32 nResult){ if ( nResult == RET_OK ) { @@ -179,7 +179,7 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void) else { OUString aText; - SfxSingleTabDialogController aDlg(GetDialogFrameWeld(), &aDataSet); + SfxSingleTabDialogController aDlg(GetFrameWeld(), &aDataSet); bool bRightPage = m_xCntSharedBox->get_active() || (SvxPageUsage::Left != nPageUsage); if ( nId == SID_ATTR_PAGE_HEADERSET ) -- cgit