[Libreoffice-commits] core.git: 2 commits - sd/source

[Caolán McNamara (via logerrit)]

 sd/source/core/stlsheet.cxx      |    5 +++--
 sd/source/ui/unoidl/unomodel.cxx |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 8ccd9fb5baddc9734be64861a00c1efad42e178e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 18 10:21:39 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 18 16:19:11 2019 +0200

    cid#1448227 Uncaught exception
    
    Change-Id: I6149b087217b9b34ecce984536aae52b8ee9d430
    Reviewed-on: https://gerrit.libreoffice.org/75846
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 24b77f9e3730..1d1c98752398 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -329,8 +329,9 @@ void SAL_CALL SdXImpressDocument::release() throw ( )
             dispose();
         }
         catch (const uno::RuntimeException&)
-        { // don't break throw ()
-            css::uno::Any ex( cppu::getCaughtException() );
+        {
+            // don't break throw ()
+            css::uno::Any ex(DbgGetCaughtException());
             SAL_WARN( "sd", exceptionToString(ex) );
         }
     }
commit 2b15319349f90861c55cc3eb34fe5653b3d9a29b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 18 10:22:33 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 18 16:18:55 2019 +0200

    cid#1448325 Uncaught exception
    
    Change-Id: I5bb61909d5d252de7465a29a3c8e49b7b1997ba3
    Reviewed-on: https://gerrit.libreoffice.org/75847
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 3ad8f1aa788d..d49806b8b058 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -707,8 +707,9 @@ void SAL_CALL SdStyleSheet::release(  ) throw ()
         dispose();
     }
     catch (RuntimeException const&)
-    { // don't break throw ()
-        css::uno::Any ex( cppu::getCaughtException() );
+    {
+        // don't break throw ()
+        css::uno::Any ex(DbgGetCaughtException());
         SAL_WARN( "sd", exceptionToString(ex) );
     }
     OSL_ASSERT( mrBHelper.bDisposed );