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

[Lionel Elie Mamane]

 dbaccess/source/ui/browser/brwctrlr.cxx |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 11f54c327592080e3d918283bd7804ef6d704613
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat May 31 05:52:00 2014 +0200

    fdo#73352 don't crash if clearWarnings throws an SQLException
    
    Change-Id: If67bda43589834e4c922056145bc60884728cb8a
    Reviewed-on: https://gerrit.libreoffice.org/9593
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 3e5a3c7..f1e2780 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -623,7 +623,16 @@ void SbaXDataBrowserController::onStartLoading( const Reference< XLoadable >& _r
 
     Reference< XWarningsSupplier > xWarnings( _rxLoadable, UNO_QUERY );
     if ( xWarnings.is() )
-        xWarnings->clearWarnings();
+    {
+        try
+        {
+            xWarnings->clearWarnings();
+        }
+        catch(const SQLException& e)
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+    }
 }
 
 void SbaXDataBrowserController::impl_checkForCannotSelectUnfiltered( const SQLExceptionInfo& _rError )
@@ -690,7 +699,7 @@ sal_Bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _r
         }
         catch(const SQLException& e)
         {
-            (void)e;
+            DBG_UNHANDLED_EXCEPTION();
         }
     }