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>

18 files changed, 42 insertions, 60 deletions

diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 19ca848bca4d..9f385af2bb29 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -19,7 +19,6 @@
 
 #include "Axis.hxx"
 #include "GridProperties.hxx"
-#include <macros.hxx>
 #include <CharacterProperties.hxx>
 #include <LinePropertiesHelper.hxx>
 #include <UserDefinedProperties.hxx>
@@ -383,7 +382,7 @@ Axis::~Axis()
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     m_aSubGridProperties.realloc(0);
@@ -534,7 +533,7 @@ void SAL_CALL Axis::addModifyListener( const Reference< util::XModifyListener >&
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -547,7 +546,7 @@ void SAL_CALL Axis::removeModifyListener( const Reference< util::XModifyListener
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 560a18f551b5..ec8d16100b46 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <BaseCoordinateSystem.hxx>
-#include <macros.hxx>
 #include <PropertyHelper.hxx>
 #include <UserDefinedProperties.hxx>
 #include <ContainerHelper.hxx>
@@ -185,7 +184,7 @@ BaseCoordinateSystem::~BaseCoordinateSystem()
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -298,7 +297,7 @@ void SAL_CALL BaseCoordinateSystem::addModifyListener( const Reference< util::XM
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -311,7 +310,7 @@ void SAL_CALL BaseCoordinateSystem::removeModifyListener( const Reference< util:
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index 070d3c559376..1a54ff46a0c3 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <CartesianCoordinateSystem.hxx>
-#include <macros.hxx>
 #include <servicenames_coosystems.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 4e9edad50c2d..4c25a63c63f1 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -20,7 +20,6 @@
 #include <ChartModel.hxx>
 #include <servicenames.hxx>
 #include <MediaDescriptorHelper.hxx>
-#include <macros.hxx>
 #include <DataSourceHelper.hxx>
 #include <ChartModelHelper.hxx>
 #include <DiagramHelper.hxx>
@@ -866,7 +865,7 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >&
         }
         catch (const uno::Exception& ex)
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
         unlockControllers();
     }
@@ -975,7 +974,7 @@ uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType )
         }
         catch (const uno::Exception& ex)
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 
@@ -1054,7 +1053,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio
     }
     catch (const uno::Exception& ex)
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return aResult;
@@ -1088,7 +1087,7 @@ uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& a
     }
     catch (const uno::Exception& ex)
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return aResult;
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 60354c4140ee..213d87f42f9d 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -20,7 +20,6 @@
 #include <memory>
 #include <ChartModel.hxx>
 #include <MediaDescriptorHelper.hxx>
-#include <macros.hxx>
 #include <ChartViewHelper.hxx>
 #include <ChartModelHelper.hxx>
 #include <DataSourceHelper.hxx>
@@ -134,11 +133,11 @@ Reference< embed::XStorage > lcl_createStorage(
     }
     catch(const css::ucb::ContentCreationException& rEx)
     {
-        ASSERT_EXCEPTION( rEx );
+        SAL_WARN("chart2", "Exception caught. " << rEx );
     }
     catch(const css::ucb::CommandFailedException& rEx)
     {
-        ASSERT_EXCEPTION( rEx );
+        SAL_WARN("chart2", "Exception caught. " << rEx );
     }
 
     return xStorage;
@@ -187,7 +186,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
         OSL_ENSURE( xFilter.is(), "Filter not found via factory" );
     }
@@ -318,7 +317,7 @@ void SAL_CALL ChartModel::storeToURL(
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
     else
@@ -348,7 +347,7 @@ void ChartModel::impl_store(
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
     else
@@ -461,14 +460,14 @@ void ChartModel::insertDefaultChart()
             }
             catch( const uno::Exception & ex )
             {
-                ASSERT_EXCEPTION( ex );
+                SAL_WARN("chart2", "Exception caught. " << ex );
             }
         }
         ChartModelHelper::setIncludeHiddenCells( false, *this );
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
     setModified( false );
     unlockControllers();
@@ -536,7 +535,7 @@ void SAL_CALL ChartModel::load(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     if( xStorage.is())
@@ -731,7 +730,7 @@ void SAL_CALL ChartModel::modified( const lang::EventObject& rEvenObject)
         }
         catch (const uno::Exception & ex)
         {
-            ASSERT_EXCEPTION(ex);
+            SAL_WARN("chart2", "Exception caught. " << ex);
         }
         unlockControllers();
     }
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index 350062608b51..3887451b9bcc 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -22,7 +22,6 @@
 #include <CharacterProperties.hxx>
 #include <UserDefinedProperties.hxx>
 #include <PropertyHelper.hxx>
-#include <macros.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -144,7 +143,7 @@ DataPoint::~DataPoint()
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -229,7 +228,7 @@ void SAL_CALL DataPoint::addModifyListener( const uno::Reference< util::XModifyL
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -242,7 +241,7 @@ void SAL_CALL DataPoint::removeModifyListener( const uno::Reference< util::XModi
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index 9a858f001cf0..66e0b88d1f5a 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "DataPointProperties.hxx"
-#include <macros.hxx>
 #include <LinePropertiesHelper.hxx>
 #include <FillProperties.hxx>
 #include <unonames.hxx>
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index d1e5ecf842d1..0d2a6342db6c 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -23,7 +23,6 @@
 #include <CharacterProperties.hxx>
 #include <UserDefinedProperties.hxx>
 #include "DataPoint.hxx"
-#include <macros.hxx>
 #include <DataSeriesHelper.hxx>
 #include <ContainerHelper.hxx>
 #include <CloneHelper.hxx>
@@ -215,7 +214,7 @@ DataSeries::~DataSeries()
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -485,7 +484,7 @@ void SAL_CALL DataSeries::addModifyListener( const Reference< util::XModifyListe
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -498,7 +497,7 @@ void SAL_CALL DataSeries::removeModifyListener( const Reference< util::XModifyLi
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx
index bdaa4c7ac424..b26d7db1c674 100644
--- a/chart2/source/model/main/DataSeriesProperties.cxx
+++ b/chart2/source/model/main/DataSeriesProperties.cxx
@@ -20,7 +20,6 @@
 #include "DataSeriesProperties.hxx"
 #include "DataPointProperties.hxx"
 #include "DataPoint.hxx"
-#include <macros.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/chart2/StackingDirection.hpp>
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 9eb3e54542d2..9895a7f470b4 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <Diagram.hxx>
-#include <macros.hxx>
 #include <PropertyHelper.hxx>
 #include "Wall.hxx"
 #include <UserDefinedProperties.hxx>
@@ -338,7 +337,7 @@ Diagram::~Diagram()
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -564,7 +563,7 @@ void SAL_CALL Diagram::addModifyListener( const Reference< util::XModifyListener
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -577,7 +576,7 @@ void SAL_CALL Diagram::removeModifyListener( const Reference< util::XModifyListe
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index fb4ff6305751..4f26acc95e3f 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -21,7 +21,6 @@
 
 #include <CharacterProperties.hxx>
 #include <PropertyHelper.hxx>
-#include <macros.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -144,7 +143,7 @@ void SAL_CALL FormattedString::addModifyListener( const uno::Reference< util::XM
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -157,7 +156,7 @@ void SAL_CALL FormattedString::removeModifyListener( const uno::Reference< util:
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index 5e33c3e2fb37..0c106f70668d 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -21,7 +21,6 @@
 #include <LinePropertiesHelper.hxx>
 #include <UserDefinedProperties.hxx>
 #include <PropertyHelper.hxx>
-#include <macros.hxx>
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -177,7 +176,7 @@ void SAL_CALL GridProperties::addModifyListener( const Reference< util::XModifyL
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -190,7 +189,7 @@ void SAL_CALL GridProperties::removeModifyListener( const Reference< util::XModi
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index d24b2030f948..fc9ab86de607 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "Legend.hxx"
-#include <macros.hxx>
 #include <LinePropertiesHelper.hxx>
 #include <FillProperties.hxx>
 #include <CharacterProperties.hxx>
@@ -209,7 +208,7 @@ void SAL_CALL Legend::addModifyListener( const Reference< util::XModifyListener
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -222,7 +221,7 @@ void SAL_CALL Legend::removeModifyListener( const Reference< util::XModifyListen
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 7aa6bc455098..e90a42797c6d 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "PageBackground.hxx"
-#include <macros.hxx>
 #include <LinePropertiesHelper.hxx>
 #include <FillProperties.hxx>
 #include <UserDefinedProperties.hxx>
@@ -162,7 +161,7 @@ void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XMo
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -175,7 +174,7 @@ void SAL_CALL PageBackground::removeModifyListener( const uno::Reference< util::
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index ce79dc4dcde4..d6c58ee24c76 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <PolarCoordinateSystem.hxx>
-#include <macros.hxx>
 #include <servicenames_coosystems.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index 557bb00dd2a2..2668f6ec0c85 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -22,7 +22,6 @@
 #include <FillProperties.hxx>
 #include <UserDefinedProperties.hxx>
 #include <PropertyHelper.hxx>
-#include <macros.hxx>
 #include <ModifyListenerHelper.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/style/XStyle.hpp>
@@ -173,7 +172,7 @@ void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyLi
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -186,7 +185,7 @@ void SAL_CALL StockBar::removeModifyListener( const uno::Reference< util::XModif
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index bf992a23688e..6dbd924d08dc 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "Title.hxx"
-#include <macros.hxx>
 #include "FormattedString.hxx"
 #include <LinePropertiesHelper.hxx>
 #include <FillProperties.hxx>
@@ -311,7 +310,7 @@ void SAL_CALL Title::addModifyListener( const uno::Reference< util::XModifyListe
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -324,7 +323,7 @@ void SAL_CALL Title::removeModifyListener( const uno::Reference< util::XModifyLi
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index bf12ad122d85..719425231e49 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "Wall.hxx"
-#include <macros.hxx>
 #include <LinePropertiesHelper.hxx>
 #include <FillProperties.hxx>
 #include <UserDefinedProperties.hxx>
@@ -166,7 +165,7 @@ void SAL_CALL Wall::addModifyListener( const uno::Reference< util::XModifyListen
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -179,7 +178,7 @@ void SAL_CALL Wall::removeModifyListener( const uno::Reference< util::XModifyLis
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }