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 --- cui/source/customize/SvxMenuConfigPage.cxx | 14 +++++++------- cui/source/customize/SvxNotebookbarConfigPage.cxx | 2 +- cui/source/customize/SvxToolbarConfigPage.cxx | 14 +++++++------- cui/source/customize/acccfg.cxx | 8 ++++---- cui/source/customize/cfg.cxx | 2 +- cui/source/customize/macropg.cxx | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'cui/source/customize') diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index 6f0da7cd834c..f7d7a5647d1e 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -257,7 +257,7 @@ short SvxMenuConfigPage::QueryReset() OUString label = SvxConfigPageHelper::replaceSaveInName( msg, saveInName ); - std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, label)); return xQueryBox->run(); @@ -290,7 +290,7 @@ IMPL_LINK(SvxMenuConfigPage, GearHdl, const OString&, rIdent, void) { if (rIdent == "menu_gear_add") { - SvxMainMenuOrganizerDialog aDialog(GetDialogFrameWeld(), + SvxMainMenuOrganizerDialog aDialog(GetFrameWeld(), GetSaveInData()->GetEntries(), nullptr, true ); if (aDialog.run() == RET_OK) @@ -311,7 +311,7 @@ IMPL_LINK(SvxMenuConfigPage, GearHdl, const OString&, rIdent, void) OUString sCurrentName( SvxConfigPageHelper::stripHotKey( pMenuData->GetName() ) ); OUString sDesc = CuiResId( RID_SVXSTR_LABEL_NEW_NAME ); - SvxNameDialog aNameDialog(GetDialogFrameWeld(), sCurrentName, sDesc); + SvxNameDialog aNameDialog(GetFrameWeld(), sCurrentName, sDesc); aNameDialog.set_help_id(HID_SVX_CONFIG_RENAME_MENU); aNameDialog.set_title(CuiResId(RID_SVXSTR_RENAME_MENU)); @@ -333,7 +333,7 @@ IMPL_LINK(SvxMenuConfigPage, GearHdl, const OString&, rIdent, void) { SvxConfigEntry* pMenuData = GetTopLevelSelection(); - SvxMainMenuOrganizerDialog aDialog(GetDialogFrameWeld(), GetSaveInData()->GetEntries(), + SvxMainMenuOrganizerDialog aDialog(GetFrameWeld(), GetSaveInData()->GetEntries(), pMenuData, false ); if (aDialog.run() == RET_OK) { @@ -394,7 +394,7 @@ IMPL_LINK(SvxMenuConfigPage, InsertHdl, const OString&, rIdent, void) OUString aNewName; OUString aDesc = CuiResId( RID_SVXSTR_SUBMENU_NAME ); - SvxNameDialog aNameDialog(GetDialogFrameWeld(), aNewName, aDesc); + SvxNameDialog aNameDialog(GetFrameWeld(), aNewName, aDesc); aNameDialog.set_help_id(HID_SVX_CONFIG_NAME_SUBMENU); aNameDialog.set_title(CuiResId( RID_SVXSTR_ADD_SUBMENU)); @@ -443,7 +443,7 @@ IMPL_LINK(SvxMenuConfigPage, ModifyItemHdl, const OString&, rIdent, void) OUString aNewName( SvxConfigPageHelper::stripHotKey( pEntry->GetName() ) ); OUString aDesc = CuiResId( RID_SVXSTR_LABEL_NEW_NAME ); - SvxNameDialog aNameDialog(GetDialogFrameWeld(), aNewName, aDesc); + SvxNameDialog aNameDialog(GetFrameWeld(), aNewName, aDesc); aNameDialog.set_help_id(HID_SVX_CONFIG_RENAME_MENU_ITEM); aNameDialog.set_title(CuiResId(RID_SVXSTR_RENAME_MENU)); @@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SvxMenuConfigPage, ResetMenuHdl, weld::Button&, void) return; } - std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, CuiResId(RID_SVXSTR_CONFIRM_RESTORE_DEFAULT_MENU))); diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx index 26c0de69a21a..a8dcfb6e334b 100644 --- a/cui/source/customize/SvxNotebookbarConfigPage.cxx +++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx @@ -202,7 +202,7 @@ short SvxNotebookbarConfigPage::QueryReset() OUString label = SvxConfigPageHelper::replaceSaveInName(msg, saveInName); std::unique_ptr xQueryBox(Application::CreateMessageDialog( - GetDialogFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, label)); + GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, label)); int nValue = xQueryBox->run(); if (nValue == RET_YES) { diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index 60dffd4e0c4f..7f6efd83803c 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -226,7 +226,7 @@ void SvxToolbarConfigPage::DeleteSelectedContent() if ( m_xContentsListBox->n_children() == 0 && GetTopLevelSelection()->IsDeletable() ) { - std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, CuiResId(RID_SXVSTR_CONFIRM_DELETE_TOOLBAR))); if (xQueryBox->run() == RET_YES) @@ -324,7 +324,7 @@ IMPL_LINK( SvxToolbarConfigPage, GearHdl, const OString&, rIdent, void ) OUString aNewURL = SvxConfigPageHelper::generateCustomURL( GetSaveInData()->GetEntries() ); - SvxNewToolbarDialog aNameDialog(GetDialogFrameWeld(), aNewName); + SvxNewToolbarDialog aNameDialog(GetFrameWeld(), aNewName); // Reflect the actual m_xSaveInListBox into the new toolbar dialog for (int i = 0, nCount = m_xSaveInListBox->get_count(); i < nCount; ++i) @@ -384,7 +384,7 @@ IMPL_LINK( SvxToolbarConfigPage, GearHdl, const OString&, rIdent, void ) OUString sCurrentName( SvxConfigPageHelper::stripHotKey( pToolbar->GetName() ) ); OUString sDesc = CuiResId( RID_SVXSTR_LABEL_NEW_NAME ); - SvxNameDialog aNameDialog(GetDialogFrameWeld(), sCurrentName, sDesc); + SvxNameDialog aNameDialog(GetFrameWeld(), sCurrentName, sDesc); aNameDialog.set_help_id(HID_SVX_CONFIG_RENAME_TOOLBAR); aNameDialog.set_title(CuiResId(RID_SVXSTR_RENAME_TOOLBAR)); @@ -500,7 +500,7 @@ IMPL_LINK(SvxToolbarConfigPage, ModifyItemHdl, const OString&, rIdent, void) OUString aNewName( SvxConfigPageHelper::stripHotKey( pEntry->GetName() ) ); OUString aDesc = CuiResId( RID_SVXSTR_LABEL_NEW_NAME ); - SvxNameDialog aNameDialog(GetDialogFrameWeld(), aNewName, aDesc); + SvxNameDialog aNameDialog(GetFrameWeld(), aNewName, aDesc); aNameDialog.set_help_id(HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM); aNameDialog.set_title(CuiResId(RID_SVXSTR_RENAME_TOOLBAR)); @@ -523,7 +523,7 @@ IMPL_LINK(SvxToolbarConfigPage, ModifyItemHdl, const OString&, rIdent, void) SvxConfigEntry* pEntry = reinterpret_cast(m_xContentsListBox->get_id(nActEntry).toInt64()); - SvxIconSelectorDialog aIconDialog(GetDialogFrameWeld(), + SvxIconSelectorDialog aIconDialog(GetFrameWeld(), GetSaveInData()->GetImageManager(), GetSaveInData()->GetParentImageManager()); @@ -692,7 +692,7 @@ IMPL_LINK_NOARG(SvxToolbarConfigPage, ResetToolbarHdl, weld::Button&, void) SvxConfigEntry* pToolbar = reinterpret_cast(m_xTopLevelListBox->get_id(nSelectionPos).toInt64()); - std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, CuiResId(RID_SVXSTR_CONFIRM_RESTORE_DEFAULT))); if (xQueryBox->run() == RET_YES) @@ -737,7 +737,7 @@ short SvxToolbarConfigPage::QueryReset() OUString label = SvxConfigPageHelper::replaceSaveInName( msg, saveInName ); - std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, label)); return xQueryBox->run(); diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index ca0bfbf574c1..074aba0787c5 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1281,7 +1281,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, TimeOut_Impl, Timer*, void) { // activating the selection, typically "all commands", can take a long time // -> show wait cursor and disable input - weld::WaitObject aWaitObject(GetDialogFrameWeld()); + weld::WaitObject aWaitObject(GetFrameWeld()); weld::TreeView& rTreeView = m_xGroupLBox->get_widget(); SelectHdl(rTreeView); @@ -1298,7 +1298,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, void if ( sCfgName.isEmpty() ) return; - weld::WaitObject aWaitObject(GetDialogFrameWeld()); + weld::WaitObject aWaitObject(GetFrameWeld()); uno::Reference xCfgMgr; uno::Reference xRootStorage; // we must hold the root storage alive, if xCfgMgr is used! @@ -1366,7 +1366,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, void if ( sCfgName.isEmpty() ) return; - weld::WaitObject aWaitObject(GetDialogFrameWeld()); + weld::WaitObject aWaitObject(GetFrameWeld()); uno::Reference xRootStorage; @@ -1436,7 +1436,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( StartFileDialogType nType, const bool bSave = nType == StartFileDialogType::SaveAs; short nDialogType = bSave ? ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION : ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE; - m_pFileDlg.reset(new sfx2::FileDialogHelper(nDialogType, FileDialogFlags::NONE, GetDialogFrameWeld())); + m_pFileDlg.reset(new sfx2::FileDialogHelper(nDialogType, FileDialogFlags::NONE, GetFrameWeld())); m_pFileDlg->SetTitle( rTitle ); m_pFileDlg->AddFilter( aFilterAllStr, FILEDIALOG_FILTER_ALL ); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 4200f2e8238b..097616b1335b 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1438,7 +1438,7 @@ int SvxConfigPage::AddFunction(int nTarget, bool bAllowDuplicates) { if ( entry->GetCommand() == pNewEntryData->GetCommand() ) { - std::unique_ptr xBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Info, VclButtonsType::Ok, CuiResId(RID_SVXSTR_MNUCFG_ALREADY_INCLUDED))); xBox->run(); delete pNewEntryData; diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 00478e2f7bf1..b2b3beadb4a8 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -445,7 +445,7 @@ void SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis, const weld:: ) ) { - AssignComponentDialog aAssignDlg(pThis->GetDialogFrameWeld(), sEventURL); + AssignComponentDialog aAssignDlg(pThis->GetFrameWeld(), sEventURL); short ret = aAssignDlg.run(); if( ret ) @@ -459,7 +459,7 @@ void SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis, const weld:: else if( bAssEnabled ) { // assign pressed - SvxScriptSelectorDialog aDlg(pThis->GetDialogFrameWeld(), false, pThis->GetFrame()); + SvxScriptSelectorDialog aDlg(pThis->GetFrameWeld(), false, pThis->GetFrame()); short ret = aDlg.run(); if ( ret ) { -- cgit