[Libreoffice-commits] core.git: include/svx svx/source

[Caolán McNamara]

 include/svx/fmtools.hxx            |    2 +-
 svx/source/form/fmtools.cxx        |    4 ++--
 svx/source/form/formcontroller.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c395eeb09381a7a8b9157027e0ac7d9536943fb3
Author: Caolán McNamara <caol...@redhat.com>
Date:   Tue Apr 17 21:02:22 2018 +0100

    Resolves: tdf#117068 wrong parent for exception dialog
    
    Change-Id: I51e6b32593f2e67585c6c45b0b1daefcf4860e20
    Reviewed-on: https://gerrit.libreoffice.org/53067
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 239551e0c5b9..000f3032ca83 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -72,7 +72,7 @@ namespace vcl { class Window; }
 // display info about a simple css::sdbc::SQLException
 void displayException(const css::sdbc::SQLException&, vcl::Window* _pParent);
 SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* 
_pParent);
-void displayException(const css::sdb::SQLErrorEvent&);
+void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent = 
nullptr);
 void displayException(const css::uno::Any&, vcl::Window* _pParent = nullptr);
 
 sal_Int32 getElementPos(const css::uno::Reference< 
css::container::XIndexAccess>& xCont, const css::uno::Reference< 
css::uno::XInterface>& xElement);
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 39c9969705be..25a3a38cf581 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -150,9 +150,9 @@ void displayException(const css::sdb::SQLContext& _rExcept, 
vcl::Window* _pParen
 }
 
 
-void displayException(const css::sdb::SQLErrorEvent& _rEvent)
+void displayException(const css::sdb::SQLErrorEvent& _rEvent, vcl::Window* 
_pParent)
 {
-    displayException(_rEvent.Reason);
+    displayException(_rEvent.Reason, _pParent);
 }
 
 
diff --git a/svx/source/form/formcontroller.cxx 
b/svx/source/form/formcontroller.cxx
index 139147fd377e..4691584d8b24 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3829,7 +3829,7 @@ void SAL_CALL FormController::errorOccured(const 
SQLErrorEvent& aEvent)
     else
     {
         aGuard.clear();
-        displayException( aEvent );
+        displayException(aEvent, getDialogParentWindow());
     }
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits