[Libreoffice-commits] core.git: include/tools

[Caolán McNamara (via logerrit)]

 include/tools/diagnose_ex.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0d280f7092c2c309d712d238ae37efd0b4bb84a9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 16 14:04:42 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 17 09:30:44 2019 +0200

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

diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index c03d2ec650ca..2d76241cadd0 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -140,7 +140,7 @@ TOOLS_DLLPUBLIC OString exceptionToString(css::uno::Any const & caughtEx);
 */
 #define TOOLS_WARN_EXCEPTION(area, stream) \
     do { \
-        css::uno::Any tools_warn_exception( cppu::getCaughtException() ); \
+        css::uno::Any tools_warn_exception( DbgGetCaughtException() ); \
         SAL_WARN(area, stream << " " << exceptionToString(tools_warn_exception)); \
     } while (false)
 
@@ -150,7 +150,7 @@ TOOLS_DLLPUBLIC OString exceptionToString(css::uno::Any const & caughtEx);
 */
 #define TOOLS_WARN_EXCEPTION_IF(cond, area, stream) \
     do { \
-        css::uno::Any tools_warn_exception( cppu::getCaughtException() ); \
+        css::uno::Any tools_warn_exception( DbgGetCaughtException() ); \
         SAL_WARN_IF(cond, area, stream << " " << exceptionToString(tools_warn_exception)); \
     } while (false)
 
@@ -160,7 +160,7 @@ TOOLS_DLLPUBLIC OString exceptionToString(css::uno::Any const & caughtEx);
 */
 #define TOOLS_INFO_EXCEPTION(area, stream) \
     do { \
-        css::uno::Any tools_warn_exception( cppu::getCaughtException() ); \
+        css::uno::Any tools_warn_exception( DbgGetCaughtException() ); \
         SAL_INFO(area, stream << " " << exceptionToString(tools_warn_exception)); \
     } while (false)