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>

48 files changed, 101 insertions, 149 deletions

diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index c3ea86eb08d6..ecde1f639144 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -20,7 +20,6 @@
 #include <AxisHelper.hxx>
 #include <DiagramHelper.hxx>
 #include <ChartTypeHelper.hxx>
-#include <macros.hxx>
 #include <AxisIndexDefines.hxx>
 #include <LinePropertiesHelper.hxx>
 #include <servicenames_coosystems.hxx>
@@ -292,7 +291,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
             }
             catch( const uno::Exception & ex )
             {
-                ASSERT_EXCEPTION( ex );
+                SAL_WARN("chart2", "Exception caught. " << ex );
             }
 
             if( ! aKeyMap.empty())
@@ -398,7 +397,7 @@ Reference< XAxis > AxisHelper::createAxis(
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     return xAxis;
@@ -840,7 +839,7 @@ std::vector< Reference< XAxis > > AxisHelper::getAllAxesOfCoordinateSystem(
                     }
                     catch( const uno::Exception & ex )
                     {
-                        ASSERT_EXCEPTION( ex );
+                        SAL_WARN("chart2", "Exception caught. " << ex );
                     }
                 }
             }
@@ -1117,7 +1116,7 @@ void AxisHelper::setRTLAxisLayout( const Reference< XCoordinateSystem >& xCooSys
             }
             catch( const uno::Exception & ex )
             {
-                ASSERT_EXCEPTION( ex );
+                SAL_WARN("chart2", "Exception caught. " << ex );
             }
 
             try
@@ -1142,7 +1141,7 @@ void AxisHelper::setRTLAxisLayout( const Reference< XCoordinateSystem >& xCooSys
             }
             catch( const uno::Exception & ex )
             {
-                ASSERT_EXCEPTION( ex );
+                SAL_WARN("chart2", "Exception caught. " << ex );
             }
         }
     }
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index edf9465384fe..5db3cbdb45f0 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <CachedDataSequence.hxx>
-#include <macros.hxx>
 #include <PropertyHelper.hxx>
 #include <CommonFunctors.hxx>
 #include <ModifyListenerHelper.hxx>
@@ -327,7 +326,7 @@ void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XMod
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -340,7 +339,7 @@ void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::X
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 7386efa18a09..6472b1ebf3cd 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <CharacterProperties.hxx>
-#include <macros.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/style/XStyle.hpp>
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index 0eea7fdd9fed..f37d4d7581c9 100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <ChartModelHelper.hxx>
-#include <macros.hxx>
 #include <DiagramHelper.hxx>
 #include <DataSourceHelper.hxx>
 #include <ControllerLockGuard.hxx>
@@ -99,7 +98,7 @@ uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference<
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
     return nullptr;
 }
@@ -278,7 +277,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, ChartMod
     }
     catch (const uno::Exception& e)
     {
-        ASSERT_EXCEPTION(e);
+        SAL_WARN("chart2", "Exception caught. " << e);
     }
     return bChanged;
 }
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index 03fb5a5219c9..a586d04bb7ad 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -20,7 +20,6 @@
 #include <ChartTypeHelper.hxx>
 #include <DiagramHelper.hxx>
 #include <DataSeriesHelper.hxx>
-#include <macros.hxx>
 #include <servicenames_charttypes.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -557,7 +556,7 @@ sal_Int32 ChartTypeHelper::getNumberOfDisplayedSeries(
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
     return nNumberOfSeries;
diff --git a/chart2/source/tools/ChartViewHelper.cxx b/chart2/source/tools/ChartViewHelper.cxx
index 2cc26159726e..c5a757b2e7ba 100644
--- a/chart2/source/tools/ChartViewHelper.cxx
+++ b/chart2/source/tools/ChartViewHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <ChartViewHelper.hxx>
-#include <macros.hxx>
 #include <servicenames.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
@@ -48,7 +47,7 @@ void ChartViewHelper::setViewToDirtyState( const uno::Reference< frame::XModel >
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 } //namespace chart
diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx
index b729162be421..34aeb7866021 100644
--- a/chart2/source/tools/ColorPerPointHelper.cxx
+++ b/chart2/source/tools/ColorPerPointHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <ColorPerPointHelper.hxx>
-#include <macros.hxx>
 #include <com/sun/star/chart2/XDataSeries.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index 4cc134a38704..72e3ca7e6a7f 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <ConfigColorScheme.hxx>
-#include <macros.hxx>
 
 #include <unotools/configitem.hxx>
 #include <sal/macros.h>
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 82b7c2a59cb5..d946b3f9a62c 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -20,7 +20,6 @@
 #include <DataSeriesHelper.hxx>
 #include <DiagramHelper.hxx>
 #include <DataSource.hxx>
-#include <macros.hxx>
 #include <ContainerHelper.hxx>
 #include <unonames.hxx>
 
@@ -179,7 +178,7 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( const Reference< chart2::
     }
     catch(const uno::Exception &e)
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 }
 
@@ -411,7 +410,7 @@ void setStackModeAtSeries(
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 
@@ -460,7 +459,7 @@ sal_Int32 getAttachedAxisIndex( const Reference< chart2::XDataSeries > & xSeries
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
     return nRet;
 }
@@ -483,7 +482,7 @@ sal_Int32 getNumberFormatKeyFromAxis(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return nResult;
@@ -530,7 +529,7 @@ void deleteSeries(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -728,7 +727,7 @@ bool hasDataLabelsAtSeries( const Reference< chart2::XDataSeries >& xSeries )
     }
     catch(const uno::Exception &e)
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
     return bRet;
 }
@@ -761,7 +760,7 @@ bool hasDataLabelsAtPoints( const Reference< chart2::XDataSeries >& xSeries )
     }
     catch(const uno::Exception &e)
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
     return bRet;
 }
@@ -795,7 +794,7 @@ bool hasDataLabelAtPoint( const Reference< chart2::XDataSeries >& xSeries, sal_I
     }
     catch(const uno::Exception &e)
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
     return bRet;
 }
@@ -824,7 +823,7 @@ void insertDataLabelToPoint( const Reference< beans::XPropertySet >& xPointProp
     }
     catch(const uno::Exception &e)
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 }
 
@@ -844,7 +843,7 @@ void deleteDataLabelsFromPoint( const Reference< beans::XPropertySet >& xPointPr
     }
     catch(const uno::Exception &e)
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 }
 
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 17c7a6352b50..7ade8542e4b7 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <DataSourceHelper.hxx>
-#include <macros.hxx>
 #include <ChartModelHelper.hxx>
 #include <DiagramHelper.hxx>
 #include <DataSeriesHelper.hxx>
@@ -110,7 +109,7 @@ void lcl_addErrorBarRanges(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -379,7 +378,7 @@ bool DataSourceHelper::detectRangeSegmentation(
     }
     catch( uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
     return bSomethingDetected;
 }
@@ -424,7 +423,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return (bHasCellRangeRepresentation && bHasDataRowSource && bHasFirstCellAsLabel);
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 214434e67197..7430402e9af5 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -20,7 +20,6 @@
 #include <DiagramHelper.hxx>
 #include <LegendHelper.hxx>
 #include <PropertyHelper.hxx>
-#include <macros.hxx>
 #include <DataSeriesHelper.hxx>
 #include <AxisHelper.hxx>
 #include <ContainerHelper.hxx>
@@ -103,7 +102,7 @@ DiagramHelper::tTemplateWithServiceName
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 
@@ -184,7 +183,7 @@ void DiagramHelper::setVertical(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -307,7 +306,7 @@ void DiagramHelper::setStackMode(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -428,7 +427,7 @@ StackMode DiagramHelper::getStackModeFromChartType(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return eStackMode;
@@ -460,7 +459,7 @@ sal_Int32 DiagramHelper::getDimension( const Reference< XDiagram > & xDiagram )
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return nResult;
@@ -522,7 +521,7 @@ void DiagramHelper::setDimension(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -556,7 +555,7 @@ void DiagramHelper::replaceCoordinateSystem(
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 }
@@ -594,7 +593,7 @@ bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 
@@ -696,7 +695,7 @@ std::vector< Reference< XDataSeries > >
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return aResult;
@@ -803,7 +802,7 @@ std::vector< Reference< XAxis > > lcl_getAxisHoldingCategoriesFromDiagram(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     if( aRet.empty() )
@@ -846,7 +845,7 @@ bool DiagramHelper::isCategoryDiagram(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return false;
@@ -914,7 +913,7 @@ Reference< data::XLabeledDataSequence >
                         }
                         catch( const uno::Exception & ex )
                         {
-                            ASSERT_EXCEPTION( ex );
+                            SAL_WARN("chart2", "Exception caught. " << ex );
                         }
                     }
                 }
@@ -923,7 +922,7 @@ Reference< data::XLabeledDataSequence >
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return xResult;
@@ -1040,7 +1039,7 @@ void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, c
                 }
                 catch( const uno::Exception & ex )
                 {
-                    ASSERT_EXCEPTION( ex );
+                    SAL_WARN("chart2", "Exception caught. " << ex );
                 }
                 sal_Int32 nType = util::NumberFormat::UNDEFINED;
                 if( xKeyProps.is() )
@@ -1233,7 +1232,7 @@ Sequence< Reference< XChartType > >
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 
@@ -1531,7 +1530,7 @@ sal_Int32 DiagramHelper::getGeometry3D(
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index a316c70b7f3d..682a13827ba1 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <ErrorBar.hxx>
-#include <macros.hxx>
 #include <ContainerHelper.hxx>
 #include <EventListenerHelper.hxx>
 #include <PropertyHelper.hxx>
@@ -404,7 +403,7 @@ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyLi
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -417,7 +416,7 @@ void SAL_CALL ErrorBar::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/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 392b8fc529a1..443de9e233e2 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -24,7 +24,6 @@
 #include <CommonConverters.hxx>
 #include <DataSourceHelper.hxx>
 #include <ChartModelHelper.hxx>
-#include <macros.hxx>
 #include <NumberFormatterWrapper.hxx>
 #include <unonames.hxx>
 
@@ -123,7 +122,7 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2:
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index fd52506b1253..db59250b76b0 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <ExponentialRegressionCurveCalculator.hxx>
-#include <macros.hxx>
 #include <RegressionCalculationHelper.hxx>
 #include <SpecialCharacters.hxx>
 
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index b00fea6a96ef..d0c888d748f2 100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <FillProperties.hxx>
-#include <macros.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx
index 485a1f9d4b5b..a1f4829c1e53 100644
--- a/chart2/source/tools/FormattedStringHelper.cxx
+++ b/chart2/source/tools/FormattedStringHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <FormattedStringHelper.hxx>
-#include <macros.hxx>
 #include <PropertyHelper.hxx>
 #include <com/sun/star/chart2/FormattedString.hpp>
 
@@ -52,7 +51,7 @@ Sequence< Reference< chart2::XFormattedString2 > >
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return Sequence< Reference< XFormattedString2 > >( & xFormStr, 1 );
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 72f3d0a888ad..a8e0c93759f9 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -25,7 +25,6 @@
 #include <LabeledDataSequence.hxx>
 #include <DataSource.hxx>
 #include <PropertyHelper.hxx>
-#include <macros.hxx>
 #include <XMLRangeHelper.hxx>
 #include <ContainerHelper.hxx>
 #include <CommonConverters.hxx>
@@ -396,7 +395,7 @@ InternalDataProvider::InternalDataProvider(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index c9227fc15e1c..85c0a2747d4f 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -19,7 +19,6 @@
 
 #include <LabeledDataSequence.hxx>
 #include <ModifyListenerHelper.hxx>
-#include <macros.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 using namespace ::com::sun::star;
@@ -125,7 +124,7 @@ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XMo
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -138,7 +137,7 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util::
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx
index 7f4b36cf93eb..ef09cfae512d 100644
--- a/chart2/source/tools/LegendHelper.cxx
+++ b/chart2/source/tools/LegendHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <LegendHelper.hxx>
-#include <macros.hxx>
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
 #include <com/sun/star/chart2/LegendPosition.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
@@ -100,7 +99,7 @@ uno::Reference< chart2::XLegend > LegendHelper::getLegend(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return xResult;
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index b7c985460335..6ffe8849f1da 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <LifeTime.hxx>
-#include <macros.hxx>
 #include <osl/diagnose.h>
 
 #include <com/sun/star/util/XModifyListener.hpp>
@@ -347,7 +346,7 @@ void CloseableLifeTimeManager::impl_doClose()
     }
     catch( const uno::Exception& ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     if(xCloseable.is())
diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx
index a92c9ae6b076..508f1be13733 100644
--- a/chart2/source/tools/LinePropertiesHelper.cxx
+++ b/chart2/source/tools/LinePropertiesHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <LinePropertiesHelper.hxx>
-#include <macros.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
@@ -113,7 +112,7 @@ bool LinePropertiesHelper::IsLineVisible( const css::uno::Reference<
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
     return bRet;
 }
@@ -138,7 +137,7 @@ void LinePropertiesHelper::SetLineVisible( const css::uno::Reference<
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -157,7 +156,7 @@ void LinePropertiesHelper::SetLineInvisible( const css::uno::Reference<
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -173,7 +172,7 @@ void LinePropertiesHelper::SetLineColor( const css::uno::Reference<
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
index 786063c49d13..026c0df98023 100644
--- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <LinearRegressionCurveCalculator.hxx>
-#include <macros.hxx>
 #include <RegressionCalculationHelper.hxx>
 
 #include <rtl/math.hxx>
diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index b00ee699bcd8..377c1ccfe102 100644
--- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <LogarithmicRegressionCurveCalculator.hxx>
-#include <macros.hxx>
 #include <RegressionCalculationHelper.hxx>
 #include <SpecialCharacters.hxx>
 
diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index 4ac8b470994e..3f052eb5da51 100644
--- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <MeanValueRegressionCurveCalculator.hxx>
-#include <macros.hxx>
 
 #include <osl/diagnose.h>
 #include <rtl/math.hxx>
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 3beebb8cb5d9..96661ab3886e 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -19,7 +19,6 @@
 
 #include <ModifyListenerHelper.hxx>
 #include <WeakListenerAdapter.hxx>
-#include <macros.hxx>
 
 #include <cppuhelper/interfacecontainer.hxx>
 
@@ -116,7 +115,7 @@ void ModifyEventForwarder::AddListener( const Reference< util::XModifyListener >
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -139,7 +138,7 @@ void ModifyEventForwarder::RemoveListener( const Reference< util::XModifyListene
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
index b1cc6f317994..3da6d4f7afe4 100644
--- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
@@ -21,7 +21,6 @@
 #include <RegressionCalculationHelper.hxx>
 #include <ResId.hxx>
 #include <strings.hrc>
-#include <macros.hxx>
 
 #include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index d1d8992b2290..b5ff0c2e0028 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <NumberFormatterWrapper.hxx>
-#include <macros.hxx>
 #include <comphelper/processfactory.hxx>
 #include <svl/numuno.hxx>
 #include <svl/zformat.hxx>
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 4fe7a342fc73..cb25bb066101 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -22,7 +22,6 @@
 #include <map>
 
 #include <ObjectIdentifier.hxx>
-#include <macros.hxx>
 #include <TitleHelper.hxx>
 #include <ChartModelHelper.hxx>
 #include <AxisHelper.hxx>
@@ -376,7 +375,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject(
     }
     catch(const uno::Exception& ex)
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     if( eObjectType != OBJECTTYPE_UNKNOWN )
@@ -458,7 +457,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject(
     }
     catch(const uno::Exception& ex)
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     if( eObjectType != OBJECTTYPE_UNKNOWN )
@@ -1387,7 +1386,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
     }
     catch(const uno::Exception& ex)
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
     return xObjectProperties;
 }
diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
index aa2110ac00b3..953efc8a3351 100644
--- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <PolynomialRegressionCurveCalculator.hxx>
-#include <macros.hxx>
 #include <RegressionCalculationHelper.hxx>
 
 #include <cmath>
diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index aa37189542ca..d4901d843279 100644
--- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <PotentialRegressionCurveCalculator.hxx>
-#include <macros.hxx>
 #include <RegressionCalculationHelper.hxx>
 #include <SpecialCharacters.hxx>
 
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index 4d084777a6ce..12ff04e21b0d 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -19,7 +19,6 @@
 
 #include <PropertyHelper.hxx>
 #include <ContainerHelper.hxx>
-#include <macros.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <osl/diagnose.h>
@@ -51,7 +50,7 @@ struct lcl_EqualsElement
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
         return false;
     }
@@ -164,7 +163,7 @@ OUString lcl_addNamedPropertyUniqueNameToTable(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return rPreferredName;
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index 6d5f30fb87b8..8804fa0f6d40 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -21,7 +21,6 @@
 #include <WeakListenerAdapter.hxx>
 #include <ChartModelHelper.hxx>
 #include <DataSourceHelper.hxx>
-#include <macros.hxx>
 #include <ObjectIdentifier.hxx>
 #include <DataSeriesHelper.hxx>
 
@@ -183,7 +182,7 @@ void RangeHighlighter::determineRanges()
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 }
@@ -229,7 +228,7 @@ void RangeHighlighter::fillRangesForErrorBars(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     if( bUsesRangesAsErrorBars )
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 9fd45d74e65d..b083f1e09323 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -21,7 +21,6 @@
 #include <RelativeSizeHelper.hxx>
 #include <ChartModelHelper.hxx>
 #include <DiagramHelper.hxx>
-#include <macros.hxx>
 #include <AxisHelper.hxx>
 #include <DataSeriesHelper.hxx>
 
@@ -86,7 +85,7 @@ void ReferenceSizeProvider::setValuesAtTitle(
     }
     catch (const uno::Exception& ex)
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -117,7 +116,7 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries()
             }
             catch (const uno::Exception& ex)
             {
-                ASSERT_EXCEPTION( ex );
+                SAL_WARN("chart2", "Exception caught. " << ex );
             }
 
             //it is important to correct the datapoint properties first as they do reference the series properties
@@ -160,7 +159,7 @@ void ReferenceSizeProvider::setValuesAtPropertySet(
     }
     catch (const uno::Exception& ex)
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -296,7 +295,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState
             }
             catch (const uno::Exception& ex)
             {
-                ASSERT_EXCEPTION( ex );
+                SAL_WARN("chart2", "Exception caught. " << ex );
             }
         }
     }
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 70ae1d7bed42..53b12b6397e9 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -29,7 +29,6 @@
 #include "RegressionCurveModel.hxx"
 #include <ChartTypeHelper.hxx>
 #include <ChartModelHelper.hxx>
-#include <macros.hxx>
 #include <PropertyHelper.hxx>
 #include <ResId.hxx>
 #include <strings.hrc>
@@ -200,7 +199,7 @@ void RegressionCurveHelper::initializeCurveCalculator(
         }
         catch( const Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 
@@ -252,7 +251,7 @@ bool RegressionCurveHelper::hasMeanValueLine(
     }
     catch( const Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return false;
@@ -285,7 +284,7 @@ uno::Reference< chart2::XRegressionCurve >
         }
         catch( const Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 
@@ -340,7 +339,7 @@ void RegressionCurveHelper::removeMeanValueLine(
     }
     catch( const Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -422,7 +421,7 @@ bool RegressionCurveHelper::removeAllExceptMeanValueLine(
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
     return bRemovedSomething;
@@ -458,7 +457,7 @@ void RegressionCurveHelper::removeEquations(
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 }
@@ -496,7 +495,7 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getFirstCurveN
     }
     catch( const Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return nullptr;
@@ -520,7 +519,7 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getRegressionC
     }
     catch( const Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return nullptr;
@@ -570,7 +569,7 @@ SvxChartRegress RegressionCurveHelper::getRegressionType(
     }
     catch( const Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return eResult;
@@ -719,7 +718,7 @@ void RegressionCurveHelper::resetEquationPosition(
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 }
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index a9a847b187ea..04816377ae1c 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "RegressionCurveModel.hxx"
-#include <macros.hxx>
 #include <LinePropertiesHelper.hxx>
 #include <RegressionCurveHelper.hxx>
 #include <RegressionCalculationHelper.hxx>
@@ -255,7 +254,7 @@ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< uti
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -268,7 +267,7 @@ void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference<
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index f308490964ed..c7ac08ec1928 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -23,7 +23,6 @@
 #include <UserDefinedProperties.hxx>
 #include <CharacterProperties.hxx>
 #include <PropertyHelper.hxx>
-#include <macros.hxx>
 #include <ContainerHelper.hxx>
 #include <unonames.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -240,7 +239,7 @@ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util:
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -253,7 +252,7 @@ void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< ut
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx
index 235de3ff5c10..7f9c63e94e86 100644
--- a/chart2/source/tools/RelativeSizeHelper.cxx
+++ b/chart2/source/tools/RelativeSizeHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <RelativeSizeHelper.hxx>
-#include <macros.hxx>
 
 #include <vector>
 #include <algorithm>
@@ -79,7 +78,7 @@ void RelativeSizeHelper::adaptFontSizes(
         }
         catch( const Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 }
diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx
index c4e2c32e8d93..a939117257ec 100644
--- a/chart2/source/tools/SceneProperties.cxx
+++ b/chart2/source/tools/SceneProperties.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <SceneProperties.hxx>
-#include <macros.hxx>
 #include <ChartTypeHelper.hxx>
 #include <ThreeDHelper.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index bef8c11a49e7..7613a071d3e4 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -20,7 +20,6 @@
 #include <StatisticsHelper.hxx>
 #include <DataSeriesHelper.hxx>
 #include <ErrorBar.hxx>
-#include <macros.hxx>
 #include <unonames.hxx>
 
 #include <rtl/math.hxx>
@@ -153,7 +152,7 @@ void lcl_setXMLRangePropertyAtDataSequence(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index 20c0515c1016..facec9710c8e 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <ThreeDHelper.hxx>
-#include <macros.hxx>
 #include <DiagramHelper.hxx>
 #include <ChartTypeHelper.hxx>
 #include <BaseGFXHelper.hxx>
@@ -973,7 +972,7 @@ void ThreeDHelper::switchRightAngledAxes( const Reference< beans::XPropertySet >
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -1028,7 +1027,7 @@ void ThreeDHelper::setRotationAngleToDiagram(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -1105,7 +1104,7 @@ double ThreeDHelper::getCameraDistance(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
     return fCameraDistance;
 }
@@ -1133,7 +1132,7 @@ void ThreeDHelper::setCameraDistance(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -1183,7 +1182,7 @@ ThreeDLookScheme ThreeDHelper::detectScheme( const uno::Reference< XDiagram >& x
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     if( lcl_isSimpleScheme( aShadeMode, nRoundedEdges, nObjectLines, xDiagram ) )
@@ -1233,7 +1232,7 @@ void ThreeDHelper::setScheme( const uno::Reference< XDiagram >& xDiagram, ThreeD
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
 }
@@ -1290,7 +1289,7 @@ void ThreeDHelper::setDefaultIllumination( const uno::Reference< beans::XPropert
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     ThreeDLookScheme aScheme = (aShadeMode==drawing::ShadeMode_FLAT) ? ThreeDLookScheme_Simple : ThreeDLookScheme_Realistic;
@@ -1337,7 +1336,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
                 }
                 catch( const uno::Exception& e )
                 {
-                    ASSERT_EXCEPTION( e );
+                    SAL_WARN("chart2", "Exception caught. " << e );
                     bDifferentRoundedEdges = true;
                 }
                 try
@@ -1350,7 +1349,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
                 }
                 catch( const uno::Exception& e )
                 {
-                    ASSERT_EXCEPTION( e );
+                    SAL_WARN("chart2", "Exception caught. " << e );
                     bDifferentObjectLines = true;
                 }
             }
@@ -1392,7 +1391,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 }
 
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index 1720c50da77d..1c7412ea2f8a 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -19,7 +19,6 @@
 
 #include <TitleHelper.hxx>
 #include <ChartModelHelper.hxx>
-#include <macros.hxx>
 #include <AxisHelper.hxx>
 #include <DiagramHelper.hxx>
 #include <com/sun/star/chart2/FormattedString.hpp>
@@ -288,7 +287,7 @@ uno::Reference< XTitle > TitleHelper::createTitle(
                 }
                 catch( const uno::Exception & ex )
                 {
-                    ASSERT_EXCEPTION( ex );
+                    SAL_WARN("chart2", "Exception caught. " << ex );
                 }
             }
         }
@@ -374,7 +373,7 @@ void TitleHelper::setCompleteString( const OUString& rNewText
             }
             catch( const uno::Exception & ex )
             {
-                ASSERT_EXCEPTION( ex );
+                SAL_WARN("chart2", "Exception caught. " << ex );
             }
         }
     }
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 3d2e8226e6d2..682500515416 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <UncachedDataSequence.hxx>
-#include <macros.hxx>
 #include <PropertyHelper.hxx>
 #include <CommonFunctors.hxx>
 #include <ModifyListenerHelper.hxx>
@@ -300,7 +299,7 @@ void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XM
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -313,7 +312,7 @@ void SAL_CALL UncachedDataSequence::removeModifyListener( const Reference< util:
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx
index 7f74c2f8d9bc..91738c1bd38d 100644
--- a/chart2/source/tools/UserDefinedProperties.cxx
+++ b/chart2/source/tools/UserDefinedProperties.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <UserDefinedProperties.hxx>
-#include <macros.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 
diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx
index 0f1c242102ab..e6d00fdcd837 100644
--- a/chart2/source/tools/WrappedDefaultProperty.cxx
+++ b/chart2/source/tools/WrappedDefaultProperty.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <WrappedDefaultProperty.hxx>
-#include <macros.hxx>
 
 using namespace ::com::sun::star;
 
@@ -64,7 +63,7 @@ beans::PropertyState WrappedDefaultProperty::getPropertyState(
     }
     catch( const beans::UnknownPropertyException& ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
     return aState;
 }
diff --git a/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx
index 42a88171c9cf..ff74fac8c1a1 100644
--- a/chart2/source/tools/WrappedDirectStateProperty.cxx
+++ b/chart2/source/tools/WrappedDirectStateProperty.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <WrappedDirectStateProperty.hxx>
-#include <macros.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index 63e3e10411fd..976c0c282cfa 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <WrappedIgnoreProperty.hxx>
-#include <macros.hxx>
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/drawing/Hatch.hpp>
 #include <com/sun/star/drawing/BitmapMode.hpp>
diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx
index fd490700d533..b738293c58cc 100644
--- a/chart2/source/tools/WrappedProperty.cxx
+++ b/chart2/source/tools/WrappedProperty.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <WrappedProperty.hxx>
-#include <macros.hxx>
 #include <com/sun/star/drawing/LineStyle.hpp>
 
 using namespace ::com::sun::star;
@@ -113,7 +112,7 @@ beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans::
         }
         catch( const beans::UnknownPropertyException& ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
     return aState;
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 245d37f31db9..f7855233c5a7 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <WrappedPropertySet.hxx>
-#include <macros.hxx>
 
 #include <tools/solar.h>
 
@@ -238,7 +237,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >&
         }
         catch( const beans::UnknownPropertyException& ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
             bUnknownProperty = true;
         }
     }
@@ -262,11 +261,11 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence<
             }
             catch( const beans::UnknownPropertyException& ex )
             {
-                ASSERT_EXCEPTION( ex );
+                SAL_WARN("chart2", "Exception caught. " << ex );
             }
             catch( const lang::WrappedTargetException& ex )
             {
-                ASSERT_EXCEPTION( ex );
+                SAL_WARN("chart2", "Exception caught. " << ex );
             }
         }
     }