[Libreoffice-commits] core.git: cui/source sw/source

[Caolán McNamara (via logerrit)]

 cui/source/customize/acccfg.cxx  |    2 +-
 cui/source/customize/macropg.cxx |    2 +-
 sw/source/ui/frmdlg/frmpage.cxx  |    2 +-
 sw/source/ui/table/tabledlg.cxx  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit db6b79556e727f946a4f15a2d54a9acf41443629
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 23 11:01:27 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 23 17:39:26 2019 +0200

    set correct parent
    
    Change-Id: I1fc03238a68bcc42e0e43f3305baeb4407791eca
    Reviewed-on: https://gerrit.libreoffice.org/79409
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index e1d8b198572e..bdb6c470e4ab 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1445,7 +1445,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, GetFrameWeld()));
+    m_pFileDlg.reset(new sfx2::FileDialogHelper(nDialogType, FileDialogFlags::NONE, GetDialogFrameWeld()));
 
     m_pFileDlg->SetTitle( rTitle );
     m_pFileDlg->AddFilter( aFilterAllStr, FILEDIALOG_FILTER_ALL );
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index b75e48a9709f..4a608f6c9883 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -451,7 +451,7 @@ void SvxMacroTabPage_::GenericHandler_Impl(SvxMacroTabPage_* pThis, const weld::
                 )
             )
     {
-        AssignComponentDialog aAssignDlg(pThis->GetFrameWeld(), sEventURL);
+        AssignComponentDialog aAssignDlg(pThis->GetDialogFrameWeld(), sEventURL);
 
         short ret = aAssignDlg.run();
         if( ret )
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index e012352f0c01..c721285499c3 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2512,7 +2512,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl, weld::Button&, void)
     {
         m_xGrfDlg.reset(new FileDialogHelper(
                 ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW,
-                FileDialogFlags::Graphic, GetFrameWeld()));
+                FileDialogFlags::Graphic, GetDialogFrameWeld()));
         m_xGrfDlg->SetTitle(m_xLinkFrame->get_label());
     }
     m_xGrfDlg->SetDisplayDirectory(m_xConnectED->get_text());
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index f56e3c26a64e..1871d74a4f9e 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(GetFrameWeld(),
+        std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(GetDialogFrameWeld(),
                                                       VclMessageType::Info, VclButtonsType::Ok,
                                                       SwResId(STR_WRONG_TABLENAME)));
         xInfoBox->run();