From c4abbb6e10ecd382fd4fe6816cd4f29ea7d931a5 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Thu, 2 Nov 2017 15:44:50 +0200
Subject: inline ASSERT_EXCEPTION macro in chart2

Change-Id: I6bdcde5fd416531e2cdd3c9ec160833f1022247c
Reviewed-on: https://gerrit.libreoffice.org/44246
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 chart2/source/model/filter/XMLFilter.cxx | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'chart2/source/model/filter/XMLFilter.cxx')

diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index cf15a7f48aaf..4d7720e72d9b 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <XMLFilter.hxx>
-#include <macros.hxx>
 #include <MediaDescriptorHelper.hxx>
 
 #include <svtools/sfxecode.hxx>
@@ -120,7 +119,7 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage(
     }
     catch (const uno::Exception& ex)
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
     return xStorage;
 }
@@ -173,7 +172,7 @@ uno::Reference< embed::XStorage > lcl_getReadStorage(
     }
     catch (const uno::Exception& ex)
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return xStorage;
@@ -393,7 +392,7 @@ ErrCode XMLFilter::impl_Import(
     }
     catch (const uno::Exception& ex)
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
 
         // something went awry
         nWarning = ERRCODE_SFX_GENERAL;
@@ -503,7 +502,7 @@ ErrCode XMLFilter::impl_ImportStream(
         }
         catch (const uno::Exception& rEx)
         {
-            ASSERT_EXCEPTION(rEx);
+            SAL_WARN("chart2", "Exception caught. " << rEx);
         }
     }
 
@@ -647,7 +646,7 @@ ErrCode XMLFilter::impl_Export(
     }
     catch (const uno::Exception& ex)
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
 
         // something went awry
         nWarning = ERRCODE_SFX_GENERAL;
@@ -690,7 +689,7 @@ ErrCode XMLFilter::impl_ExportStream(
         }
         catch (const uno::Exception& rEx)
         {
-            ASSERT_EXCEPTION( rEx );
+            SAL_WARN("chart2", "Exception caught. " << rEx );
         }
 
         xActiveDataSource->setOutputStream(xOutputStream);
@@ -720,7 +719,7 @@ ErrCode XMLFilter::impl_ExportStream(
     }
     catch (const uno::Exception& rEx)
     {
-        ASSERT_EXCEPTION( rEx );
+        SAL_WARN("chart2", "Exception caught. " << rEx );
     }
     return ERRCODE_NONE;
 }
-- 
cgit v1.2.3