[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - 2 commits - dbaccess/source

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/browser/brwctrlr.cxx |    2 +-
 dbaccess/source/ui/dlg/paramdialog.cxx  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f1102df6a168d1e9b12b51821d8ecca0884a7547
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 13 12:53:49 2019 +0000
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Nov 15 13:50:52 2019 +0100

    set parent for OParameterDialog
    
    Change-Id: I614d596599ce55ef9940fbeedf0fca4052e64138
    Reviewed-on: https://gerrit.libreoffice.org/82599
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index a387e04d0b8f..978e6a945d03 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1316,7 +1316,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const css::form::DatabasePa
         pParamRequest->addContinuation(pAbort);
 
         // create the handler, let it handle the request
-        Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(getORB(), nullptr) );
+        Reference< XInteractionHandler2 > xHandler(InteractionHandler::createWithParent(getORB(), getComponentWindow()));
         xHandler->handle(xParamRequest);
 
         if (!pParamValues->wasSelected())
commit 3b101cc25d2d128214e01e1c88a99f5ee508cbba
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 13 12:43:52 2019 +0000
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Nov 15 13:50:27 2019 +0100

    set parent for message dialog
    
    Change-Id: I0f885e79dd9fca2596e0190af996e9cae74692a6
    Reviewed-on: https://gerrit.libreoffice.org/82598
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 370c733eafb7..bd988c210316 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -189,7 +189,7 @@ namespace dbaui
 
                     OUString sMessage(DBA_RES(STR_COULD_NOT_CONVERT_PARAM));
                     sMessage = sMessage.replaceAll( "$name$", sName );
-                    std::unique_ptr<weld::MessageDialog> xDialog(Application::CreateMessageDialog(nullptr,
+                    std::unique_ptr<weld::MessageDialog> xDialog(Application::CreateMessageDialog(m_xDialog.get(),
                                                                  VclMessageType::Warning, VclButtonsType::Ok,
                                                                  sMessage));
                     xDialog->run();