diff options
66 files changed, 194 insertions, 195 deletions
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index b33a9eb3f3f3..fccdf87c900f 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -558,7 +558,7 @@ bool ScaleTabPage::ShowWarning(const char* pResIdMessage, weld::Widget* pControl if (pResIdMessage == nullptr) return false; - std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Ok, SchResId(pResIdMessage))); xWarn->run(); 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<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> 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<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> 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<weld::MessageDialog> 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<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> 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<SvxConfigEntry*>(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<SvxConfigEntry*>(m_xTopLevelListBox->get_id(nSelectionPos).toInt64()); - std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> 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<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> 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<ui::XUIConfigurationManager> xCfgMgr; uno::Reference<embed::XStorage> 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<embed::XStorage> 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<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> 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 ) { diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 7b197b3967e9..660d7b5bf113 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -786,7 +786,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl, weld::ComboBox&, vo { aLastFilterName = aText; - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/queryupdategalleryfilelistdialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryupdategalleryfilelistdialog.ui")); std::unique_ptr<weld::MessageDialog> xQuery(xBuilder->weld_message_dialog("QueryUpdateFileListDialog")); if (xQuery->run() == RET_YES) SearchFiles(); @@ -795,7 +795,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl, weld::ComboBox&, vo void TPGalleryThemeProperties::SearchFiles() { - std::shared_ptr<SearchProgress> xProgress(new SearchProgress(GetDialogFrameWeld(), this, aURL)); + std::shared_ptr<SearchProgress> xProgress(new SearchProgress(GetFrameWeld(), this, aURL)); aFoundList.clear(); m_xLbxFound->clear(); @@ -848,7 +848,7 @@ void TPGalleryThemeProperties::TakeFiles() { if (m_xLbxFound->count_selected_rows() || (bTakeAll && bEntriesFound)) { - std::shared_ptr<TakeProgress> xTakeProgress(new TakeProgress(GetDialogFrameWeld(), this)); + std::shared_ptr<TakeProgress> xTakeProgress(new TakeProgress(GetFrameWeld(), this)); xTakeProgress->LaunchThread(); weld::DialogController::runAsync(xTakeProgress, [=](sal_Int32 /*nResult*/) { /* no postprocessing needed, pTakeProgress @@ -888,8 +888,8 @@ void TPGalleryThemeProperties::DoPreview() if (!m_aWndPreview.SetGraphic(_aURL)) { - weld::WaitObject aWaitObject(GetDialogFrameWeld()); - ErrorHandler::HandleError(ERRCODE_IO_NOTEXISTSPATH, GetDialogFrameWeld()); + weld::WaitObject aWaitObject(GetFrameWeld()); + ErrorHandler::HandleError(ERRCODE_IO_NOTEXISTSPATH, GetFrameWeld()); } #if HAVE_FEATURE_AVMEDIA else if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), "" ) ) @@ -912,7 +912,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl, weld::Button&, void) if (!m_xLbxFound->count_selected_rows() || !bEntriesFound) { - SvxOpenGraphicDialog aDlg(CuiResId(RID_SVXSTR_KEY_GALLERY_DIR), GetDialogFrameWeld()); + SvxOpenGraphicDialog aDlg(CuiResId(RID_SVXSTR_KEY_GALLERY_DIR), GetFrameWeld()); aDlg.EnableLink(false); aDlg.AsLink(false); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 2e60ef473787..30a8b444ffd3 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -192,7 +192,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl, weld::Button&, void) int nEntry = m_xPathBox->get_selected_index(); if (nEntry != -1) { - std::unique_ptr<weld::MessageDialog> xQuery(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xQuery(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, CuiResId(RID_SVXSTR_QUERY_DELETE_CONFIRM))); if (xQuery->run() == RET_YES) m_xPathBox->remove(nEntry); @@ -265,7 +265,7 @@ void DbRegistrationOptionsPage::insertNewEntry(const OUString& _sName,const OUSt void DbRegistrationOptionsPage::openLinkDialog(const OUString& sOldName, const OUString& sOldLocation, int nEntry) { - ODocumentLinkDialog aDlg(GetDialogFrameWeld(), nEntry == -1); + ODocumentLinkDialog aDlg(GetFrameWeld(), nEntry == -1); aDlg.setLink(sOldName, sOldLocation); aDlg.setNameValidator(LINK( this, DbRegistrationOptionsPage, NameValidator ) ); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index c2526074366c..c3c9098acd89 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -229,7 +229,7 @@ IMPL_LINK_NOARG( SvxDefaultColorOptPage, RemoveChartColor, weld::Button&, void ) { OSL_ENSURE(m_SvxChartColorTableUniquePtr->size() > 1, "don't delete the last chart color"); - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querydeletechartcolordialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletechartcolordialog.ui")); std::unique_ptr<weld::MessageDialog> xQuery(xBuilder->weld_message_dialog("QueryDeleteChartColorDialog")); if (RET_YES == xQuery->run()) diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 3ab68a498949..24b810744e9b 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -822,7 +822,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, weld::Button&, rButton, vo OUString sName; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), + ScopedVclPtr<AbstractSvxNameDialog> aNameDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), sName, CuiResId(RID_SVXSTR_COLOR_CONFIG_SAVE2) )); aNameDlg->SetCheckNameHdl( LINK(this, SvxColorOptionsTabPage, CheckNameHdl_Impl)); aNameDlg->SetText(CuiResId(RID_SVXSTR_COLOR_CONFIG_SAVE1)); @@ -841,7 +841,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, weld::Button&, rButton, vo else { DBG_ASSERT(m_xColorSchemeLB->get_count() > 1, "don't delete the last scheme"); - std::unique_ptr<weld::MessageDialog> xQuery(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xQuery(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, CuiResId(RID_SVXSTR_COLOR_CONFIG_DELETE))); xQuery->set_title(CuiResId(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE)); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index c8d8f0f494ac..bcf1d7a73fab 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1317,7 +1317,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) // display info SolarMutexGuard aGuard; if (svtools::executeRestartDialog( - comphelper::getProcessComponentContext(), GetDialogFrameWeld(), + comphelper::getProcessComponentContext(), GetFrameWeld(), svtools::RESTART_REASON_LANGUAGE_CHANGE)) GetDialogController()->response(RET_OK); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 16785d64c10a..b79a1d9bbd3e 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -89,7 +89,7 @@ IMPL_LINK(SvxProxyTabPage, PortChangedHdl, weld::Entry&, rEdit, void) { if (!isValidPort(rEdit.get_text())) { - std::unique_ptr<weld::MessageDialog> xErrorBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xErrorBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Ok, CuiResId( RID_SVXSTR_OPT_PROXYPORTS))); xErrorBox->run(); @@ -545,7 +545,7 @@ SvxSecurityTabPage::~SvxSecurityTabPage() IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl, weld::Button&, void) { if (!m_xSecOptDlg) - m_xSecOptDlg.reset(new svx::SecurityOptionsDialog(GetDialogFrameWeld(), mpSecOptions.get())); + m_xSecOptDlg.reset(new svx::SecurityOptionsDialog(GetFrameWeld(), mpSecOptions.get())); m_xSecOptDlg->run(); } @@ -580,7 +580,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl, weld::Button&, void) } else { - std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, m_sPasswordStoringDeactivateStr)); xQueryBox->set_default_response(RET_NO); @@ -685,7 +685,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl, weld::Button&, void) if ( xMasterPasswd->isPersistentStoringAllowed() && xMasterPasswd->authorizateWithMasterPassword(xTmpHandler) ) { - svx::WebConnectionInfoDialog aDlg(GetDialogFrameWeld()); + svx::WebConnectionInfoDialog aDlg(GetFrameWeld()); aDlg.run(); } } @@ -696,7 +696,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl, weld::Button&, void) IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl, weld::Button&, void) { if (!mpCertPathDlg) - mpCertPathDlg.reset(new CertPathDialog(GetDialogFrameWeld())); + mpCertPathDlg.reset(new CertPathDialog(GetFrameWeld())); OUString sOrig = mpCertPathDlg->getDirectory(); short nRet = mpCertPathDlg->run(); @@ -713,7 +713,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, TSAURLsPBHdl, weld::Button&, void) { // Unlike the mpCertPathDlg, we *don't* keep the same dialog object around between // invocations. Seems clearer to my little brain that way. - TSAURLsDialog aTSAURLsDlg(GetDialogFrameWeld()); + TSAURLsDialog aTSAURLsDlg(GetFrameWeld()); aTSAURLsDlg.run(); } @@ -945,7 +945,7 @@ IMPL_LINK_NOARG(SvxEMailTabPage, FileDialogHdl_Impl, weld::Button&, void) { if (!pImpl->bROProgram) { - FileDialogHelper aHelper(css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, FileDialogFlags::NONE, GetDialogFrameWeld()); + FileDialogHelper aHelper(css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, FileDialogFlags::NONE, GetFrameWeld()); OUString sPath = m_xMailerURLED->get_text(); if ( sPath.isEmpty() ) sPath = "/usr/bin"; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 308e6cc5ada7..3f58be565ee7 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -188,7 +188,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl, weld::Button&, void) std::vector< OUString > aParameterList; if (!m_xParamDlg) { - m_xParamDlg.reset(new SvxJavaParameterDlg(GetDialogFrameWeld())); + m_xParamDlg.reset(new SvxJavaParameterDlg(GetFrameWeld())); javaFrameworkError eErr = jfw_getVMParameters( &m_parParameters ); if ( JFW_E_NONE == eErr && !m_parParameters.empty() ) { @@ -228,7 +228,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl, weld::Button&, void) if ( !m_xPathDlg ) { - m_xPathDlg.reset(new SvxJavaClassPathDlg(GetDialogFrameWeld())); + m_xPathDlg.reset(new SvxJavaClassPathDlg(GetFrameWeld())); javaFrameworkError eErr = jfw_getUserClassPath( &m_pClassPath ); if ( JFW_E_NONE == eErr ) { @@ -324,7 +324,7 @@ void SvxJavaOptionsPage::ClearJavaList() void SvxJavaOptionsPage::LoadJREs() { #if HAVE_FEATURE_JAVA - weld::WaitObject aWaitObj(GetDialogFrameWeld()); + weld::WaitObject aWaitObj(GetFrameWeld()); javaFrameworkError eErr = jfw_findAllJREs( &m_parJavaInfo ); if ( JFW_E_NONE == eErr ) { @@ -438,14 +438,14 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) } else if ( JFW_E_NOT_RECOGNIZED == eErr ) { - std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Ok, CuiResId(RID_SVXSTR_JRE_NOT_RECOGNIZED))); xBox->run(); } else if ( JFW_E_FAILED_VERSION == eErr ) { - std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Ok, CuiResId(RID_SVXSTR_JRE_FAILED_VERSION))); xBox->run(); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index f2e4b7c8e4e3..bdc8579cc37c 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1316,7 +1316,7 @@ IMPL_LINK(SvxLinguTabPage, ClickHdl_Impl, weld::Button&, rBtn, void) pLinguData.reset( new SvxLinguData_Impl ); SvxLinguData_Impl aOldLinguData( *pLinguData ); - SvxEditModulesDlg aDlg(GetDialogFrameWeld(), *pLinguData); + SvxEditModulesDlg aDlg(GetFrameWeld(), *pLinguData); if (aDlg.run() != RET_OK) *pLinguData = aOldLinguData; @@ -1345,7 +1345,7 @@ IMPL_LINK(SvxLinguTabPage, ClickHdl_Impl, weld::Button&, rBtn, void) else if (m_xLinguDicsNewPB.get() == &rBtn) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNewDictionaryDialog> aDlg(pFact->CreateSvxNewDictionaryDialog(GetDialogFrameWeld())); + ScopedVclPtr<AbstractSvxNewDictionaryDialog> aDlg(pFact->CreateSvxNewDictionaryDialog(GetFrameWeld())); uno::Reference< XDictionary > xNewDic; if ( aDlg->Execute() == RET_OK ) xNewDic = aDlg->GetNewDictionary(); @@ -1374,7 +1374,7 @@ IMPL_LINK(SvxLinguTabPage, ClickHdl_Impl, weld::Button&, rBtn, void) if (xDic.is()) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog(GetDialogFrameWeld(), xDic->getName())); + ScopedVclPtr<VclAbstractDialog> aDlg(pFact->CreateSvxEditDictionaryDialog(GetFrameWeld(), xDic->getName())); aDlg->Execute(); } } @@ -1382,7 +1382,7 @@ IMPL_LINK(SvxLinguTabPage, ClickHdl_Impl, weld::Button&, rBtn, void) } else if (m_xLinguDicsDelPB.get() == &rBtn) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querydeletedictionarydialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletedictionarydialog.ui")); std::unique_ptr<weld::MessageDialog> xQuery(xBuilder->weld_message_dialog("QueryDeleteDictionaryDialog")); if (RET_NO == xQuery->run()) return; @@ -1448,7 +1448,7 @@ IMPL_LINK(SvxLinguTabPage, ClickHdl_Impl, weld::Button&, rBtn, void) if (aData.HasNumericValue()) { sal_uInt16 nRID = aData.GetEntryId(); - OptionsBreakSet aDlg(GetDialogFrameWeld(), nRID); + OptionsBreakSet aDlg(GetFrameWeld(), nRID); aDlg.GetNumericFld().set_value(aData.GetNumericValue()); if (RET_OK == aDlg.run()) { diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index dfc493a4e852..3760e16c83fe 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -482,7 +482,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl, weld::Button&, void) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ScopedVclPtr<AbstractSvxMultiPathDialog> pMultiDlg( - pFact->CreateSvxMultiPathDialog(GetDialogFrameWeld())); + pFact->CreateSvxMultiPathDialog(GetFrameWeld())); OUString sPath( sUser ); if ( !sPath.isEmpty() ) diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index f92d254e30fb..b9a74380d294 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -621,7 +621,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, weld::Button&, void) int nSelEntryPos = m_xCheckLB->get_selected_index(); if (nSelEntryPos == REPLACE_BULLETS || nSelEntryPos == APPLY_NUMBERING) { - SvxCharacterMap aMapDlg(GetDialogFrameWeld(), nullptr, nullptr); + SvxCharacterMap aMapDlg(GetFrameWeld(), nullptr, nullptr); ImpUserData* pUserData = reinterpret_cast<ImpUserData*>(m_xCheckLB->get_id(nSelEntryPos).toInt64()); aMapDlg.SetCharFont(*pUserData->pFont); aMapDlg.SetChar( (*pUserData->pString)[0] ); @@ -642,7 +642,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, weld::Button&, void) else if( MERGE_SINGLE_LINE_PARA == nSelEntryPos ) { // dialog for per cent settings - OfaAutoFmtPrcntSet aDlg(GetDialogFrameWeld()); + OfaAutoFmtPrcntSet aDlg(GetFrameWeld()); aDlg.GetPrcntFld().set_value(nPercent, FieldUnit::PERCENT); if (aDlg.run() == RET_OK) { @@ -1737,7 +1737,7 @@ IMPL_LINK(OfaQuoteTabPage, QuoteHdl, weld::Button&, rBtn, void) else if (&rBtn == m_xDblEndQuotePB.get()) nMode = DBL_END; // start character selection dialog - SvxCharacterMap aMap(GetDialogFrameWeld(), nullptr, nullptr); + SvxCharacterMap aMap(GetFrameWeld(), nullptr, nullptr); aMap.SetCharFont( OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne )); aMap.set_title(nMode < SGL_END ? CuiResId(RID_SVXSTR_STARTQUOTE) : CuiResId(RID_SVXSTR_ENDQUOTE)); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index cb736167d251..afb817602618 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -774,7 +774,7 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl() { SfxErrorContext aContext( ERRCTX_SVX_BACKGROUND, OUString(), - GetDialogFrameWeld(), + GetFrameWeld(), RID_SVXERRCTX, SvxResLocale() ); @@ -1027,7 +1027,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl, weld::Button&, void) bool bHtml = 0 != ( nHtmlMode & HTMLMODE_ON ); OUString aStrBrowse(m_xFindGraphicsFt->get_label()); - pImportDlg.reset(new SvxOpenGraphicDialog(aStrBrowse, GetDialogFrameWeld())); + pImportDlg.reset(new SvxOpenGraphicDialog(aStrBrowse, GetFrameWeld())); if ( bHtml ) pImportDlg->EnableLink(false); pImportDlg->SetPath(aBgdGraphicPath, m_xBtnLink->get_active()); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index c6ac69619522..c97057e502e6 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1156,7 +1156,7 @@ IMPL_LINK(SvxCharNamePage, FontFeatureButtonClicked, weld::Button&, rButton, voi if (!sFontName.isEmpty() && pNameBox) { - cui::FontFeaturesDialog aDialog(GetDialogFrameWeld(), sFontName); + cui::FontFeaturesDialog aDialog(GetFrameWeld(), sFontName); if (aDialog.run() == RET_OK) { pNameBox->set_entry_text(aDialog.getResultFontName()); @@ -3092,7 +3092,7 @@ void SvxCharTwoLinesPage::Initialize() void SvxCharTwoLinesPage::SelectCharacter(weld::TreeView* pBox) { bool bStart = pBox == m_xStartBracketLB.get(); - SvxCharacterMap aDlg(GetDialogFrameWeld(), nullptr, nullptr); + SvxCharacterMap aDlg(GetFrameWeld(), nullptr, nullptr); aDlg.DisableFontSelection(); if (aDlg.run() == RET_OK) diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 7319847e85d6..0a62c5aadeb5 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -305,7 +305,7 @@ void SfxMacroTabPage::AssignDeleteHdl(const weld::Widget* pBtn) IMPL_LINK( SfxMacroTabPage, TimeOut_Impl, Timer*,, void ) { // FillMacroList() can take a long time -> show wait cursor and disable input - weld::Window* pDialog = GetDialogFrameWeld(); + weld::Window* pDialog = GetFrameWeld(); // perhaps the tabpage is part of a SingleTabDialog then pDialog == nullptr std::unique_ptr<weld::WaitObject> xWait(pDialog ? new weld::WaitObject(pDialog) : nullptr); // fill macro list diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 82ba9fb3b5ba..0208d6f9c5b4 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -915,7 +915,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, DoubleClickHdl_Impl, SvtValueSet*, void) IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, weld::Button&, void) { - sfx2::FileDialogHelper aFileDialog(0, FileDialogFlags::NONE, GetDialogFrameWeld()); + sfx2::FileDialogHelper aFileDialog(0, FileDialogFlags::NONE, GetFrameWeld()); aFileDialog.SetTitle(CuiResId(RID_SVXSTR_ADD_IMAGE)); if ( aFileDialog.Execute() != ERRCODE_NONE ) return; @@ -1784,7 +1784,7 @@ IMPL_LINK(SvxNumOptionsTabPage, GraphicHdl_Impl, const OString&, rIdent, void) OUString aGrfName; Size aSize; bool bSucc(false); - SvxOpenGraphicDialog aGrfDlg(CuiResId(RID_SVXSTR_EDIT_GRAPHIC), GetDialogFrameWeld()); + SvxOpenGraphicDialog aGrfDlg(CuiResId(RID_SVXSTR_EDIT_GRAPHIC), GetFrameWeld()); OString sNumber; if (rIdent.startsWith("gallery", &sNumber)) @@ -1862,7 +1862,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl, weld::ToggleButton& if (!m_xGalleryMenu) { m_xGalleryMenu = m_xBuilder->weld_menu("gallerysubmenu"); - weld::WaitObject aWait(GetDialogFrameWeld()); + weld::WaitObject aWait(GetFrameWeld()); if (GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames)) { @@ -1909,7 +1909,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl, weld::ToggleButton& IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl, weld::Button&, void) { - SvxCharacterMap aMap(GetDialogFrameWeld(), nullptr, nullptr); + SvxCharacterMap aMap(GetFrameWeld(), nullptr, nullptr); sal_uInt16 nMask = 1; const vcl::Font* pFmtFont = nullptr; diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 5f161edca0e7..0cc4cf23651d 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -1250,7 +1250,7 @@ DeactivateRC SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) if ( ePaper != PAPER_SCREEN_4_3 && ePaper != PAPER_SCREEN_16_9 && ePaper != PAPER_SCREEN_16_10 && IsMarginOutOfRange() ) { - std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, m_xPrintRangeQueryText->get_label())); xQueryBox->set_default_response(RET_NO); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 13d49dabd1ae..7d1f17be236b 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -525,7 +525,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void) OUString aName( m_pBitmapList->GetBitmap( nPos )->GetName() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), aName, aDesc)); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc)); bool bLoop = true; while( bLoop && pDlg->Execute() == RET_OK ) @@ -546,7 +546,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void) } else { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); xBox->run(); } @@ -561,7 +561,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl, SvxPresetListBox*, void) if( nPos != VALUESET_ITEM_NOTFOUND ) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querydeletebitmapdialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletebitmapdialog.ui")); std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("AskDelBitmapDialog")); if (xQueryBox->run() == RET_YES) @@ -711,7 +711,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyTileOffsetHdl, weld::MetricSpinButton&, IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, weld::Button&, void) { - weld::Window* pDialogFrameWeld = GetDialogFrameWeld(); + weld::Window* pDialogFrameWeld = GetFrameWeld(); SvxOpenGraphicDialog aDlg(CuiResId(RID_SVXSTR_ADD_IMAGE), pDialogFrameWeld); aDlg.EnableLink(false); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 70e36bfb3d09..66fa7f9cd165 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -324,7 +324,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, weld::Button&, void) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), aName, aDesc)); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc)); sal_uInt16 nError = 1; while (pDlg->Execute() == RET_OK) @@ -338,7 +338,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl, weld::Button&, void) break; } - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); std::unique_ptr<weld::MessageDialog> xWarnBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); if (xWarnBox->run() != RET_OK) break; @@ -378,7 +378,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl, weld::Button&, void) aColorDlg.SetColor (aCurrentColor); aColorDlg.SetMode( svtools::ColorPickerMode::Modify ); - if (aColorDlg.Execute(GetDialogFrameWeld()) == RET_OK) + if (aColorDlg.Execute(GetFrameWeld()) == RET_OK) { Color aPreviewColor = aColorDlg.GetColor(); aCurrentColor = aPreviewColor; diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 1dc2e6d7704e..562598dce7d2 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -333,7 +333,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, weld::Button&, void) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), aName, aDesc)); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc)); sal_uInt16 nError = 1; while (pDlg->Execute() == RET_OK) @@ -348,7 +348,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, weld::Button&, void) break; } - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); std::unique_ptr<weld::MessageDialog> xWarnBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); if (xWarnBox->run() != RET_OK) break; @@ -425,7 +425,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void if( nPos != VALUESET_ITEM_NOTFOUND ) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querydeletegradientdialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletegradientdialog.ui")); std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("AskDelGradientDialog")); if (xQueryBox->run() == RET_YES) { @@ -458,7 +458,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void OUString aName( m_pGradientList->GetGradient( nPos )->GetName() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), aName, aDesc)); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc)); bool bLoop = true; while( bLoop && pDlg->Execute() == RET_OK ) @@ -479,7 +479,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void } else { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); xBox->run(); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 26df4b40c5d5..e3813558de3d 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -414,7 +414,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, weld::Button&, void) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), aName, aDesc)); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc)); sal_uInt16 nError = 1; while( pDlg->Execute() == RET_OK ) @@ -428,7 +428,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, weld::Button&, void) break; } - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); std::unique_ptr<weld::MessageDialog> xWarnBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); if (xWarnBox->run() != RET_OK) break; @@ -496,7 +496,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) if( nPos != VALUESET_ITEM_NOTFOUND ) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querydeletehatchdialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletehatchdialog.ui")); std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("AskDelHatchDialog")); if (xQueryBox->run() == RET_YES) { @@ -526,7 +526,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void ) OUString aName( m_pHatchingList->GetHatch( nPos )->GetName() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), aName, aDesc)); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc)); bool bLoop = true; while( bLoop && pDlg->Execute() == RET_OK ) @@ -547,7 +547,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void ) } else { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); xBox->run(); } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 92db00bd2f70..3cc694a7ebc6 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1373,7 +1373,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, MenuCreateHdl_Impl, weld::ToggleButton&, void) if (!m_xGalleryMenu) { m_xGalleryMenu = m_xBuilder->weld_menu("gallerysubmenu"); - weld::WaitObject aWait(GetDialogFrameWeld()); + weld::WaitObject aWait(GetFrameWeld()); // Get gallery entries GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, m_aGrfNames); @@ -1543,7 +1543,7 @@ IMPL_LINK(SvxLineTabPage, GraphicHdl_Impl, const OString&, rIdent, void) } else if (rIdent == "file") { - SvxOpenGraphicDialog aGrfDlg(CuiResId(RID_SVXSTR_EDIT_GRAPHIC), GetDialogFrameWeld()); + SvxOpenGraphicDialog aGrfDlg(CuiResId(RID_SVXSTR_EDIT_GRAPHIC), GetFrameWeld()); aGrfDlg.EnableLink(false); aGrfDlg.AsLink(false); if( !aGrfDlg.Execute() ) diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index f5bac204f13d..7f62d3a716d0 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -201,7 +201,7 @@ void SvxLineDefTabPage::CheckChanges_Impl() m_xLbType2->get_value_changed_from_saved() || m_xMtrDistance->get_value_changed_from_saved() ) { - std::unique_ptr<weld::MessageDialog> xMessDlg(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xMessDlg(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Cancel, CuiResId(RID_SVXSTR_ASK_CHANGE_LINESTYLE))); xMessDlg->set_title(SvxResId(RID_SVXSTR_LINESTYLE)); @@ -507,7 +507,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, weld::Button&, void) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), aName, aDesc)); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc)); bool bLoop = true; while ( bLoop && pDlg->Execute() == RET_OK ) @@ -547,7 +547,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, weld::Button&, void) } else { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); xBox->run(); } @@ -573,7 +573,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, weld::Button&, void) OUString aOldName = aName; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), aName, aDesc)); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc)); long nCount = pDashList->Count(); bool bLoop = true; @@ -615,7 +615,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, weld::Button&, void) } else { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); xBox->run(); } @@ -628,7 +628,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl, weld::Button&, void) int nPos = m_xLbLineStyles->get_active(); if (nPos != -1) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querydeletelinestyledialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletelinestyledialog.ui")); std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("AskDelLineStyleDialog")); if (xQueryBox->run() == RET_YES) { @@ -660,7 +660,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl, weld::Button&, void) if ( *pnDashListState & ChangeType::MODIFIED ) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querysavelistdialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querysavelistdialog.ui")); std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("AskSaveList")); nReturn = xBox->run(); @@ -672,7 +672,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl, weld::Button&, void) if ( nReturn != RET_CANCEL ) { ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, - FileDialogFlags::NONE, GetDialogFrameWeld()); + FileDialogFlags::NONE, GetFrameWeld()); OUString aStrFilterType( "*.sod" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); OUString aPalettePath(SvtPathOptions().GetPalettePath()); @@ -714,7 +714,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl, weld::Button&, void) } else { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querynoloadedfiledialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querynoloadedfiledialog.ui")); std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("NoLoadedFileDialog")); xBox->run(); } @@ -738,7 +738,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl, weld::Button&, void) IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl, weld::Button&, void) { - ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, FileDialogFlags::NONE, GetDialogFrameWeld()); + ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, FileDialogFlags::NONE, GetFrameWeld()); OUString aStrFilterType( "*.sod" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); @@ -780,7 +780,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl, weld::Button&, void) } else { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querynosavefiledialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querynosavefiledialog.ui")); std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("NoSaveFileDialog")); xBox->run(); } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index eac0b4763d5f..3119058f739f 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -164,7 +164,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl() if( aString != m_xLbLineEnds->get_active_text() ) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querychangelineenddialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querychangelineenddialog.ui")); std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("AskChangeLineEndDialog")); if (xQueryBox->run() == RET_YES) ClickModifyHdl_Impl(*m_xBtnModify); @@ -282,12 +282,12 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, weld::Button&, void) // if yes, repeat and demand a new name if ( !bDifferent ) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); std::unique_ptr<weld::MessageDialog> xWarningBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); xWarningBox->run(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), aName, aDesc)); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc)); bool bLoop = true; while( !bDifferent && bLoop && pDlg->Execute() == RET_OK ) @@ -391,7 +391,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, weld::Button&, void) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), aName, aDesc )); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc )); bool bLoop = true; while ( bLoop && pDlg->Execute() == RET_OK ) @@ -422,7 +422,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, weld::Button&, void) } else { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); std::unique_ptr<weld::MessageDialog> xWarningBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); xWarningBox->run(); } @@ -446,7 +446,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, weld::Button&, void) if (nPos != -1) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querydeletelineenddialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletelineenddialog.ui")); std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("AskDelLineEndDialog")); if (xQueryBox->run() == RET_YES) @@ -478,7 +478,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl, weld::Button&, void) if ( *pnLineEndListState & ChangeType::MODIFIED ) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querysavelistdialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querysavelistdialog.ui")); std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("AskSaveList")); nReturn = xBox->run(); @@ -490,7 +490,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl, weld::Button&, void) if ( nReturn != RET_CANCEL ) { ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, - FileDialogFlags::NONE, GetDialogFrameWeld()); + FileDialogFlags::NONE, GetFrameWeld()); OUString aStrFilterType( "*.soe" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); @@ -534,7 +534,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl, weld::Button&, void) } else { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querynoloadedfiledialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querynoloadedfiledialog.ui")); std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("NoLoadedFileDialog")); xBox->run(); } @@ -558,7 +558,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl, weld::Button&, void) IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl, weld::Button&, void) { - ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, FileDialogFlags::NONE, GetDialogFrameWeld()); + ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, FileDialogFlags::NONE, GetFrameWeld()); OUString aStrFilterType( "*.soe" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); @@ -600,7 +600,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl, weld::Button&, void) } else { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querynosavefiledialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querynosavefiledialog.ui")); std::unique_ptr<weld::MessageDialog> xBox(xBuilder->weld_message_dialog("NoSaveFileDialog")); xBox->run(); } diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index ecf3b75bdf2f..6679a411bf48 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -334,7 +334,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, weld::Button&, void) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), aName, aDesc)); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc)); sal_uInt16 nError(1); while( pDlg->Execute() == RET_OK ) @@ -348,7 +348,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, weld::Button&, void) break; } - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); std::unique_ptr<weld::MessageDialog> xWarnBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); if (xWarnBox->run() != RET_OK) break; @@ -436,7 +436,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void) OUString aName(m_pPatternList->GetBitmap(nPos)->GetName()); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetDialogFrameWeld(), aName, aDesc)); + ScopedVclPtr<AbstractSvxNameDialog> pDlg(pFact->CreateSvxNameDialog(GetFrameWeld(), aName, aDesc)); bool bLoop = true; @@ -459,7 +459,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void) } else { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/queryduplicatedialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/queryduplicatedialog.ui")); std::unique_ptr<weld::MessageDialog> xWarnBox(xBuilder->weld_message_dialog("DuplicateNameDialog")); xWarnBox->run(); } @@ -474,7 +474,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void) if( nPos != VALUESET_ITEM_NOTFOUND ) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "cui/ui/querydeletebitmapdialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "cui/ui/querydeletebitmapdialog.ui")); std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("AskDelBitmapDialog")); if (xQueryBox->run() == RET_YES) { diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 4f01b9a4774b..1e7bbf1f7a9a 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -213,7 +213,7 @@ namespace dbaui ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, FileDialogFlags::NONE, aModule.GetFactoryEmptyDocumentURL(SvtModuleOptions::EFactory::CALC) - ,SfxFilterFlags::IMPORT, SfxFilterFlags::NONE, GetDialogFrameWeld()); + ,SfxFilterFlags::IMPORT, SfxFilterFlags::NONE, GetFrameWeld()); askForFileName(aFileDlg); } break; @@ -224,7 +224,7 @@ namespace dbaui ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, FileDialogFlags::NONE, aModule.GetFactoryEmptyDocumentURL(SvtModuleOptions::EFactory::WRITER), - SfxFilterFlags::IMPORT, SfxFilterFlags::NONE, GetDialogFrameWeld()); + SfxFilterFlags::IMPORT, SfxFilterFlags::NONE, GetFrameWeld()); askForFileName(aFileDlg); } break; @@ -234,7 +234,7 @@ namespace dbaui OUString sFilterName(DBA_RES (STR_MSACCESS_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, - FileDialogFlags::NONE, GetDialogFrameWeld()); + FileDialogFlags::NONE, GetFrameWeld()); aFileDlg.AddFilter(sFilterName,sExt); aFileDlg.SetCurrentFilter(sFilterName); askForFileName(aFileDlg); @@ -246,7 +246,7 @@ namespace dbaui OUString sFilterName2(DBA_RES (STR_MSACCESS_2007_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, - FileDialogFlags::NONE, GetDialogFrameWeld()); + FileDialogFlags::NONE, GetFrameWeld()); aFileDlg.AddFilter(sFilterName2,sAccdb); aFileDlg.SetCurrentFilter(sFilterName2); askForFileName(aFileDlg); @@ -275,7 +275,7 @@ namespace dbaui OUString sNewDataSource; HWND hWnd = 0; - weld::Window* pDialog = GetDialogFrameWeld(); + weld::Window* pDialog = GetFrameWeld(); css::uno::Reference<css::awt::XSystemDependentWindowPeer> xSysDepWin(pDialog->GetXWindow(), css::uno::UNO_QUERY); if (xSysDepWin.is()) { @@ -320,7 +320,7 @@ namespace dbaui aProfiles.insert(pArray[index]); // execute the select dialog - ODatasourceSelectDialog aSelector(GetDialogFrameWeld(), aProfiles); + ODatasourceSelectDialog aSelector(GetFrameWeld(), aProfiles); OUString sOldProfile=getURLNoPrefix(); if (!sOldProfile.isEmpty()) @@ -338,7 +338,7 @@ namespace dbaui OUString sFilterName(DBA_RES (STR_FIREBIRD_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, - FileDialogFlags::NONE, GetDialogFrameWeld()); + FileDialogFlags::NONE, GetFrameWeld()); aFileDlg.AddFilter(sFilterName,sExt); aFileDlg.SetCurrentFilter(sFilterName); askForFileName(aFileDlg); @@ -363,7 +363,7 @@ namespace dbaui OUString sFilterName(DBA_RES (STR_FIREBIRD_FILTERNAME)); ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, - FileDialogFlags::NONE, GetDialogFrameWeld()); + FileDialogFlags::NONE, GetFrameWeld()); aFileDlg.AddFilter(sFilterName,sExt); aFileDlg.SetCurrentFilter(sFilterName); askForFileName(aFileDlg); @@ -479,7 +479,7 @@ namespace dbaui sQuery = sQuery.replaceFirst("$path$", aTransformer.get(OFileNotation::N_SYSTEM)); m_bUserGrabFocus = false; - std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, sQuery)); xQueryBox->set_default_response(RET_YES); @@ -500,7 +500,7 @@ namespace dbaui m_bUserGrabFocus = false; - std::unique_ptr<weld::MessageDialog> xWhatToDo(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xWhatToDo(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::NONE, sQuery)); xWhatToDo->add_button(GetStandardText(StandardButtonType::Retry), RET_RETRY); @@ -688,7 +688,7 @@ namespace dbaui { OUString sFile = DBA_RES( STR_FILE_DOES_NOT_EXIST ); sFile = sFile.replaceFirst("$file$", aTransformer.get(OFileNotation::N_SYSTEM)); - OSQLWarningBox aWarning(GetDialogFrameWeld(), sFile); + OSQLWarningBox aWarning(GetFrameWeld(), sFile); aWarning.run(); setURLNoPrefix(sOldPath); SetRoadmapStateValue(false); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 4dacff794c91..2fec1cee16b6 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -284,7 +284,7 @@ namespace dbaui const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; const MessageType mt = bSuccess ? MessageType::Info : MessageType::Error; - OSQLMessageBox aMsg(GetDialogFrameWeld(), DBA_RES(pMessage), OUString(), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, mt); + OSQLMessageBox aMsg(GetFrameWeld(), DBA_RES(pMessage), OUString(), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, mt); aMsg.run(); } bool OConnectionTabPage::checkTestConnection() diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 86ec9aba7eeb..5172e0126e65 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -497,7 +497,7 @@ using namespace ::com::sun::star; #endif const char *pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; const MessageType mt = bSuccess ? MessageType::Info : MessageType::Error; - OSQLMessageBox aMsg(GetDialogFrameWeld(), DBA_RES(pMessage), OUString(), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, mt); + OSQLMessageBox aMsg(GetFrameWeld(), DBA_RES(pMessage), OUString(), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, mt); aMsg.run(); } @@ -609,7 +609,7 @@ using namespace ::com::sun::star; #endif const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; const MessageType mt = bSuccess ? MessageType::Info : MessageType::Error; - OSQLMessageBox aMsg(GetDialogFrameWeld(), DBA_RES(pMessage), OUString(), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, mt); + OSQLMessageBox aMsg(GetFrameWeld(), DBA_RES(pMessage), OUString(), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, mt); aMsg.run(); } diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 7e08b356be8b..691241d54951 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -191,7 +191,7 @@ IMPL_LINK(OUserAdmin, UserHdl, weld::Button&, rButton, void) { if (&rButton == m_xNEWUSER.get()) { - SfxPasswordDialog aPwdDlg(GetDialogFrameWeld()); + SfxPasswordDialog aPwdDlg(GetFrameWeld()); aPwdDlg.ShowExtras(SfxShowExtras::ALL); if (aPwdDlg.run()) { @@ -218,7 +218,7 @@ IMPL_LINK(OUserAdmin, UserHdl, weld::Button&, rButton, void) if(xUser.is()) { OUString sNewPassword,sOldPassword; - OPasswordDialog aDlg(GetDialogFrameWeld(), sName); + OPasswordDialog aDlg(GetFrameWeld(), sName); if (aDlg.run() == RET_OK) { sNewPassword = aDlg.GetNewPassword(); @@ -237,7 +237,7 @@ IMPL_LINK(OUserAdmin, UserHdl, weld::Button&, rButton, void) Reference<XDrop> xDrop(m_xUsers,UNO_QUERY); if(xDrop.is()) { - std::unique_ptr<weld::MessageDialog> xQry(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xQry(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, DBA_RES(STR_QUERY_USERADMIN_DELETE_USER))); if (xQry->run() == RET_YES) diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 5a88cba1771c..d4d358338fbc 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -134,7 +134,7 @@ namespace dbaui // show an error message OUString sError(DBA_RES(STR_COULD_NOT_LOAD_ODBC_LIB)); sError = sError.replaceFirst("#lib#", aEnumeration.getLibraryName()); - std::unique_ptr<weld::MessageDialog> xDialog(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xDialog(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Ok, sError)); xDialog->run(); @@ -144,7 +144,7 @@ namespace dbaui { aEnumeration.getDatasourceNames(aOdbcDatasources); // execute the select dialog - ODatasourceSelectDialog aSelector(GetDialogFrameWeld(), aOdbcDatasources); + ODatasourceSelectDialog aSelector(GetFrameWeld(), aOdbcDatasources); if (!_sCurr.isEmpty()) aSelector.Select(_sCurr); if (RET_OK == aSelector.run()) @@ -272,7 +272,7 @@ namespace dbaui eImage = MessageType::Error; aMessage = DBA_RES(STR_CONNECTION_NO_SUCCESS); } - OSQLMessageBox aMsg(GetDialogFrameWeld(), sTitle, aMessage, MessBoxStyle::Ok, eImage); + OSQLMessageBox aMsg(GetFrameWeld(), sTitle, aMessage, MessBoxStyle::Ok, eImage); aMsg.run(); } if ( !bSuccess ) diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index b41f59bc7260..07055200a3f3 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -216,7 +216,7 @@ namespace dbaui { if (m_xIndexes.get() == &rButton) { - ODbaseIndexDialog aIndexDialog(GetDialogFrameWeld(), m_sDsn); + ODbaseIndexDialog aIndexDialog(GetFrameWeld(), m_sDsn); aIndexDialog.run(); } else @@ -475,7 +475,7 @@ namespace dbaui #endif const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS; const MessageType mt = bSuccess ? MessageType::Info : MessageType::Error; - OSQLMessageBox aMsg(GetDialogFrameWeld(), DBA_RES(pMessage), OUString(), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, mt); + OSQLMessageBox aMsg(GetFrameWeld(), DBA_RES(pMessage), OUString(), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, mt); aMsg.run(); } diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 97cf3ef08625..c99cd126b12e 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -649,7 +649,7 @@ namespace dbaui { ::sfx2::FileDialogHelper aFileDlg( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, - FileDialogFlags::NONE, "sdatabase", SfxFilterFlags::NONE, SfxFilterFlags::NONE, GetDialogFrameWeld()); + FileDialogFlags::NONE, "sdatabase", SfxFilterFlags::NONE, SfxFilterFlags::NONE, GetFrameWeld()); std::shared_ptr<const SfxFilter> pFilter = getStandardDatabaseFilter(); if ( pFilter ) { @@ -664,7 +664,7 @@ namespace dbaui if ( !pFilter->GetWildcard().Matches(sPath) ) { OUString sMessage(DBA_RES(STR_ERR_USE_CONNECT_TO)); - std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Info, VclButtonsType::Ok, sMessage)); xInfoBox->run(); diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index fb42e7ec49ab..76f9f12fefb3 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -211,7 +211,7 @@ namespace dbaui try { - weld::WaitObject aWaitCursor(GetDialogFrameWeld()); + weld::WaitObject aWaitCursor(GetFrameWeld()); Reference<XPropertySet> xProp = m_pTablesDlg->getCurrentDataSource(); OSL_ENSURE(xProp.is(),"No data source set!"); @@ -253,7 +253,7 @@ namespace dbaui if (aErrorInfo.isValid()) { // establishing the connection failed. Show an error window and exit. - OSQLMessageBox aMessageBox(GetDialogFrameWeld(), aErrorInfo); + OSQLMessageBox aMessageBox(GetFrameWeld(), aErrorInfo); aMessageBox.run(); m_xTables->set_sensitive(false); m_xTablesList->GetWidget().clear(); diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 7b24639dd4ae..e5e93b8ae461 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1188,7 +1188,7 @@ IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, weld::Button&, void) ErrorHandler::GetErrorString(ERRCODE_IO_NOTSUPPORTED, msg); //TODO: handle failure std::unique_ptr<weld::MessageDialog>( Application::CreateMessageDialog( - GetDialogFrameWeld(), VclMessageType::Error, VclButtonsType::Ok, msg)) + GetFrameWeld(), VclMessageType::Error, VclButtonsType::Ok, msg)) ->run(); return; } @@ -1477,7 +1477,7 @@ IMPL_LINK_NOARG(ImpPDFTabSigningPage, ClickmaPbSignCertSelect, weld::Button&, vo Reference< security::XDocumentDigitalSignatures > xSigner( security::DocumentDigitalSignatures::createWithVersion( comphelper::getProcessComponentContext(), "1.2" ) ); - xSigner->setParentWindow(GetDialogFrameWeld()->GetXWindow()); + xSigner->setParentWindow(GetFrameWeld()->GetXWindow()); // The use may provide a description while choosing a certificate. OUString aDescription; diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 0245ff6bbd6c..dbaef0e7dc32 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -229,8 +229,7 @@ public: OString GetConfigId() const { return GetHelpId(); } bool IsVisible() const { return m_xContainer->get_visible(); } - //TODO rename to GetFrameWeld when SfxTabPage doesn't inherit from anything - weld::Window* GetDialogFrameWeld() const; + weld::Window* GetFrameWeld() const; }; #endif 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<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> 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<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetDialogFrameWeld(), VclMessageType::Warning, + std::unique_ptr<weld::MessageDialog> 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<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> 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<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> 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<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> 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<SfxAbstractTabDialog> 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 ) diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 7e86544a8fbb..6fc4c2b8e998 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -376,7 +376,7 @@ void SdTPAction::OpenFileDialog() if (bSound) { - SdOpenSoundFileDialog aFileDialog(GetDialogFrameWeld()); + SdOpenSoundFileDialog aFileDialog(GetFrameWeld()); if( !aFile.isEmpty() ) aFileDialog.SetPath( aFile ); @@ -390,7 +390,7 @@ void SdTPAction::OpenFileDialog() else if (bMacro) { // choose macro dialog - OUString aScriptURL = SfxApplication::ChooseScript(GetDialogFrameWeld()); + OUString aScriptURL = SfxApplication::ChooseScript(GetFrameWeld()); if ( !aScriptURL.isEmpty() ) { @@ -401,7 +401,7 @@ void SdTPAction::OpenFileDialog() { sfx2::FileDialogHelper aFileDialog( ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, - FileDialogFlags::NONE, GetDialogFrameWeld()); + FileDialogFlags::NONE, GetFrameWeld()); if (bDocument && aFile.isEmpty()) aFile = SvtPathOptions().GetWorkPath(); @@ -626,7 +626,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl, weld::Widget&, void) if( aMedium.IsStorage() ) { - weld::WaitObject aWait(GetDialogFrameWeld()); + weld::WaitObject aWait(GetFrameWeld()); // is it a draw file? // open with READ, otherwise the Storages might write into the file! diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index e6a910f11f47..d26132af1496 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -317,7 +317,7 @@ DeactivateRC SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet ) return DeactivateRC::LeavePage; } - std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::YesNo, SdResId(STR_WARN_SCALE_FAIL))); if (xWarn->run() == RET_YES) diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index a37f75144364..e826b0f68409 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -767,7 +767,7 @@ IMPL_LINK_NOARG(SfxDocumentPage, SignatureHdl, weld::Button&, void) SfxObjectShell* pDoc = SfxObjectShell::Current(); if( pDoc ) { - pDoc->SignDocumentContent(GetDialogFrameWeld()); + pDoc->SignDocumentContent(GetFrameWeld()); ImplUpdateSignatures(); } @@ -787,7 +787,7 @@ IMPL_LINK_NOARG(SfxDocumentPage, ChangePassHdl, weld::Button&, void) if (!pFilter) break; - sfx2::RequestPassword(pFilter, OUString(), pMedSet, GetDialogFrameWeld()->GetXWindow()); + sfx2::RequestPassword(pFilter, OUString(), pMedSet, GetFrameWeld()->GetXWindow()); pShell->SetModified(); } while (false); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 22e6b6165615..b9e5a4e3d117 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -589,7 +589,7 @@ DeactivateRC SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) if (!pStyle->SetName(comphelper::string::stripStart(m_xName->get_text(), ' '))) { - std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Info, VclButtonsType::Ok, SfxResId(STR_TABPAGE_INVALIDNAME))); xBox->run(); @@ -608,7 +608,7 @@ DeactivateRC SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) { if ( !pStyle->SetFollow( aFollowEntry ) ) { - std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Info, VclButtonsType::Ok, SfxResId(STR_TABPAGE_INVALIDSTYLE))); xBox->run(); @@ -630,7 +630,7 @@ DeactivateRC SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) { if ( !pStyle->SetParent( aParentEntry ) ) { - std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Info, VclButtonsType::Ok, SfxResId(STR_TABPAGE_INVALIDPARENT))); xBox->run(); diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 169bce179463..53197688fa68 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -320,7 +320,7 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, RecordChangesCBToggleHdl, weld::ToggleButt bool bAlreadyDone = false; if (!m_bEndRedliningWarningDone) { - std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(m_rMyTabPage.GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(m_rMyTabPage.GetFrameWeld(), VclMessageType::Warning, VclButtonsType::YesNo, m_aEndRedliningWarning)); xWarn->set_default_response(RET_NO); @@ -337,7 +337,7 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, RecordChangesCBToggleHdl, weld::ToggleButt OUString aPasswordText; // dialog canceled or no password provided - if (!lcl_GetPassword( m_rMyTabPage.GetDialogFrameWeld(), false, aPasswordText )) + if (!lcl_GetPassword( m_rMyTabPage.GetFrameWeld(), false, aPasswordText )) bAlreadyDone = true; // ask for password and if dialog is canceled or no password provided return @@ -375,7 +375,7 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl, weld::Button&, void if (bNeedPassword) { // ask for password and if dialog is canceled or no password provided return - if (!lcl_GetPassword(m_rMyTabPage.GetDialogFrameWeld(), bNewProtection, aPasswordText)) + if (!lcl_GetPassword(m_rMyTabPage.GetFrameWeld(), bNewProtection, aPasswordText)) return; // provided password still needs to be checked? diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 73338d864c95..3704cd1f3888 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -289,7 +289,7 @@ OString SfxTabPage::GetHelpId() const return OString(); } -weld::Window* SfxTabPage::GetDialogFrameWeld() const +weld::Window* SfxTabPage::GetFrameWeld() const { if (m_pDialogController) return m_pDialogController->getDialog(); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 4eaf4244944b..32430371fe8e 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -493,12 +493,12 @@ void SvxHFPage::TurnOn(const weld::ToggleButton* pBox) short nResult; if (nId == SID_ATTR_PAGE_HEADERSET) { - DeleteHeaderDialog aDlg(GetDialogFrameWeld()); + DeleteHeaderDialog aDlg(GetFrameWeld()); nResult = aDlg.run(); } else { - DeleteFooterDialog aDlg(GetDialogFrameWeld()); + DeleteFooterDialog aDlg(GetFrameWeld()); nResult = aDlg.run(); } bDelete = nResult == RET_YES; @@ -620,7 +620,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, weld::Button&, void) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxBorderBackgroundDlg( - GetDialogFrameWeld(), + GetFrameWeld(), *pBBSet, mbEnableDrawingLayerFillStyles)); diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 28269c65852c..9b423ca7570e 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -292,7 +292,7 @@ std::unique_ptr<SfxTabPage> SwCharURLPage::Create(weld::Container* pPage, weld:: IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl, weld::Button&, void) { FileDialogHelper aDlgHelper(TemplateDescription::FILEOPEN_SIMPLE, - FileDialogFlags::NONE, GetDialogFrameWeld()); + FileDialogFlags::NONE, GetFrameWeld()); if( aDlgHelper.Execute() == ERRCODE_NONE ) { const Reference<XFilePicker3>& xFP = aDlgHelper.GetFilePicker(); @@ -302,7 +302,7 @@ IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl, weld::Button&, void) IMPL_LINK_NOARG(SwCharURLPage, EventHdl, weld::Button&, void) { - bModified |= SwMacroAssignDlg::INetFormatDlg(GetDialogFrameWeld(), + bModified |= SwMacroAssignDlg::INetFormatDlg(GetFrameWeld(), ::GetActiveView()->GetWrtShell(), pINetItem); } diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 9a3546409763..1e3946208233 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -187,7 +187,7 @@ IMPL_LINK_NOARG(SwMailConfigPage, AuthenticationHdl, weld::Button&, void) { m_pConfigItem->SetMailAddress(m_xAddressED->get_text()); - SwAuthenticationSettingsDialog aDlg(GetDialogFrameWeld(), *m_pConfigItem); + SwAuthenticationSettingsDialog aDlg(GetFrameWeld(), *m_pConfigItem); aDlg.run(); } @@ -206,7 +206,7 @@ IMPL_LINK(SwMailConfigPage, SecureHdl, weld::ToggleButton&, rBox, void) } SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pParent) - : SfxDialogController(pParent->GetDialogFrameWeld(), "modules/swriter/ui/testmailsettings.ui", "TestMailSettings") + : SfxDialogController(pParent->GetFrameWeld(), "modules/swriter/ui/testmailsettings.ui", "TestMailSettings") , m_bStop(false) , m_pParent(pParent) , m_xStopPB(m_xBuilder->weld_button("stop")) diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 5561b2a24a4a..9ae91126e608 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -273,7 +273,7 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, SelectHdl, weld::ComboBox&, void) IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl, weld::Button&, void) { - std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "modules/swriter/ui/querydefaultcompatdialog.ui")); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "modules/swriter/ui/querydefaultcompatdialog.ui")); std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("QueryDefaultCompatDialog")); if (xQueryBox->run() == RET_YES) { @@ -447,7 +447,7 @@ bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* ) { SolarMutexGuard aGuard; if (svtools::executeRestartDialog(comphelper::getProcessComponentContext(), - GetDialogFrameWeld(), svtools::RESTART_REASON_MSCOMPATIBLE_FORMS_MENU)) + GetFrameWeld(), svtools::RESTART_REASON_MSCOMPATIBLE_FORMS_MENU)) { GetDialogController()->response(RET_OK); } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index ad94bc3e7026..d0f91f6922c2 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1642,7 +1642,7 @@ void SwInsertSectionTabPage::ChangePasswd(bool bChange) { if(!m_aNewPasswd.hasElements() || bChange) { - SfxPasswordDialog aPasswdDlg(GetDialogFrameWeld()); + SfxPasswordDialog aPasswdDlg(GetFrameWeld()); aPasswdDlg.ShowExtras(SfxShowExtras::CONFIRM); if (RET_OK == aPasswdDlg.run()) { @@ -1653,7 +1653,7 @@ void SwInsertSectionTabPage::ChangePasswd(bool bChange) } else { - std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Info, VclButtonsType::Ok, SwResId(STR_WRONG_PASSWD_REPEAT))); xInfoBox->run(); @@ -1691,7 +1691,7 @@ IMPL_LINK(SwInsertSectionTabPage, UseFileHdl, weld::ToggleButton&, rButton, void { if (m_pWrtSh->HasSelection()) { - std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Question, VclButtonsType::YesNo, SwResId(STR_QUERY_CONNECT))); if (RET_NO == xQueryBox->run()) @@ -1722,7 +1722,7 @@ IMPL_LINK(SwInsertSectionTabPage, UseFileHdl, weld::ToggleButton&, rButton, void IMPL_LINK_NOARG(SwInsertSectionTabPage, FileSearchHdl, weld::Button&, void) { - m_pDocInserter.reset(new ::sfx2::DocumentInserter(GetDialogFrameWeld(), "swriter")); + m_pDocInserter.reset(new ::sfx2::DocumentInserter(GetFrameWeld(), "swriter")); m_pDocInserter->StartExecuteModal( LINK( this, SwInsertSectionTabPage, DlgClosedHdl ) ); } diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 9e01b25df43c..a518440e462a 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -254,7 +254,7 @@ void SwEnvFormatPage::Edit(const OString& rIdent, bool bSender) SwAbstractDialogFactory& rFact = swui::GetFactory(); const OUString sFormatStr = pColl->GetName(); - ScopedVclPtr<SfxAbstractTabDialog> pDlg(rFact.CreateSwCharDlg(GetDialogFrameWeld(), pSh->GetView(), aTmpSet, SwCharDlgMode::Env, &sFormatStr)); + ScopedVclPtr<SfxAbstractTabDialog> pDlg(rFact.CreateSwCharDlg(GetFrameWeld(), pSh->GetView(), aTmpSet, SwCharDlgMode::Env, &sFormatStr)); if (pDlg->Execute() == RET_OK) { SfxItemSet aOutputSet( *pDlg->GetOutputItemSet() ); @@ -290,7 +290,7 @@ void SwEnvFormatPage::Edit(const OString& rIdent, bool bSender) ::PrepareBoxInfo( aTmpSet, *pSh ); const OUString sFormatStr = pColl->GetName(); - SwParaDlg aDlg(GetDialogFrameWeld(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &sFormatStr); + SwParaDlg aDlg(GetFrameWeld(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &sFormatStr); if (aDlg.run() == RET_OK) { diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 5e4c74864eae..064e70a4e45c 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -118,7 +118,7 @@ IMPL_LINK(SwEnvPrtPage, ButtonHdl, weld::Button&, rBtn, void) // Call printer setup if (m_xPrt) { - PrinterSetupDialog aDlg(GetDialogFrameWeld()); + PrinterSetupDialog aDlg(GetFrameWeld()); aDlg.SetPrinter(m_xPrt); aDlg.run(); rBtn.grab_focus(); diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index da4e0c5ffdc4..b360c862e780 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -238,7 +238,7 @@ SwLabPage::SwLabPage(weld::Container* pPage, weld::DialogController* pController , m_xHiddenSortTypeBox(m_xBuilder->weld_combo_box("hiddentype")) , m_xFormatInfo(m_xBuilder->weld_label("formatinfo")) { - weld::WaitObject aWait(GetDialogFrameWeld()); + weld::WaitObject aWait(GetFrameWeld()); m_xWritingEdit->set_size_request(m_xWritingEdit->get_approximate_digit_width() * 30, m_xWritingEdit->get_height_rows(10)); diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 7edfa3167fe9..427616e1bfc6 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -68,7 +68,7 @@ IMPL_LINK( SwLabPrtPage, CountHdl, weld::Button&, rButton, void ) if (!pPrinter) pPrinter = VclPtr<Printer>::Create(); - PrinterSetupDialog aDlg(GetDialogFrameWeld()); + PrinterSetupDialog aDlg(GetFrameWeld()); aDlg.SetPrinter(pPrinter); aDlg.run(); rButton.grab_focus(); diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index d6e49e76c847..1dc625e19298 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -488,7 +488,7 @@ IMPL_LINK_NOARG(SwFieldDBPage, AddDBHdl, weld::Button&, void) pSh = ::GetActiveWrtShell(); OUString sNewDB - = SwDBManager::LoadAndRegisterDataSource(GetDialogFrameWeld(), pSh->GetDoc()->GetDocShell()); + = SwDBManager::LoadAndRegisterDataSource(GetFrameWeld(), pSh->GetDoc()->GetDocShell()); if(!sNewDB.isEmpty()) { m_xDatabaseTLB->AddDataSource(sNewDB); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index ab0f4cc95a92..1298f5b5e398 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -508,7 +508,7 @@ void SwFieldFuncPage::UpdateSubType() // call MacroBrowser, fill Listbox with Macros IMPL_LINK_NOARG( SwFieldFuncPage, MacroHdl, weld::Button&, void) { - if (GetFieldMgr().ChooseMacro(GetDialogFrameWeld())) + if (GetFieldMgr().ChooseMacro(GetFrameWeld())) UpdateSubType(); } diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 60fd1f2660b3..9c27c10d27d4 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2505,7 +2505,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl, weld::Button&, void) { m_xGrfDlg.reset(new FileDialogHelper( ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW, - FileDialogFlags::Graphic, GetDialogFrameWeld())); + FileDialogFlags::Graphic, GetFrameWeld())); m_xGrfDlg->SetTitle(m_xLinkFrame->get_label()); } m_xGrfDlg->SetDisplayDirectory(m_xConnectED->get_text()); @@ -2755,7 +2755,7 @@ std::unique_ptr<SfxTabPage> SwFrameURLPage::Create(weld::Container* pPage, weld: IMPL_LINK_NOARG(SwFrameURLPage, InsertFileHdl, weld::Button&, void) { FileDialogHelper aDlgHelper(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, - FileDialogFlags::NONE, GetDialogFrameWeld()); + FileDialogFlags::NONE, GetFrameWeld()); uno::Reference < ui::dialogs::XFilePicker3 > xFP = aDlgHelper.GetFilePicker(); try diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index e402eccf0513..8649a94ae83e 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1341,7 +1341,7 @@ void SwTOXSelectTabPage::LanguageHdl(const weld::ComboBox* pBox) IMPL_LINK_NOARG(SwTOXSelectTabPage, AddStylesHdl, weld::Button&, void) { - SwAddStylesDlg_Impl aDlg(GetDialogFrameWeld(), static_cast<SwMultiTOXTabDialog*>(GetDialogController())->GetWrtShell(), + SwAddStylesDlg_Impl aDlg(GetFrameWeld(), static_cast<SwMultiTOXTabDialog*>(GetDialogController())->GetWrtShell(), aStyleArr); aDlg.run(); ModifyHdl(); @@ -1358,7 +1358,7 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, const OString&, rIdent, void) if (rIdent == "open") { - sAutoMarkURL = lcl_CreateAutoMarkFileDlg(GetDialogFrameWeld(), + sAutoMarkURL = lcl_CreateAutoMarkFileDlg(GetFrameWeld(), sAutoMarkURL, sAutoMarkType, true); } else if (rIdent == "new" || rIdent == "edit") @@ -1366,13 +1366,13 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, const OString&, rIdent, void) bool bNew = (rIdent == "new"); if (bNew) { - sAutoMarkURL = lcl_CreateAutoMarkFileDlg(GetDialogFrameWeld(), + sAutoMarkURL = lcl_CreateAutoMarkFileDlg(GetFrameWeld(), sAutoMarkURL, sAutoMarkType, false); if (sAutoMarkURL.isEmpty()) return; } - SwAutoMarkDlg_Impl aAutoMarkDlg(GetDialogFrameWeld(), sAutoMarkURL, bNew); + SwAutoMarkDlg_Impl aAutoMarkDlg(GetFrameWeld(), sAutoMarkURL, bNew); if (RET_OK != aAutoMarkDlg.run() && bNew) sAutoMarkURL = sSaveAutoMarkURL; } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 09062a61ee17..cd3761e7235c 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -590,7 +590,7 @@ DeactivateRC SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) OUString sTableName = m_xNameED->get_text(); if(sTableName.indexOf(' ') != -1) { - std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetDialogFrameWeld(), + std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Info, VclButtonsType::Ok, SwResId(STR_WRONG_TABLENAME))); xInfoBox->run(); @@ -744,7 +744,7 @@ IMPL_LINK_NOARG(SwTableColumnPage, SizeHdl, void*, void) //tdf#120420 keeping showing column width fields unless //the dialog begins to grow, then stop adding them - weld::Window* pTopLevel = GetDialogFrameWeld(); + weld::Window* pTopLevel = GetFrameWeld(); Size aOrigSize = pTopLevel->get_preferred_size(); for (sal_uInt16 i = 0; i < MET_FIELDS; ++i) { |