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>

33 files changed, 75 insertions, 108 deletions

diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index da1b1b50acfd..468d21003292 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <ScaleAutomatism.hxx>
-#include <macros.hxx>
 #include "Tickmarks_Equidistant.hxx"
 #include <DateHelper.hxx>
 #include "DateScaling.hxx"
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index b6f55029deb8..bfda7c01277f 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -21,7 +21,6 @@
 #include <ShapeFactory.hxx>
 #include <CommonConverters.hxx>
 #include "Tickmarks.hxx"
-#include <macros.hxx>
 
 #include <memory>
 
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index b5c04232a08f..7ce9d4d8ad08 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "VAxisProperties.hxx"
-#include <macros.hxx>
 #include <ViewDefines.hxx>
 #include <CommonConverters.hxx>
 #include <AxisHelper.hxx>
@@ -236,7 +235,7 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 }
 
@@ -326,7 +325,7 @@ void AxisProperties::init( bool bCartesian )
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 }
 
@@ -377,7 +376,7 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel )
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
 }
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index c9ec6d564d12..c53f890a07a6 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -21,7 +21,6 @@
 #include <PlottingPositionHelper.hxx>
 #include <AbstractShapeFactory.hxx>
 #include <CommonConverters.hxx>
-#include <macros.hxx>
 #include <ViewDefines.hxx>
 #include <PropertyMapper.hxx>
 #include <NumberFormatterWrapper.hxx>
@@ -1702,7 +1701,7 @@ void VCartesianAxis::updatePositions()
                     }
                     catch( const uno::Exception& e )
                     {
-                        ASSERT_EXCEPTION( e );
+                        SAL_WARN("chart2", "Exception caught. " << e );
                     }
                 }
 
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index 8a5850400f4c..8e777f351bf1 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -20,7 +20,6 @@
 #include "VCartesianCoordinateSystem.hxx"
 #include "VCartesianGrid.hxx"
 #include "VCartesianAxis.hxx"
-#include <macros.hxx>
 #include <AxisIndexDefines.hxx>
 #include <AxisHelper.hxx>
 #include <ChartTypeHelper.hxx>
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 6a18e6d730a9..5bb47b0ac011 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -22,7 +22,6 @@
 #include <PlottingPositionHelper.hxx>
 #include <ShapeFactory.hxx>
 #include <ObjectIdentifier.hxx>
-#include <macros.hxx>
 #include <CommonConverters.hxx>
 #include <AxisHelper.hxx>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 2c680b92f47a..2b0830d0dfee 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -24,7 +24,6 @@
 #include <VSeriesPlotter.hxx>
 #include <AbstractShapeFactory.hxx>
 #include <servicenames_coosystems.hxx>
-#include <macros.hxx>
 #include <AxisIndexDefines.hxx>
 #include <ObjectIdentifier.hxx>
 #include <ExplicitCategoriesProvider.hxx>
@@ -556,7 +555,7 @@ bool VCoordinateSystem::getPropertySwapXAndYAxis() const
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
     return bSwapXAndY;
 }
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index e263101795c1..da7eeb3733c7 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -22,7 +22,6 @@
 #include "VPolarAngleAxis.hxx"
 #include "VPolarGrid.hxx"
 #include <AbstractShapeFactory.hxx>
-#include <macros.hxx>
 #include <NumberFormatterWrapper.hxx>
 #include <PolarLabelPositionHelper.hxx>
 #include <tools/color.hxx>
diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx
index a456f4de3369..4416394cf105 100644
--- a/chart2/source/view/axes/VPolarAxis.cxx
+++ b/chart2/source/view/axes/VPolarAxis.cxx
@@ -20,7 +20,6 @@
 #include "VPolarAxis.hxx"
 #include "VPolarAngleAxis.hxx"
 #include "VPolarRadiusAxis.hxx"
-#include <macros.hxx>
 #include "Tickmarks.hxx"
 #include <ShapeFactory.hxx>
 
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 51b3a12373d5..edf30d95b832 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -23,7 +23,6 @@
 #include <PlottingPositionHelper.hxx>
 #include <ShapeFactory.hxx>
 #include <ObjectIdentifier.hxx>
-#include <macros.hxx>
 #include <CommonConverters.hxx>
 #include "Tickmarks_Equidistant.hxx"
 #include <com/sun/star/drawing/LineStyle.hpp>
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 951119d817f9..d0bf32064738 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -21,7 +21,6 @@
 #include <PlottingPositionHelper.hxx>
 #include <AbstractShapeFactory.hxx>
 #include <CommonConverters.hxx>
-#include <macros.hxx>
 #include <ViewDefines.hxx>
 #include <ObjectIdentifier.hxx>
 #include "Splines.hxx"
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 06c87d475c25..27634b283c7e 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -23,7 +23,6 @@
 #include <ObjectIdentifier.hxx>
 #include <LabelPositionHelper.hxx>
 #include "BarPositionHelper.hxx"
-#include <macros.hxx>
 #include <AxisIndexDefines.hxx>
 #include <Clipping.hxx>
 #include <DateHelper.hxx>
@@ -57,7 +56,7 @@ BarChart::BarChart( const uno::Reference<XChartType>& xChartTypeModel
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 }
 
@@ -286,7 +285,7 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint3D_Bar(
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 
     uno::Reference< drawing::XShape > xShape(nullptr);
@@ -643,7 +642,7 @@ void BarChart::createShapes()
                     }
                     catch( const uno::Exception& e )
                     {
-                        ASSERT_EXCEPTION( e );
+                        SAL_WARN("chart2", "Exception caught. " << e );
                     }
 
                     //@todo iterate through all subsystems to create partial points
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index 1e65978597c7..85ff761f40d2 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -21,7 +21,6 @@
 #include <PlottingPositionHelper.hxx>
 #include <AbstractShapeFactory.hxx>
 #include <CommonConverters.hxx>
-#include <macros.hxx>
 #include <ViewDefines.hxx>
 #include <ObjectIdentifier.hxx>
 #include "Splines.hxx"
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 511169a254a9..079c907c4fa2 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -23,7 +23,6 @@
 #include <ObjectIdentifier.hxx>
 #include <LabelPositionHelper.hxx>
 #include "BarPositionHelper.hxx"
-#include <macros.hxx>
 #include <VLegendSymbolFactory.hxx>
 #include <FormattedStringHelper.hxx>
 #include <DataSeriesHelper.hxx>
@@ -129,7 +128,7 @@ void CandleStickChart::createShapes()
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 
     //(@todo maybe different iteration for breaks in axis ?)
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index 28e690f2ffac..e9ebb0c459d6 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -21,7 +21,6 @@
 #include <PlottingPositionHelper.hxx>
 #include <AbstractShapeFactory.hxx>
 #include <CommonConverters.hxx>
-#include <macros.hxx>
 #include <ViewDefines.hxx>
 #include <ObjectIdentifier.hxx>
 #include <ChartTypeHelper.hxx>
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index c8bbd2a27a29..2d1ebd9fc634 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -21,7 +21,6 @@
 #include <PlottingPositionHelper.hxx>
 #include <AbstractShapeFactory.hxx>
 #include <PolarLabelPositionHelper.hxx>
-#include <macros.hxx>
 #include <CommonConverters.hxx>
 #include <ViewDefines.hxx>
 #include <ObjectIdentifier.hxx>
@@ -188,7 +187,7 @@ PieChart::PieChart( const uno::Reference<XChartType>& xChartTypeModel
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 }
 
@@ -644,7 +643,7 @@ void PieChart::createShapes()
                 }
                 catch( const uno::Exception& e )
                 {
-                    ASSERT_EXCEPTION( e );
+                    SAL_WARN("chart2", "Exception caught. " << e );
                 }
 
                 ///see notes for `PolarPlottingPositionHelper` methods
@@ -716,7 +715,7 @@ void PieChart::createShapes()
                 }
                 catch( const uno::Exception& e )
                 {
-                    ASSERT_EXCEPTION( e );
+                    SAL_WARN("chart2", "Exception caught. " << e );
                 }
             }//next series in x slot (next y slot)
         }//next category
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index c35e3cb262c6..9b90d88e5470 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -24,7 +24,6 @@
 #include <svl/zformat.hxx>
 
 #include <CommonConverters.hxx>
-#include <macros.hxx>
 #include <ViewDefines.hxx>
 #include <ObjectIdentifier.hxx>
 #include <StatisticsHelper.hxx>
@@ -492,7 +491,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
 
         sal_Int32 nLineCountForSymbolsize = 0;
@@ -686,7 +685,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 
     return xTextShape;
@@ -776,7 +775,7 @@ double lcl_getErrorBarLogicLength(
     }
     catch( const uno::Exception & e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 
     return fResult;
@@ -994,7 +993,7 @@ void VSeriesPlotter::createErrorBar(
     }
     catch( const uno::Exception & e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 
 }
@@ -2499,7 +2498,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
     return aResult;
 }
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 1120271333d8..829cb3265260 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -21,7 +21,6 @@
 #include <PropertyMapper.hxx>
 #include <ViewDefines.hxx>
 #include <Stripe.hxx>
-#include <macros.hxx>
 #include <ObjectIdentifier.hxx>
 #include <DiagramHelper.hxx>
 #include <BaseGFXHelper.hxx>
@@ -199,7 +198,7 @@ void VDiagram::createShapes_2d()
             }
             catch( const uno::Exception& e )
             {
-                ASSERT_EXCEPTION( e );
+                SAL_WARN("chart2", "Exception caught. " << e );
             }
         }
 
@@ -444,7 +443,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize )
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
 }
@@ -607,7 +606,7 @@ void VDiagram::createShapes_3d()
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     //add floor plate
@@ -663,7 +662,7 @@ void VDiagram::createShapes_3d()
             }
             catch( const uno::Exception& e )
             {
-                ASSERT_EXCEPTION( e );
+                SAL_WARN("chart2", "Exception caught. " << e );
             }
         }
     }
diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx
index 122b1177133a..8bb4f3debfbc 100644
--- a/chart2/source/view/main/AbstractShapeFactory.cxx
+++ b/chart2/source/view/main/AbstractShapeFactory.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <macros.hxx>
 #include <PropertyMapper.hxx>
 #include <CommonConverters.hxx>
 
@@ -159,7 +158,7 @@ void AbstractShapeFactory::makeShapeInvisible( const uno::Reference< drawing::XS
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
 }
@@ -182,7 +181,7 @@ void AbstractShapeFactory::setShapeName( const uno::Reference< drawing::XShape >
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
 }
@@ -201,7 +200,7 @@ OUString AbstractShapeFactory::getShapeName( const uno::Reference< drawing::XSha
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
 
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index 37c83d50ef12..387e83944c31 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "ChartItemPool.hxx"
-#include <macros.hxx>
 #include <chartview/ChartSfxItemIds.hxx>
 #include <svx/chrtitem.hxx>
 #include <svl/intitem.hxx>
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index e13d6b9cbc56..49f1670e9f37 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -30,7 +30,6 @@
 #include <VCoordinateSystem.hxx>
 #include <VSeriesPlotter.hxx>
 #include <CommonConverters.hxx>
-#include <macros.hxx>
 #include <TitleHelper.hxx>
 #include <LegendHelper.hxx>
 #include "VLegend.hxx"
@@ -483,7 +482,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     //prepare for autoscaling and shape creation
@@ -779,7 +778,7 @@ void SeriesPlotterContainer::setNumberFormatsFromAxes()
                     }
                     catch( const lang::IndexOutOfBoundsException& e )
                     {
-                        ASSERT_EXCEPTION( e );
+                        SAL_WARN("chart2", "Exception caught. " << e );
                     }
                 }
             }
@@ -1544,7 +1543,7 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw
         }
         catch( const uno::Exception& ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 }
@@ -2001,7 +2000,7 @@ bool lcl_getPropertySwapXAndYAxis( const uno::Reference< XDiagram >& xDiagram )
             }
             catch( const uno::Exception& e )
             {
-                ASSERT_EXCEPTION( e );
+                SAL_WARN("chart2", "Exception caught. " << e );
             }
         }
     }
@@ -2586,7 +2585,7 @@ void formatPage(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -2642,7 +2641,7 @@ void ChartView::impl_refreshAddIn()
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 }
 
@@ -2820,7 +2819,7 @@ void ChartView::impl_updateView( bool bCheckLockedCtrler )
             m_bViewDirty = m_bViewUpdatePending;
             m_bViewUpdatePending = false;
             m_bInViewUpdate = false;
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
 
         {
@@ -2926,7 +2925,7 @@ void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode )
     }
     catch( const uno::Exception& ex)
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx
index 10cd8fada13f..54ba3f7eb8c6 100644
--- a/chart2/source/view/main/DataPointSymbolSupplier.cxx
+++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx
@@ -19,7 +19,6 @@
 
 #include <chartview/DataPointSymbolSupplier.hxx>
 #include <AbstractShapeFactory.hxx>
-#include <macros.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 180c55006e41..ab87a0769172 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <chartview/DrawModelWrapper.hxx>
-#include <macros.hxx>
 #include <AbstractShapeFactory.hxx>
 #include "ChartItemPool.hxx"
 #include <ObjectIdentifier.hxx>
diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx
index d0f65c4b2670..29dfc3259d4b 100644
--- a/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/chart2/source/view/main/LabelPositionHelper.cxx
@@ -22,7 +22,6 @@
 #include <CommonConverters.hxx>
 #include <PropertyMapper.hxx>
 #include <AbstractShapeFactory.hxx>
-#include <macros.hxx>
 #include <RelativeSizeHelper.hxx>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx
index 0b63e0c0f2d2..9cb3318f7fa2 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -23,7 +23,6 @@
 #include <ViewDefines.hxx>
 #include <Stripe.hxx>
 #include <CommonConverters.hxx>
-#include <macros.hxx>
 #include <PropertyMapper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/CircleKind.hpp>
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 5240872264e9..23593449a64f 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <PropertyMapper.hxx>
-#include <macros.hxx>
 #include <unonames.hxx>
 
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
@@ -114,7 +113,7 @@ void PropertyMapper::getValueMap(
             }
             catch( const uno::Exception& e )
             {
-                ASSERT_EXCEPTION( e );
+                SAL_WARN("chart2", "Exception caught. " << e );
             }
         }
     }
@@ -407,7 +406,7 @@ void PropertyMapper::setMultiProperties(
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e ); //if this occurs more often think of removing the XMultiPropertySet completely for better performance
+        SAL_WARN("chart2", "Exception caught. " << e ); //if this occurs more often think of removing the XMultiPropertySet completely for better performance
     }
 
     if(!bSuccess)
@@ -427,13 +426,13 @@ void PropertyMapper::setMultiProperties(
             }
             catch( const uno::Exception& e )
             {
-                ASSERT_EXCEPTION( e );
+                SAL_WARN("chart2", "Exception caught. " << e );
             }
         }
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 }
 
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index d6c408f583d4..3ed37f316225 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -21,7 +21,6 @@
 #include <ViewDefines.hxx>
 #include <Stripe.hxx>
 #include <CommonConverters.hxx>
-#include <macros.hxx>
 #include <RelativeSizeHelper.hxx>
 #include <PropertyMapper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -363,7 +362,7 @@ uno::Reference<drawing::XShape>
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     uno::Reference<drawing::XShape> xShape = impl_createCube( xTarget, rPosition, rSize, nRotateZAngleHundredthDegree, bRounded );
@@ -427,7 +426,7 @@ uno::Reference<drawing::XShape>
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     return xShape;
@@ -676,7 +675,7 @@ uno::Reference<drawing::XShape>
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     return xShape;
@@ -885,7 +884,7 @@ uno::Reference< drawing::XShape >
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
 
@@ -966,7 +965,7 @@ uno::Reference< drawing::XShape >
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     return xShape;
@@ -1026,7 +1025,7 @@ uno::Reference< drawing::XShape >
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     return xShape;
@@ -1089,7 +1088,7 @@ uno::Reference< drawing::XShape >
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     return xShape;
@@ -1129,7 +1128,7 @@ uno::Reference< drawing::XShape >
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     return xShape;
@@ -1678,7 +1677,7 @@ uno::Reference< drawing::XShape >
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     return xShape;
@@ -1715,7 +1714,7 @@ uno::Reference< drawing::XShape >
     }
     catch( const uno::Exception & e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
     OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet");
@@ -1727,7 +1726,7 @@ uno::Reference< drawing::XShape >
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     return xShape;
@@ -1763,7 +1762,7 @@ uno::Reference< drawing::XShapes >
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
     return nullptr;
 }
@@ -1800,7 +1799,7 @@ uno::Reference< drawing::XShapes >
                 }
                 catch( const uno::Exception& e )
                 {
-                    ASSERT_EXCEPTION( e );
+                    SAL_WARN("chart2", "Exception caught. " << e );
                 }
             }
         }
@@ -1816,7 +1815,7 @@ uno::Reference< drawing::XShapes >
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
     return nullptr;
 }
@@ -1846,7 +1845,7 @@ uno::Reference< drawing::XShape >
     }
     catch( const uno::Exception & e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 
     //set properties
@@ -1860,7 +1859,7 @@ uno::Reference< drawing::XShape >
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     return xShape;
@@ -1936,7 +1935,7 @@ uno::Reference< drawing::XShape >
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     return xShape;
@@ -2000,7 +1999,7 @@ uno::Reference< drawing::XShape >
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     return xShape;
@@ -2042,7 +2041,7 @@ uno::Reference< drawing::XShape > ShapeFactory::createInvisibleRectangle(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
     return nullptr;
 }
@@ -2127,7 +2126,7 @@ uno::Reference< drawing::XShape >
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     return xShape;
@@ -2230,7 +2229,7 @@ uno::Reference< drawing::XShape >
             }
             catch( const uno::Exception& e )
             {
-                ASSERT_EXCEPTION( e );
+                SAL_WARN("chart2", "Exception caught. " << e );
             }
         }
     }
@@ -2299,7 +2298,7 @@ uno::Reference< drawing::XShape >
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
 
         if(bStackCharacters)
@@ -2382,7 +2381,7 @@ uno::Reference< drawing::XShape >
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
     return xShape;
 }
diff --git a/chart2/source/view/main/VButton.cxx b/chart2/source/view/main/VButton.cxx
index 4902d54ff750..0f4e2bd534ae 100644
--- a/chart2/source/view/main/VButton.cxx
+++ b/chart2/source/view/main/VButton.cxx
@@ -20,7 +20,6 @@
 
 #include <CommonConverters.hxx>
 #include <editeng/unoprnms.hxx>
-#include <macros.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index a7b99992c39d..9f37d5237d04 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -20,7 +20,6 @@
 #include <memory>
 #include <VDataSeries.hxx>
 #include <ObjectIdentifier.hxx>
-#include <macros.hxx>
 #include <CommonConverters.hxx>
 #include <LabelPositionHelper.hxx>
 #include <ChartTypeHelper.hxx>
@@ -236,7 +235,7 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries )
             }
             catch( const uno::Exception& e )
             {
-                ASSERT_EXCEPTION( e );
+                SAL_WARN("chart2", "Exception caught. " << e );
             }
         }
     }
@@ -272,7 +271,7 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries )
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
 }
@@ -649,7 +648,7 @@ sal_Int32 VDataSeries::getLabelPlacement( sal_Int32 nPointIndex, const uno::Refe
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
     return nLabelPlacement;
 }
@@ -794,7 +793,7 @@ std::unique_ptr<Symbol> getSymbolPropertiesFromPropertySet( const uno::Reference
     }
     catch(const uno::Exception &e)
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
     return apSymbolProps;
 }
@@ -884,7 +883,7 @@ bool VDataSeries::hasPointOwnColor( sal_Int32 index ) const
     }
     catch(const uno::Exception& e)
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
     return false;
 }
@@ -933,7 +932,7 @@ std::unique_ptr<DataPointLabel> getDataPointLabelFromPropertySet( const uno::Ref
     }
     catch(const uno::Exception &e)
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
     return apLabel;
 }
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 012070dfebff..497c23acaec4 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -19,7 +19,6 @@
 
 #include "VLegend.hxx"
 #include "VButton.hxx"
-#include <macros.hxx>
 #include <PropertyMapper.hxx>
 #include <CommonConverters.hxx>
 #include <ObjectIdentifier.hxx>
@@ -81,7 +80,7 @@ double lcl_CalcViewFontSize(
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 
@@ -187,7 +186,7 @@ awt::Size lcl_createTextShapes(
         }
         catch( const uno::Exception & ex )
         {
-            ASSERT_EXCEPTION( ex );
+            SAL_WARN("chart2", "Exception caught. " << ex );
         }
     }
 
@@ -769,7 +768,7 @@ bool lcl_shouldSymbolsBePlacedOnTheLeftSide( const Reference< beans::XPropertySe
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
     return bSymbolsLeftSide;
 }
@@ -860,7 +859,7 @@ bool VLegend::isVisible( const Reference< XLegend > & xLegend )
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return bShow;
@@ -1005,7 +1004,7 @@ void VLegend::createShapes(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
@@ -1057,7 +1056,7 @@ void VLegend::changePosition(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 }
 
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx
index 17b1939e16ad..e72757e378c8 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <VLegendSymbolFactory.hxx>
-#include <macros.hxx>
 #include <PropertyMapper.hxx>
 #include <AbstractShapeFactory.hxx>
 #include <ObjectIdentifier.hxx>
@@ -188,7 +187,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol(
     }
     catch( const uno::Exception & ex )
     {
-        ASSERT_EXCEPTION( ex );
+        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return xResult;
diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx
index 1d30060ddcad..e694410ad298 100644
--- a/chart2/source/view/main/VLineProperties.cxx
+++ b/chart2/source/view/main/VLineProperties.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <VLineProperties.hxx>
-#include <macros.hxx>
 #include <com/sun/star/drawing/LineStyle.hpp>
 
 namespace chart
@@ -49,7 +48,7 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert
         }
         catch( const uno::Exception& e )
         {
-            ASSERT_EXCEPTION( e );
+            SAL_WARN("chart2", "Exception caught. " << e );
         }
     }
     else
diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx
index ec723460cbf2..3ef4e161bc15 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -19,7 +19,6 @@
 
 #include "VTitle.hxx"
 #include <CommonConverters.hxx>
-#include <macros.hxx>
 #include <PropertyMapper.hxx>
 #include <AbstractShapeFactory.hxx>
 #include <com/sun/star/chart2/XFormattedString.hpp>
@@ -100,7 +99,7 @@ void VTitle::changePosition( const awt::Point& rPos )
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 }
 
@@ -128,7 +127,7 @@ void VTitle::createShapes(
     }
     catch( const uno::Exception& e )
     {
-        ASSERT_EXCEPTION( e );
+        SAL_WARN("chart2", "Exception caught. " << e );
     }
 
     AbstractShapeFactory* pShapeFactory = AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory);