[Libreoffice-commits] core.git: sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/dialog/filedlghelper.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit b141e2a3253a44a4ab59889a8a08060a322540e3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 30 09:35:44 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 31 09:53:41 2019 +0100

    we already have a suitable parent for the dialog
    
    Change-Id: Ib5da2fe6a5b56dfff088b16639ec7a3f226b18f2
    Reviewed-on: https://gerrit.libreoffice.org/81744
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index ea3d7a821cec..9cab722760bd 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2683,8 +2683,7 @@ ErrCode RequestPassword(const std::shared_ptr<const SfxFilter>& pCurrentFilter,
         {
             break;
         }
-        vcl::Window* pWin = Application::GetDefDialogParent();
-        std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(pWin ? pWin->GetFrameWeld() : nullptr, VclMessageType::Warning,
+        std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(Application::GetFrameWeld(rParent), VclMessageType::Warning,
             VclButtonsType::Ok, SfxResId(STR_PASSWORD_LEN)));
         xBox->set_secondary_text(SfxResId(STR_PASSWORD_WARNING));
         xBox->run();