summaryrefslogtreecommitdiff
path: root/chart2/source/model
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-11-02 15:44:50 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-11-03 13:03:13 +0100
commitc4abbb6e10ecd382fd4fe6816cd4f29ea7d931a5 (patch)
tree5103eb6d820d4c89f6c6a76d2bbfb419ed8372ce /chart2/source/model
parent22a95ea367cc005a382de23e51cba850b6dd5e6f (diff)
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>
Diffstat (limited to 'chart2/source/model')
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx15
-rw-r--r--chart2/source/model/main/Axis.cxx7
-rw-r--r--chart2/source/model/main/BaseCoordinateSystem.cxx7
-rw-r--r--chart2/source/model/main/CartesianCoordinateSystem.cxx1
-rw-r--r--chart2/source/model/main/ChartModel.cxx9
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx19
-rw-r--r--chart2/source/model/main/DataPoint.cxx7
-rw-r--r--chart2/source/model/main/DataPointProperties.cxx1
-rw-r--r--chart2/source/model/main/DataSeries.cxx7
-rw-r--r--chart2/source/model/main/DataSeriesProperties.cxx1
-rw-r--r--chart2/source/model/main/Diagram.cxx7
-rw-r--r--chart2/source/model/main/FormattedString.cxx5
-rw-r--r--chart2/source/model/main/GridProperties.cxx5
-rw-r--r--chart2/source/model/main/Legend.cxx5
-rw-r--r--chart2/source/model/main/PageBackground.cxx5
-rw-r--r--chart2/source/model/main/PolarCoordinateSystem.cxx1
-rw-r--r--chart2/source/model/main/StockBar.cxx5
-rw-r--r--chart2/source/model/main/Title.cxx5
-rw-r--r--chart2/source/model/main/Wall.cxx5
-rw-r--r--chart2/source/model/template/AreaChartType.cxx1
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.cxx5
-rw-r--r--chart2/source/model/template/BarChartType.cxx1
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.cxx5
-rw-r--r--chart2/source/model/template/BubbleChartType.cxx1
-rw-r--r--chart2/source/model/template/BubbleChartTypeTemplate.cxx5
-rw-r--r--chart2/source/model/template/BubbleDataInterpreter.cxx7
-rw-r--r--chart2/source/model/template/CandleStickChartType.cxx3
-rw-r--r--chart2/source/model/template/ChartType.cxx5
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx3
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.cxx17
-rw-r--r--chart2/source/model/template/ColumnChartType.cxx1
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.cxx7
-rw-r--r--chart2/source/model/template/ColumnLineDataInterpreter.cxx1
-rw-r--r--chart2/source/model/template/DataInterpreter.cxx13
-rw-r--r--chart2/source/model/template/FilledNetChartType.cxx1
-rw-r--r--chart2/source/model/template/GL3DBarChartTypeTemplate.cxx5
-rw-r--r--chart2/source/model/template/LineChartType.cxx1
-rw-r--r--chart2/source/model/template/LineChartTypeTemplate.cxx11
-rw-r--r--chart2/source/model/template/NetChartType.cxx1
-rw-r--r--chart2/source/model/template/NetChartTypeTemplate.cxx7
-rw-r--r--chart2/source/model/template/PieChartType.cxx1
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.cxx17
-rw-r--r--chart2/source/model/template/ScatterChartType.cxx1
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.cxx11
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.cxx9
-rw-r--r--chart2/source/model/template/StockDataInterpreter.cxx5
-rw-r--r--chart2/source/model/template/XYDataInterpreter.cxx7
47 files changed, 111 insertions, 158 deletions
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index cf15a7f48aaf..4d7720e72d9b 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -18,7 +18,6 @@
*/
#include <XMLFilter.hxx>
-#include <macros.hxx>
#include <MediaDescriptorHelper.hxx>
#include <svtools/sfxecode.hxx>
@@ -120,7 +119,7 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage(
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xStorage;
}
@@ -173,7 +172,7 @@ uno::Reference< embed::XStorage > lcl_getReadStorage(
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xStorage;
@@ -393,7 +392,7 @@ ErrCode XMLFilter::impl_Import(
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
// something went awry
nWarning = ERRCODE_SFX_GENERAL;
@@ -503,7 +502,7 @@ ErrCode XMLFilter::impl_ImportStream(
}
catch (const uno::Exception& rEx)
{
- ASSERT_EXCEPTION(rEx);
+ SAL_WARN("chart2", "Exception caught. " << rEx);
}
}
@@ -647,7 +646,7 @@ ErrCode XMLFilter::impl_Export(
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
// something went awry
nWarning = ERRCODE_SFX_GENERAL;
@@ -690,7 +689,7 @@ ErrCode XMLFilter::impl_ExportStream(
}
catch (const uno::Exception& rEx)
{
- ASSERT_EXCEPTION( rEx );
+ SAL_WARN("chart2", "Exception caught. " << rEx );
}
xActiveDataSource->setOutputStream(xOutputStream);
@@ -720,7 +719,7 @@ ErrCode XMLFilter::impl_ExportStream(
}
catch (const uno::Exception& rEx)
{
- ASSERT_EXCEPTION( rEx );
+ SAL_WARN("chart2", "Exception caught. " << rEx );
}
return ERRCODE_NONE;
}
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 );
}
}
diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx
index a961416059f3..45ebcf72b310 100644
--- a/chart2/source/model/template/AreaChartType.cxx
+++ b/chart2/source/model/template/AreaChartType.cxx
@@ -18,7 +18,6 @@
*/
#include "AreaChartType.hxx"
-#include <macros.hxx>
#include <servicenames_charttypes.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index f76e8b0a43ef..6e443c948fe4 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -18,7 +18,6 @@
*/
#include "AreaChartTypeTemplate.hxx"
-#include <macros.hxx>
#include <servicenames_charttypes.hxx>
#include <DiagramHelper.hxx>
#include <DataSeriesHelper.hxx>
@@ -159,7 +158,7 @@ sal_Int32 AreaChartTypeTemplate::getDimension() const
}
catch( const beans::UnknownPropertyException & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return nDim;
@@ -214,7 +213,7 @@ Reference< chart2::XChartType > AreaChartTypeTemplate::getChartTypeForIndex( sal
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx
index 5d5391152527..6f11dd5458a2 100644
--- a/chart2/source/model/template/BarChartType.cxx
+++ b/chart2/source/model/template/BarChartType.cxx
@@ -18,7 +18,6 @@
*/
#include "BarChartType.hxx"
-#include <macros.hxx>
#include <servicenames_charttypes.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 05c45dfd9021..3845ae98d039 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -18,7 +18,6 @@
*/
#include "BarChartTypeTemplate.hxx"
-#include <macros.hxx>
#include <DiagramHelper.hxx>
#include <servicenames_charttypes.hxx>
#include <DataSeriesHelper.hxx>
@@ -206,7 +205,7 @@ Reference< chart2::XChartType > BarChartTypeTemplate::getChartTypeForIndex( sal_
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
@@ -260,7 +259,7 @@ void SAL_CALL BarChartTypeTemplate::applyStyle(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 6fc213a9ca14..8179594e2ceb 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -19,7 +19,6 @@
#include "BubbleChartType.hxx"
#include <PropertyHelper.hxx>
-#include <macros.hxx>
#include <servicenames_charttypes.hxx>
#include <CartesianCoordinateSystem.hxx>
#include <AxisHelper.hxx>
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index 89de378bb4ed..07eb859e104b 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -18,7 +18,6 @@
*/
#include "BubbleChartTypeTemplate.hxx"
-#include <macros.hxx>
#include "BubbleDataInterpreter.hxx"
#include <CartesianCoordinateSystem.hxx>
#include <Scaling.hxx>
@@ -169,7 +168,7 @@ Reference< chart2::XChartType > BubbleChartTypeTemplate::getChartTypeForIndex( s
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
@@ -191,7 +190,7 @@ Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeFo
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx
index da09e143dd08..364ed3459e38 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -19,7 +19,6 @@
#include "BubbleDataInterpreter.hxx"
#include <DataSeries.hxx>
-#include <macros.hxx>
#include <DataSeriesHelper.hxx>
#include <CommonConverters.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -112,7 +111,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -259,7 +258,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -281,7 +280,7 @@ sal_Bool SAL_CALL BubbleDataInterpreter::isDataCompatible(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 805cec720538..81f084540815 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -19,7 +19,6 @@
#include "CandleStickChartType.hxx"
#include <PropertyHelper.hxx>
-#include <macros.hxx>
#include <StockBar.hxx>
#include <servicenames_charttypes.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -195,7 +194,7 @@ CandleStickChartType::~CandleStickChartType()
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 920ce5696b54..d7eb954901bc 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -20,7 +20,6 @@
#include "ChartType.hxx"
#include <PropertyHelper.hxx>
#include <CommonFunctors.hxx>
-#include <macros.hxx>
#include <CartesianCoordinateSystem.hxx>
#include <AxisHelper.hxx>
#include <CloneHelper.hxx>
@@ -255,7 +254,7 @@ void SAL_CALL ChartType::addModifyListener( const uno::Reference< util::XModifyL
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -268,7 +267,7 @@ void SAL_CALL ChartType::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/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index db79928d211c..a94253a577ac 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -18,7 +18,6 @@
*/
#include <ChartTypeManager.hxx>
-#include <macros.hxx>
#include <StackMode.hxx>
#include <CartesianCoordinateSystem.hxx>
@@ -254,7 +253,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance(
// As XMultiServiceFactory does not specify, what to do in case
// createInstance is called with an unknown service-name, this
// function will just return an empty XInterface.
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
SAL_WARN("chart2", "Couldn't instantiate service: "<< aServiceSpecifier );
xResult.set( nullptr );
}
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 8f64b3291cc4..b06adcdfbda6 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -19,7 +19,6 @@
#include "ChartTypeTemplate.hxx"
#include <PropertyHelper.hxx>
-#include <macros.hxx>
#include <DataSeriesHelper.hxx>
#include "DataInterpreter.hxx"
#include <CommonConverters.hxx>
@@ -170,7 +169,7 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xDia;
@@ -251,7 +250,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -302,7 +301,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -361,7 +360,7 @@ sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return bResult;
@@ -411,7 +410,7 @@ void SAL_CALL ChartTypeTemplate::applyStyle(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -668,7 +667,7 @@ void ChartTypeTemplate::adaptScales(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -782,7 +781,7 @@ void ChartTypeTemplate::FillDiagram(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -852,7 +851,7 @@ void ChartTypeTemplate::createChartTypes(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx
index 3f0b0bbeaace..0655689d8f4e 100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -18,7 +18,6 @@
*/
#include "ColumnChartType.hxx"
-#include <macros.hxx>
#include <servicenames_charttypes.hxx>
#include <PropertyHelper.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index e245300cc4bc..afa2d8bcd038 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -18,7 +18,6 @@
*/
#include "ColumnLineChartTypeTemplate.hxx"
-#include <macros.hxx>
#include <CommonConverters.hxx>
#include <DiagramHelper.hxx>
#include <DataSeriesHelper.hxx>
@@ -227,7 +226,7 @@ void ColumnLineChartTypeTemplate::createChartTypes(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -339,7 +338,7 @@ sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return bResult;
@@ -375,7 +374,7 @@ Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNew
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
index 5a32fa1856c2..7f15eb7bcc70 100644
--- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx
+++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
@@ -19,7 +19,6 @@
#include "ColumnLineDataInterpreter.hxx"
#include <DataSeries.hxx>
-#include <macros.hxx>
#include <DataSeriesHelper.hxx>
#include <CommonConverters.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index bb6fdd0f3f69..445bc3598df7 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -21,7 +21,6 @@
#include <DataSeries.hxx>
#include <DataSourceHelper.hxx>
#include <DataSeriesHelper.hxx>
-#include <macros.hxx>
#include <CommonConverters.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
@@ -98,7 +97,7 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -179,7 +178,7 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -202,7 +201,7 @@ sal_Bool SAL_CALL DataInterpreter::isDataCompatible(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -296,7 +295,7 @@ Reference< data::XDataSource > SAL_CALL DataInterpreter::mergeInterpretedData(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -318,7 +317,7 @@ OUString DataInterpreter::GetRole( const Reference< data::XDataSequence > & xSeq
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return aResult;
}
@@ -334,7 +333,7 @@ void DataInterpreter::SetRole( const Reference< data::XDataSequence > & xSeq, co
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx
index 2ee5272edeca..e693671f9b07 100644
--- a/chart2/source/model/template/FilledNetChartType.cxx
+++ b/chart2/source/model/template/FilledNetChartType.cxx
@@ -19,7 +19,6 @@
#include "FilledNetChartType.hxx"
#include <PropertyHelper.hxx>
-#include <macros.hxx>
#include <PolarCoordinateSystem.hxx>
#include <Scaling.hxx>
#include <servicenames_charttypes.hxx>
diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
index ed5ba7807abf..668472e54f04 100644
--- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
@@ -14,7 +14,6 @@
#include <PropertyHelper.hxx>
#include <DiagramHelper.hxx>
#include <unonames.hxx>
-#include <macros.hxx>
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -119,7 +118,7 @@ uno::Reference<chart2::XChartType> GL3DBarChartTypeTemplate::getChartTypeForInde
}
catch (const uno::Exception & ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
@@ -161,7 +160,7 @@ GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Ref
}
catch (const uno::Exception & ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index df7b76ecb91f..3c25980e2eaa 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -19,7 +19,6 @@
#include "LineChartType.hxx"
#include <PropertyHelper.hxx>
-#include <macros.hxx>
#include <servicenames_charttypes.hxx>
#include <unonames.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index bdba0b44c3e1..58adeffc6659 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -18,7 +18,6 @@
*/
#include "LineChartTypeTemplate.hxx"
-#include <macros.hxx>
#include <DiagramHelper.hxx>
#include <servicenames_charttypes.hxx>
#include <DataSeriesHelper.hxx>
@@ -243,7 +242,7 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -272,7 +271,7 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -303,7 +302,7 @@ Reference< chart2::XChartType > LineChartTypeTemplate::getChartTypeForIndex( sal
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
@@ -336,7 +335,7 @@ Reference< chart2::XChartType > SAL_CALL LineChartTypeTemplate::getChartTypeForN
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
@@ -360,7 +359,7 @@ void SAL_CALL LineChartTypeTemplate::applyStyle(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index 0e195ce33886..829a2f27d41d 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -19,7 +19,6 @@
#include "NetChartType.hxx"
#include <PropertyHelper.hxx>
-#include <macros.hxx>
#include <PolarCoordinateSystem.hxx>
#include <servicenames_charttypes.hxx>
#include <AxisIndexDefines.hxx>
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx
index 3cae40b53763..9cea513a8f8d 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -18,7 +18,6 @@
*/
#include "NetChartTypeTemplate.hxx"
-#include <macros.hxx>
#include <PolarCoordinateSystem.hxx>
#include <DiagramHelper.hxx>
#include <servicenames_charttypes.hxx>
@@ -75,7 +74,7 @@ void SAL_CALL NetChartTypeTemplate::applyStyle(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -139,7 +138,7 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -175,7 +174,7 @@ Reference< chart2::XChartType > NetChartTypeTemplate::getChartTypeForIndex( sal_
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 247b5480a2fa..f99ab3c1a408 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -19,7 +19,6 @@
#include "PieChartType.hxx"
#include <PropertyHelper.hxx>
-#include <macros.hxx>
#include <PolarCoordinateSystem.hxx>
#include <AxisHelper.hxx>
#include <servicenames_charttypes.hxx>
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 15fdbf494d13..b7b9f109df0c 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -18,7 +18,6 @@
*/
#include "PieChartTypeTemplate.hxx"
-#include <macros.hxx>
#include <CommonConverters.hxx>
#include <DiagramHelper.hxx>
#include <servicenames_charttypes.hxx>
@@ -197,7 +196,7 @@ sal_Int32 PieChartTypeTemplate::getDimension() const
}
catch( const beans::UnknownPropertyException & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return nDim;
@@ -250,7 +249,7 @@ void PieChartTypeTemplate::adaptScales(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -292,7 +291,7 @@ void PieChartTypeTemplate::createChartTypes(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -362,7 +361,7 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
bResult = false;
}
}
@@ -402,7 +401,7 @@ Reference< chart2::XChartType > PieChartTypeTemplate::getChartTypeForIndex( sal_
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
@@ -430,7 +429,7 @@ Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNe
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
@@ -521,7 +520,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -558,7 +557,7 @@ void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagr
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 2dd540dce972..0e5e2c66cc62 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -19,7 +19,6 @@
#include "ScatterChartType.hxx"
#include <PropertyHelper.hxx>
-#include <macros.hxx>
#include <servicenames_charttypes.hxx>
#include <CartesianCoordinateSystem.hxx>
#include <AxisHelper.hxx>
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 2e3c63453131..9e1874d82801 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -18,7 +18,6 @@
*/
#include "ScatterChartTypeTemplate.hxx"
-#include <macros.hxx>
#include "XYDataInterpreter.hxx"
#include <CartesianCoordinateSystem.hxx>
#include <DiagramHelper.hxx>
@@ -213,7 +212,7 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -275,7 +274,7 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -304,7 +303,7 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -335,7 +334,7 @@ Reference< chart2::XChartType > ScatterChartTypeTemplate::getChartTypeForIndex(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
@@ -368,7 +367,7 @@ Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeF
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index 73c9f2ff1691..e53f285c472f 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -18,7 +18,6 @@
*/
#include "StockChartTypeTemplate.hxx"
-#include <macros.hxx>
#include <DataSeriesHelper.hxx>
#include "StockDataInterpreter.hxx"
#include <CartesianCoordinateSystem.hxx>
@@ -252,7 +251,7 @@ void SAL_CALL StockChartTypeTemplate::applyStyle(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -387,7 +386,7 @@ void StockChartTypeTemplate::createChartTypes(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -467,7 +466,7 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return bResult;
@@ -488,7 +487,7 @@ Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSerie
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx
index d3854b4db598..ea0b1c68f1d4 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -19,7 +19,6 @@
#include "StockDataInterpreter.hxx"
#include <DataSeries.hxx>
-#include <macros.hxx>
#include <DataSeriesHelper.hxx>
#include <CommonConverters.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -246,7 +245,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -304,7 +303,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx
index de6b8eba5bff..f7d1ec1ca2de 100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -19,7 +19,6 @@
#include "XYDataInterpreter.hxx"
#include <DataSeries.hxx>
-#include <macros.hxx>
#include <DataSeriesHelper.hxx>
#include <CommonConverters.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -96,7 +95,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -220,7 +219,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -243,7 +242,7 @@ sal_Bool SAL_CALL XYDataInterpreter::isDataCompatible(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}