summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-09-25 15:14:55 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-09-26 13:20:59 +0200
commit07d6f4cb864210010ff402b1f16e7fd913f4faec (patch)
treedeab651e9bc7a60d7b1288b47a2a5045b7000e7f /sw
parent5c485d1e9a14696922e0a4bbdecef8e8e8b6c6c0 (diff)
TODO rename to GetFrameWeld
Change-Id: I28527b6773075fe682682a4812cf86bb7ac13180 Reviewed-on: https://gerrit.libreoffice.org/79560 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx4
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx4
-rw-r--r--sw/source/ui/config/optcomp.cxx4
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx8
-rw-r--r--sw/source/ui/envelp/envfmt.cxx4
-rw-r--r--sw/source/ui/envelp/envprt.cxx2
-rw-r--r--sw/source/ui/envelp/label1.cxx2
-rw-r--r--sw/source/ui/envelp/labprt.cxx2
-rw-r--r--sw/source/ui/fldui/flddb.cxx2
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx4
-rw-r--r--sw/source/ui/index/cnttab.cxx8
-rw-r--r--sw/source/ui/table/tabledlg.cxx4
13 files changed, 25 insertions, 25 deletions
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)
{