diff options
Diffstat (limited to 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/addresslistdialog.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmdocselectpage.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmgreetingspage.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 88aabd52855e..56b4801ddf55 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -120,7 +120,7 @@ static OUString lcl_getFlatURL( uno::Reference<beans::XPropertySet> const & xSou } SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) - : SfxDialogController(pParent->GetFrameWeld(), "modules/swriter/ui/selectaddressdialog.ui", "SelectAddressDialog") + : SfxDialogController(pParent->GetWizard()->getDialog(), "modules/swriter/ui/selectaddressdialog.ui", "SelectAddressDialog") , m_bInSelectHdl(false) , m_xAddressPage(pParent) , m_xDescriptionFI(m_xBuilder->weld_label("desc")) diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 8c50dd1f454a..ad9772abd592 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -183,7 +183,7 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl, weld::Button&, catch (const uno::Exception& e) { TOOLS_WARN_EXCEPTION("sw", ""); - std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(), + std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(m_pWizard->getDialog(), VclMessageType::Warning, VclButtonsType::Ok, e.Message)); xBox->run(); } @@ -191,7 +191,7 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressListHdl_Impl, weld::Button&, IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, SettingsHdl_Impl, weld::Button&, void) { - SwSelectAddressBlockDialog aDlg(GetFrameWeld(), m_pWizard->GetConfigItem()); + SwSelectAddressBlockDialog aDlg(m_pWizard->getDialog(), m_pWizard->GetConfigItem()); SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem(); aDlg.SetAddressBlocks(rConfig.GetAddressBlocks(), m_xSettings->GetSelectedAddress()); aDlg.SetSettings(rConfig.IsIncludeCountry(), rConfig.GetExcludeCountry()); diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index dcf285bc5899..80cb8403a337 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -101,7 +101,7 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, weld::Button&, rButton, void) if(bTemplate) { m_xLoadTemplateRB->set_active(true); - SfxNewFileDialog aNewFileDlg(GetFrameWeld(), SfxNewFileDialogMode::NONE); + SfxNewFileDialog aNewFileDlg(m_pWizard->getDialog(), SfxNewFileDialogMode::NONE); sal_uInt16 nRet = aNewFileDlg.run(); if(RET_TEMPLATE_LOAD == nRet) bTemplate = false; @@ -114,7 +114,7 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, weld::Button&, rButton, void) if(!bTemplate) { sfx2::FileDialogHelper aDlgHelper(TemplateDescription::FILEOPEN_SIMPLE, - FileDialogFlags::NONE, GetFrameWeld()); + FileDialogFlags::NONE, m_pWizard->getDialog()); Reference < XFilePicker3 > xFP = aDlgHelper.GetFilePicker(); xFP->setDisplayDirectory( SvtPathOptions().GetWorkPath() ); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index fe4b57ca5be5..0aa4470ea078 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -108,7 +108,7 @@ void SwGreetingsHandler::UpdatePreview() IMPL_LINK_NOARG(SwMailMergeGreetingsPage, AssignHdl_Impl, weld::Button&, void) { const OUString sPreview(m_xFemaleLB->get_active_text() + "\n" + m_xMaleLB->get_active_text()); - SwAssignFieldsDialog aDlg(GetFrameWeld(), m_rConfigItem, sPreview, false); + SwAssignFieldsDialog aDlg(m_pWizard->getDialog(), m_rConfigItem, sPreview, false); if (RET_OK == aDlg.run()) { UpdatePreview(); |