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

[Caolán McNamara (via logerrit)]

 sc/source/core/data/dpobject.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 3572d3e594dd9b2710310820a0604129a0f6a835
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jan 28 12:24:51 2020 +0000
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Jan 29 10:42:57 2020 +0100

    Resolves: tdf#130239 set an explicit parent for the message dialog
    
    Change-Id: If6e4bdf674f1aaaaaa5ceaa7cda5715af1aa7ce6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87612
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 57c1b7723c71..3af2c8aa1866 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <docsh.hxx>
 #include <dpcache.hxx>
 #include <dpobject.hxx>
 #include <dptabsrc.hxx>
@@ -3262,7 +3263,8 @@ uno::Reference<sdbc::XRowSet> ScDPCollection::DBCaches::createRowSet(
     catch ( const sdbc::SQLException& rError )
     {
         //! store error message
-        std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(nullptr,
+        vcl::Window* pParent = ScDocShell::GetActiveDialogParent();
+        std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(pParent ? pParent->GetFrameWeld() : nullptr,
                                                       VclMessageType::Info, VclButtonsType::Ok,
                                                       rError.Message));
         xInfoBox->run();