[Libreoffice-commits] core.git: chart2/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Nov 3 12:03:45 UTC 2017
chart2/source/controller/accessibility/AccessibleBase.cxx | 3
chart2/source/controller/accessibility/AccessibleChartElement.cxx | 3
chart2/source/controller/accessibility/AccessibleChartView.cxx | 1
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx | 1
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 3
chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx | 1
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 1
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 29 ++----
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 1
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 9 -
chart2/source/controller/chartapiwrapper/GridWrapper.cxx | 3
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 1
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 3
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 1
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 3
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx | 3
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx | 3
chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx | 1
chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 1
chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx | 3
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 9 -
chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx | 1
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 5 -
chart2/source/controller/dialogs/DataBrowser.cxx | 1
chart2/source/controller/dialogs/DataBrowserModel.cxx | 7 -
chart2/source/controller/dialogs/DialogModel.cxx | 19 +---
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 7 -
chart2/source/controller/dialogs/RangeSelectionHelper.cxx | 7 -
chart2/source/controller/dialogs/dlg_ChartType.cxx | 1
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 1
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 3
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx | 3
chart2/source/controller/dialogs/dlg_View3D.cxx | 1
chart2/source/controller/dialogs/res_ErrorBar.cxx | 3
chart2/source/controller/dialogs/res_LegendPosition.cxx | 5 -
chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 5 -
chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx | 3
chart2/source/controller/dialogs/tp_ChartType.cxx | 9 -
chart2/source/controller/dialogs/tp_DataSource.cxx | 11 +-
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 1
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx | 1
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 1
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx | 3
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 1
chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx | 5 -
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 13 +-
chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx | 5 -
chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx | 5 -
chart2/source/controller/itemsetwrapper/ItemConverter.cxx | 5 -
chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx | 3
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx | 1
chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx | 1
chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx | 5 -
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 7 -
chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx | 13 +-
chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx | 1
chart2/source/controller/main/ChartController.cxx | 7 -
chart2/source/controller/main/ChartController_EditData.cxx | 1
chart2/source/controller/main/ChartController_Insert.cxx | 27 ++---
chart2/source/controller/main/ChartController_Position.cxx | 3
chart2/source/controller/main/ChartController_Properties.cxx | 3
chart2/source/controller/main/ChartController_TextEdit.cxx | 1
chart2/source/controller/main/ChartController_Tools.cxx | 7 -
chart2/source/controller/main/ChartController_Window.cxx | 9 -
chart2/source/controller/main/ChartFrameloader.cxx | 3
chart2/source/controller/main/CommandDispatch.cxx | 3
chart2/source/controller/main/CommandDispatchContainer.cxx | 1
chart2/source/controller/main/ConfigurationAccess.cxx | 1
chart2/source/controller/main/ControllerCommandDispatch.cxx | 5 -
chart2/source/controller/main/DragMethod_Base.cxx | 1
chart2/source/controller/main/DragMethod_PieSegment.cxx | 3
chart2/source/controller/main/DragMethod_RotateDiagram.cxx | 1
chart2/source/controller/main/DrawCommandDispatch.cxx | 1
chart2/source/controller/main/ElementSelector.cxx | 1
chart2/source/controller/main/ObjectHierarchy.cxx | 5 -
chart2/source/controller/main/PositionAndSizeHelper.cxx | 1
chart2/source/controller/main/SelectionHelper.cxx | 1
chart2/source/controller/main/ShapeController.cxx | 5 -
chart2/source/controller/main/StatusBarCommandDispatch.cxx | 1
chart2/source/controller/main/UndoCommandDispatch.cxx | 1
chart2/source/inc/macros.hxx | 32 ------
chart2/source/model/filter/XMLFilter.cxx | 15 +--
chart2/source/model/main/Axis.cxx | 7 -
chart2/source/model/main/BaseCoordinateSystem.cxx | 7 -
chart2/source/model/main/CartesianCoordinateSystem.cxx | 1
chart2/source/model/main/ChartModel.cxx | 9 -
chart2/source/model/main/ChartModel_Persistence.cxx | 19 +---
chart2/source/model/main/DataPoint.cxx | 7 -
chart2/source/model/main/DataPointProperties.cxx | 1
chart2/source/model/main/DataSeries.cxx | 7 -
chart2/source/model/main/DataSeriesProperties.cxx | 1
chart2/source/model/main/Diagram.cxx | 7 -
chart2/source/model/main/FormattedString.cxx | 5 -
chart2/source/model/main/GridProperties.cxx | 5 -
chart2/source/model/main/Legend.cxx | 5 -
chart2/source/model/main/PageBackground.cxx | 5 -
chart2/source/model/main/PolarCoordinateSystem.cxx | 1
chart2/source/model/main/StockBar.cxx | 5 -
chart2/source/model/main/Title.cxx | 5 -
chart2/source/model/main/Wall.cxx | 5 -
chart2/source/model/template/AreaChartType.cxx | 1
chart2/source/model/template/AreaChartTypeTemplate.cxx | 5 -
chart2/source/model/template/BarChartType.cxx | 1
chart2/source/model/template/BarChartTypeTemplate.cxx | 5 -
chart2/source/model/template/BubbleChartType.cxx | 1
chart2/source/model/template/BubbleChartTypeTemplate.cxx | 5 -
chart2/source/model/template/BubbleDataInterpreter.cxx | 7 -
chart2/source/model/template/CandleStickChartType.cxx | 3
chart2/source/model/template/ChartType.cxx | 5 -
chart2/source/model/template/ChartTypeManager.cxx | 3
chart2/source/model/template/ChartTypeTemplate.cxx | 17 +--
chart2/source/model/template/ColumnChartType.cxx | 1
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 7 -
chart2/source/model/template/ColumnLineDataInterpreter.cxx | 1
chart2/source/model/template/DataInterpreter.cxx | 13 +-
chart2/source/model/template/FilledNetChartType.cxx | 1
chart2/source/model/template/GL3DBarChartTypeTemplate.cxx | 5 -
chart2/source/model/template/LineChartType.cxx | 1
chart2/source/model/template/LineChartTypeTemplate.cxx | 11 +-
chart2/source/model/template/NetChartType.cxx | 1
chart2/source/model/template/NetChartTypeTemplate.cxx | 7 -
chart2/source/model/template/PieChartType.cxx | 1
chart2/source/model/template/PieChartTypeTemplate.cxx | 17 +--
chart2/source/model/template/ScatterChartType.cxx | 1
chart2/source/model/template/ScatterChartTypeTemplate.cxx | 11 +-
chart2/source/model/template/StockChartTypeTemplate.cxx | 9 -
chart2/source/model/template/StockDataInterpreter.cxx | 5 -
chart2/source/model/template/XYDataInterpreter.cxx | 7 -
chart2/source/tools/AxisHelper.cxx | 11 +-
chart2/source/tools/CachedDataSequence.cxx | 5 -
chart2/source/tools/CharacterProperties.cxx | 1
chart2/source/tools/ChartModelHelper.cxx | 5 -
chart2/source/tools/ChartTypeHelper.cxx | 3
chart2/source/tools/ChartViewHelper.cxx | 3
chart2/source/tools/ColorPerPointHelper.cxx | 1
chart2/source/tools/ConfigColorScheme.cxx | 1
chart2/source/tools/DataSeriesHelper.cxx | 21 ++--
chart2/source/tools/DataSourceHelper.cxx | 7 -
chart2/source/tools/DiagramHelper.cxx | 33 +++----
chart2/source/tools/ErrorBar.cxx | 5 -
chart2/source/tools/ExplicitCategoriesProvider.cxx | 3
chart2/source/tools/ExponentialRegressionCurveCalculator.cxx | 1
chart2/source/tools/FillProperties.cxx | 1
chart2/source/tools/FormattedStringHelper.cxx | 3
chart2/source/tools/InternalDataProvider.cxx | 3
chart2/source/tools/LabeledDataSequence.cxx | 5 -
chart2/source/tools/LegendHelper.cxx | 3
chart2/source/tools/LifeTime.cxx | 3
chart2/source/tools/LinePropertiesHelper.cxx | 9 -
chart2/source/tools/LinearRegressionCurveCalculator.cxx | 1
chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx | 1
chart2/source/tools/MeanValueRegressionCurveCalculator.cxx | 1
chart2/source/tools/ModifyListenerHelper.cxx | 5 -
chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx | 1
chart2/source/tools/NumberFormatterWrapper.cxx | 1
chart2/source/tools/ObjectIdentifier.cxx | 7 -
chart2/source/tools/PolynomialRegressionCurveCalculator.cxx | 1
chart2/source/tools/PotentialRegressionCurveCalculator.cxx | 1
chart2/source/tools/PropertyHelper.cxx | 5 -
chart2/source/tools/RangeHighlighter.cxx | 5 -
chart2/source/tools/ReferenceSizeProvider.cxx | 9 -
chart2/source/tools/RegressionCurveHelper.cxx | 21 ++--
chart2/source/tools/RegressionCurveModel.cxx | 5 -
chart2/source/tools/RegressionEquation.cxx | 5 -
chart2/source/tools/RelativeSizeHelper.cxx | 3
chart2/source/tools/SceneProperties.cxx | 1
chart2/source/tools/StatisticsHelper.cxx | 3
chart2/source/tools/ThreeDHelper.cxx | 21 ++--
chart2/source/tools/TitleHelper.cxx | 5 -
chart2/source/tools/UncachedDataSequence.cxx | 5 -
chart2/source/tools/UserDefinedProperties.cxx | 1
chart2/source/tools/WrappedDefaultProperty.cxx | 3
chart2/source/tools/WrappedDirectStateProperty.cxx | 1
chart2/source/tools/WrappedIgnoreProperty.cxx | 1
chart2/source/tools/WrappedProperty.cxx | 3
chart2/source/tools/WrappedPropertySet.cxx | 7 -
chart2/source/view/axes/ScaleAutomatism.cxx | 1
chart2/source/view/axes/VAxisBase.cxx | 1
chart2/source/view/axes/VAxisProperties.cxx | 7 -
chart2/source/view/axes/VCartesianAxis.cxx | 3
chart2/source/view/axes/VCartesianCoordinateSystem.cxx | 1
chart2/source/view/axes/VCartesianGrid.cxx | 1
chart2/source/view/axes/VCoordinateSystem.cxx | 3
chart2/source/view/axes/VPolarAngleAxis.cxx | 1
chart2/source/view/axes/VPolarAxis.cxx | 1
chart2/source/view/axes/VPolarGrid.cxx | 1
chart2/source/view/charttypes/AreaChart.cxx | 1
chart2/source/view/charttypes/BarChart.cxx | 7 -
chart2/source/view/charttypes/BubbleChart.cxx | 1
chart2/source/view/charttypes/CandleStickChart.cxx | 3
chart2/source/view/charttypes/NetChart.cxx | 1
chart2/source/view/charttypes/PieChart.cxx | 7 -
chart2/source/view/charttypes/VSeriesPlotter.cxx | 11 +-
chart2/source/view/diagram/VDiagram.cxx | 9 -
chart2/source/view/main/AbstractShapeFactory.cxx | 7 -
chart2/source/view/main/ChartItemPool.cxx | 1
chart2/source/view/main/ChartView.cxx | 17 +--
chart2/source/view/main/DataPointSymbolSupplier.cxx | 1
chart2/source/view/main/DrawModelWrapper.cxx | 1
chart2/source/view/main/LabelPositionHelper.cxx | 1
chart2/source/view/main/OpenglShapeFactory.cxx | 1
chart2/source/view/main/PropertyMapper.cxx | 9 -
chart2/source/view/main/ShapeFactory.cxx | 47 ++++------
chart2/source/view/main/VButton.cxx | 1
chart2/source/view/main/VDataSeries.cxx | 13 +-
chart2/source/view/main/VLegend.cxx | 13 +-
chart2/source/view/main/VLegendSymbolFactory.cxx | 3
chart2/source/view/main/VLineProperties.cxx | 3
chart2/source/view/main/VTitle.cxx | 5 -
220 files changed, 416 insertions(+), 667 deletions(-)
New commits:
commit c4abbb6e10ecd382fd4fe6816cd4f29ea7d931a5
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Nov 2 15:44:50 2017 +0200
inline ASSERT_EXCEPTION macro in chart2
Change-Id: I6bdcde5fd416531e2cdd3c9ec160833f1022247c
Reviewed-on: https://gerrit.libreoffice.org/44246
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 21fd14938ac0..354fcc7b83f2 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -22,7 +22,6 @@
#include <ObjectHierarchy.hxx>
#include <ObjectIdentifier.hxx>
#include <chartview/ExplicitValueProvider.hxx>
-#include <macros.hxx>
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -815,7 +814,7 @@ sal_Int32 AccessibleBase::getColor( eColorType eColType )
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 86cf55422c32..bd37dc235403 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -22,7 +22,6 @@
#include <ObjectIdentifier.hxx>
#include <ObjectNameProvider.hxx>
#include <servicenames.hxx>
-#include <macros.hxx>
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/chart2/XTitle.hpp>
@@ -107,7 +106,7 @@ void AccessibleChartElement::InitTextEdit()
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 9ea44eea283b..77ecccc508d6 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -20,7 +20,6 @@
#include <AccessibleChartView.hxx>
#include <chartview/ExplicitValueProvider.hxx>
#include <servicenames.hxx>
-#include <macros.hxx>
#include <ObjectHierarchy.hxx>
#include <ObjectIdentifier.hxx>
#include <ResId.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index e80c66bc2541..c31b10180919 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -18,7 +18,6 @@
*/
#include "AreaWrapper.hxx"
-#include <macros.hxx>
#include "Chart2ModelContact.hxx"
#include <WrappedDirectStateProperty.hxx>
#include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 2491cbc81d8b..ba1fb4b91ae0 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -21,7 +21,6 @@
#include <AxisHelper.hxx>
#include <TitleHelper.hxx>
#include "Chart2ModelContact.hxx"
-#include <macros.hxx>
#include <WrappedDirectStateProperty.hxx>
#include "GridWrapper.hxx"
#include "TitleWrapper.hxx"
@@ -587,7 +586,7 @@ Reference< chart2::XAxis > AxisWrapper::getAxis()
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xAxis;
}
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index c2135a1cb6b2..ffc60ec31ced 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -21,7 +21,6 @@
#include <ChartModelHelper.hxx>
#include <LegendHelper.hxx>
#include <CommonConverters.hxx>
-#include <macros.hxx>
#include <servicenames.hxx>
#include <ObjectIdentifier.hxx>
#include <chartview/ExplicitValueProvider.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 9b4afd3b0b40..4b0058d2bca8 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -18,7 +18,6 @@
*/
#include "ChartDataWrapper.hxx"
-#include <macros.hxx>
#include <DiagramHelper.hxx>
#include <DataSourceHelper.hxx>
#include <servicenames_charttypes.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 739fd358b06e..97f605edf7bc 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -18,7 +18,6 @@
*/
#include <ChartDocumentWrapper.hxx>
-#include <macros.hxx>
#include <servicenames.hxx>
#include <PropertyHelper.hxx>
#include <TitleHelper.hxx>
@@ -472,7 +471,7 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -490,7 +489,7 @@ Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropert
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return aRet;
}
@@ -539,7 +538,7 @@ void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, cons
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -552,7 +551,7 @@ Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XProp
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return aRet;
}
@@ -601,7 +600,7 @@ void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -614,7 +613,7 @@ Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPrope
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return aRet;
}
@@ -700,7 +699,7 @@ Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram()
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -734,7 +733,7 @@ void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDi
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -887,7 +886,7 @@ void SAL_CALL ChartDocumentWrapper::dispose()
}
catch (const uno::Exception &ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -919,11 +918,11 @@ void ChartDocumentWrapper::impl_resetAddIn()
}
catch (const uno::RuntimeException& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -1234,7 +1233,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -1269,7 +1268,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -1374,7 +1373,7 @@ void SAL_CALL ChartDocumentWrapper::setDelegator(
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 7f19a8c0bdce..36619d12417c 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -18,7 +18,6 @@
*/
#include "DataSeriesPointWrapper.hxx"
-#include <macros.hxx>
#include <RegressionCurveHelper.hxx>
#include "Chart2ModelContact.hxx"
#include <ChartTypeHelper.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 928b362d2245..6c83d564b6dd 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -18,7 +18,6 @@
*/
#include "DiagramWrapper.hxx"
-#include <macros.hxx>
#include <servicenames_charttypes.hxx>
#include "DataSeriesPointWrapper.hxx"
#include "AxisWrapper.hxx"
@@ -1470,7 +1469,7 @@ bool WrappedNumberOfLinesProperty::detectInnerValue( uno::Any& rInnerValue ) con
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -1513,7 +1512,7 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
else
@@ -1540,7 +1539,7 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -1763,7 +1762,7 @@ void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, con
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 43d1ca0a5660..21dec1a71530 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -18,7 +18,6 @@
*/
#include "GridWrapper.hxx"
-#include <macros.hxx>
#include <AxisHelper.hxx>
#include "Chart2ModelContact.hxx"
#include <AxisIndexDefines.hxx>
@@ -147,7 +146,7 @@ Reference< beans::XPropertySet > GridWrapper::getInnerPropertySet()
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xRet;
}
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index ff7320ef6141..f515e7d1b797 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -18,7 +18,6 @@
*/
#include "LegendWrapper.hxx"
-#include <macros.hxx>
#include "Chart2ModelContact.hxx"
#include <LegendHelper.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 072b1cfbe141..cd626e611bf9 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -18,7 +18,6 @@
*/
#include "MinMaxLineWrapper.hxx"
-#include <macros.hxx>
#include "Chart2ModelContact.hxx"
#include <DiagramHelper.hxx>
#include <servicenames_charttypes.hxx>
@@ -261,7 +260,7 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUStrin
}
catch( const beans::UnknownPropertyException& ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
//todo: store unknown properties elsewhere
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 9dfa2289c341..b98950ca4278 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -18,7 +18,6 @@
*/
#include "TitleWrapper.hxx"
-#include <macros.hxx>
#include <ControllerLockGuard.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 8b940cb3fc64..fef4f56afdc9 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -18,7 +18,6 @@
*/
#include "UpDownBarWrapper.hxx"
-#include <macros.hxx>
#include "Chart2ModelContact.hxx"
#include <DiagramHelper.hxx>
#include <servicenames_charttypes.hxx>
@@ -237,7 +236,7 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString
}
catch( const beans::UnknownPropertyException& ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
//todo: store unknown properties elsewhere
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 3757e08f42ef..c0d3ce259cf1 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -18,7 +18,6 @@
*/
#include "WallFloorWrapper.hxx"
-#include <macros.hxx>
#include "Chart2ModelContact.hxx"
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
index d8d6b1377947..5b5eef470939 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
@@ -18,7 +18,6 @@
*/
#include "WrappedAddInProperty.hxx"
-#include <macros.hxx>
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index 0bbf238aa566..a418504eba57 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -19,7 +19,6 @@
#include "WrappedAutomaticPositionProperties.hxx"
#include <FastPropertyIdRanges.hxx>
-#include <macros.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart2/RelativePosition.hpp>
@@ -67,7 +66,7 @@ void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue,
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 17bdffa374d8..72b8a48a3dce 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -21,7 +21,6 @@
#include <AxisHelper.hxx>
#include <ChartModelHelper.hxx>
#include <TitleHelper.hxx>
-#include <macros.hxx>
using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index 9b291fbf5c13..a1a2a99796a8 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -18,7 +18,6 @@
*/
#include "WrappedCharacterHeightProperty.hxx"
-#include <macros.hxx>
#include <RelativeSizeHelper.hxx>
#include "ReferenceSizePropertyProvider.hxx"
#include <osl/diagnose.h>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index 673602158f77..65588cfb3b60 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -19,7 +19,6 @@
#include "WrappedDataCaptionProperties.hxx"
#include "WrappedSeriesOrDiagramProperty.hxx"
-#include <macros.hxx>
#include <FastPropertyIdRanges.hxx>
#include <unonames.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
index f9943cc8b949..43c9951e4ccf 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
@@ -18,7 +18,6 @@
*/
#include "WrappedGapwidthProperty.hxx"
-#include <macros.hxx>
#include <DiagramHelper.hxx>
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index a76f94a3e06a..2a079001caeb 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -18,7 +18,6 @@
*/
#include "WrappedNumberFormatProperty.hxx"
-#include <macros.hxx>
#include <unonames.hxx>
#include <osl/diagnose.h>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index db525c4606ae..5153e6b5bf80 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -18,7 +18,6 @@
*/
#include "WrappedScaleProperty.hxx"
-#include <macros.hxx>
#include <CommonConverters.hxx>
#include <AxisHelper.hxx>
#include <com/sun/star/chart2/XAxis.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 273ac2ac2aef..90a3e1942e5a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -19,7 +19,6 @@
#include "WrappedScaleTextProperties.hxx"
#include <FastPropertyIdRanges.hxx>
-#include <macros.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -77,7 +76,7 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index 3e3edf85eb6f..46fe265a171d 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -18,7 +18,6 @@
*/
#include "WrappedSceneProperty.hxx"
-#include <macros.hxx>
#include <DiagramHelper.hxx>
#include <servicenames_charttypes.hxx>
#include <BaseGFXHelper.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
index 056dc2fe2510..ee5cdbf05061 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
@@ -19,7 +19,6 @@
#include "WrappedSeriesAreaOrLineProperty.hxx"
#include "DataSeriesPointWrapper.hxx"
-#include <macros.hxx>
namespace chart
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
index 110b298d7991..63d5c90b6a16 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
@@ -21,7 +21,6 @@
#include <WrappedProperty.hxx>
#include "Chart2ModelContact.hxx"
-#include <macros.hxx>
#include <DiagramHelper.hxx>
#include <com/sun/star/chart2/XDataSeries.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index 1e673add5f50..cce7e84dccbf 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -18,7 +18,6 @@
*/
#include "WrappedSplineProperties.hxx"
-#include <macros.hxx>
#include <FastPropertyIdRanges.hxx>
#include <DiagramHelper.hxx>
#include <unonames.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 7d574d181b37..ed91053b1944 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -19,7 +19,6 @@
#include "WrappedStatisticProperties.hxx"
#include "WrappedSeriesOrDiagramProperty.hxx"
-#include <macros.hxx>
#include <FastPropertyIdRanges.hxx>
#include <RegressionCurveHelper.hxx>
#include <DiagramHelper.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index a6592bc1caa3..d57d65fcac89 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -18,7 +18,6 @@
*/
#include "WrappedStockProperties.hxx"
-#include <macros.hxx>
#include <FastPropertyIdRanges.hxx>
#include <DiagramHelper.hxx>
#include <ChartModelHelper.hxx>
@@ -94,7 +93,7 @@ void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, c
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 5aa508d93ed0..0547222017c8 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -19,7 +19,6 @@
#include "WrappedSymbolProperties.hxx"
#include "WrappedSeriesOrDiagramProperty.hxx"
-#include <macros.hxx>
#include <FastPropertyIdRanges.hxx>
#include <ChartTypeHelper.hxx>
#include <com/sun/star/chart2/Symbol.hpp>
@@ -340,7 +339,7 @@ void WrappedSymbolBitmapURLProperty::setValueToSeries(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -379,7 +378,7 @@ void lcl_correctSymbolSizeForBitmaps( chart2::Symbol& rSymbol )
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
if(!bFoundSize)
@@ -400,7 +399,7 @@ void lcl_correctSymbolSizeForBitmaps( chart2::Symbol& rSymbol )
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
@@ -458,7 +457,7 @@ beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Referenc
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return beans::PropertyState_DEFAULT_VALUE;
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
index 9772f75757ee..b6da99147888 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
@@ -18,7 +18,6 @@
*/
#include "WrappedTextRotationProperty.hxx"
-#include <macros.hxx>
#include <com/sun/star/beans/XPropertyState.hpp>
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 45df9b05efb4..06680ce8965a 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -22,7 +22,6 @@
#include <helpids.h>
#include <strings.hrc>
#include <bitmaps.hlst>
-#include <macros.hxx>
#include <ChartModelHelper.hxx>
#include <DiagramHelper.hxx>
#include <ControllerLockGuard.hxx>
@@ -319,7 +318,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -1209,7 +1208,7 @@ void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypePar
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
if( nNumLines < 0 )
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 02b2856d1ae1..5071974206a3 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -27,7 +27,6 @@
#include <DiagramHelper.hxx>
#include <ChartModelHelper.hxx>
#include <CommonConverters.hxx>
-#include <macros.hxx>
#include <NumberFormatterWrapper.hxx>
#include <servicenames_charttypes.hxx>
#include <ResId.hxx>
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index c0d53e57bf36..4a7b0ab6a9fe 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -24,7 +24,6 @@
#include <DataSeriesHelper.hxx>
#include <PropertyHelper.hxx>
#include <ControllerLockGuard.hxx>
-#include <macros.hxx>
#include <StatisticsHelper.hxx>
#include <ChartTypeHelper.hxx>
#include <chartview/ExplicitValueProvider.hxx>
@@ -72,7 +71,7 @@ OUString lcl_getRole(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
return aResult;
@@ -120,7 +119,7 @@ bool lcl_SequenceOfSeriesIsShared(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return bResult;
}
@@ -961,7 +960,7 @@ void DataBrowserModel::addErrorBarRanges(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 752908ec9c89..bea059e0b26c 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -23,7 +23,6 @@
#include <DataSeriesHelper.hxx>
#include <DataSourceHelper.hxx>
#include <DiagramHelper.hxx>
-#include <macros.hxx>
#include <strings.hrc>
#include <ResId.hxx>
#include <ContainerHelper.hxx>
@@ -158,7 +157,7 @@ struct lcl_DataSeriesContainerAppend : public
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return *this;
}
@@ -217,7 +216,7 @@ struct lcl_RolesWithRangeAppend : public
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return *this;
}
@@ -427,7 +426,7 @@ std::vector< Reference< XDataSeriesContainer > >
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return aResult;
@@ -518,7 +517,7 @@ DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return aResult;
}
@@ -575,7 +574,7 @@ Reference< chart2::XDataSeries > DialogModel::insertSeriesAfter(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xNewSeries;
}
@@ -603,7 +602,7 @@ Reference< data::XLabeledDataSequence > DialogModel::getCategories() const
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
}
@@ -668,7 +667,7 @@ void DialogModel::detectArguments(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -721,7 +720,7 @@ void DialogModel::setData(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -821,7 +820,7 @@ void DialogModel::applyInterpretedData(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index ddcff83b81a3..806adf92c8e0 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -20,7 +20,6 @@
#include <ObjectNameProvider.hxx>
#include <ResId.hxx>
#include <strings.hrc>
-#include <macros.hxx>
#include <AxisHelper.hxx>
#include <ChartModelHelper.hxx>
#include <DiagramHelper.hxx>
@@ -171,7 +170,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
}
@@ -626,7 +625,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -695,7 +694,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
index ca32b06a8d74..dc3b943c021b 100644
--- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
@@ -19,7 +19,6 @@
#include <RangeSelectionHelper.hxx>
#include <RangeSelectionListener.hxx>
-#include <macros.hxx>
#include <com/sun/star/awt/XTopWindow.hpp>
using namespace ::com::sun::star;
@@ -56,7 +55,7 @@ Reference< sheet::XRangeSelection > const & RangeSelectionHelper::getRangeSelect
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
m_xRangeSelection.clear();
}
@@ -87,7 +86,7 @@ void RangeSelectionHelper::raiseRangeSelectionDocument()
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -134,7 +133,7 @@ bool RangeSelectionHelper::chooseRange(
catch( const uno::Exception & ex )
{
bResult = false;
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return bResult;
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index cae727eb5b63..981d6b08c160 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -22,7 +22,6 @@
#include "TabPageIds.h"
#include <strings.hrc>
#include "tp_ChartType.hxx"
-#include <macros.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <vcl/layout.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 83531433d1f7..8cf6e4252c43 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -19,7 +19,6 @@
#include <dlg_CreationWizard.hxx>
#include <ResId.hxx>
-#include <macros.hxx>
#include <strings.hrc>
#include <helpids.h>
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index d22e201eb753..7139f0208d06 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -19,7 +19,6 @@
#include <dlg_CreationWizard_UNO.hxx>
#include <dlg_CreationWizard.hxx>
-#include <macros.hxx>
#include <servicenames.hxx>
#include <TimerTriggeredControllerLock.hxx>
#include <osl/mutex.hxx>
@@ -254,7 +253,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 3f15fb3215eb..b2b5bfae4a4b 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -34,7 +34,6 @@
#include "tp_PolarOptions.hxx"
#include <ResId.hxx>
#include <ViewElementListProvider.hxx>
-#include <macros.hxx>
#include <ChartModelHelper.hxx>
#include <ChartTypeHelper.hxx>
#include <ObjectNameProvider.hxx>
@@ -241,7 +240,7 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
}
catch( const Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
if( !bXValuesFound && bYValuesFound )
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 62b9317d41a6..7b731f863bd2 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -25,7 +25,6 @@
#include "tp_3D_SceneAppearance.hxx"
#include "tp_3D_SceneIllumination.hxx"
#include <ChartModelHelper.hxx>
-#include <macros.hxx>
#include <ControllerLockGuard.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 353f647d26ae..d873fb3c5dba 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -22,7 +22,6 @@
#include <bitmaps.hlst>
#include <RangeSelectionHelper.hxx>
#include <TabPageNotifiable.hxx>
-#include <macros.hxx>
#include <helpids.h>
#include <rtl/math.hxx>
@@ -185,7 +184,7 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing(
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
}
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 3fac5184a8d4..bac8ef363e17 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -19,7 +19,6 @@
#include <res_LegendPosition.hxx>
#include <ChartModelHelper.hxx>
-#include <macros.hxx>
#include <LegendHelper.hxx>
#include <ChartModel.hxx>
@@ -117,7 +116,7 @@ void LegendPositionResources::writeToResources( const uno::Reference< frame::XMo
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -161,7 +160,7 @@ void LegendPositionResources::writeToModel( const css::uno::Reference< frame::XM
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index e38025a8fa6f..0ae2112711a0 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -20,7 +20,6 @@
#include "tp_3D_SceneAppearance.hxx"
#include <ChartModelHelper.hxx>
#include <ThreeDHelper.hxx>
-#include <macros.hxx>
#include <rtl/math.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -57,7 +56,7 @@ lcl_ModelProperties lcl_getPropertiesFromModel( uno::Reference< frame::XModel >
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return aProps;
}
@@ -72,7 +71,7 @@ void lcl_setShadeModeAtModel( uno::Reference< frame::XModel > const & xModel, dr
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 17652a14ee1f..ae2bc432f8bb 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -20,7 +20,6 @@
#include "tp_3D_SceneGeometry.hxx"
#include <BaseGFXHelper.hxx>
-#include <macros.hxx>
#include <DiagramHelper.hxx>
#include <ChartTypeHelper.hxx>
#include <ThreeDHelper.hxx>
@@ -223,7 +222,7 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel()
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
m_bPerspectiveChangePending = false;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index acaae5c1f7a4..d69f88aed855 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -24,7 +24,6 @@
#include <DiagramHelper.hxx>
#include "res_BarGeometry.hxx"
#include <ControllerLockGuard.hxx>
-#include <macros.hxx>
#include "GL3DBarChartDialogController.hxx"
#include <unonames.hxx>
@@ -713,7 +712,7 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
@@ -835,7 +834,7 @@ void ChartTypeTabPage::stateChanged( ChangingResource* /*pResource*/ )
}
catch ( const uno::Exception& ex )
{
- ASSERT_EXCEPTION(ex);
+ SAL_WARN("chart2", "Exception caught. " << ex);
}
//the controls have to be enabled/disabled accordingly
fillAllControls( aParameter );
@@ -899,7 +898,7 @@ void ChartTypeTabPage::selectMainType()
}
catch ( const uno::Exception& ex )
{
- ASSERT_EXCEPTION(ex);
+ SAL_WARN("chart2", "Exception caught. " << ex);
}
fillAllControls( aParameter );
@@ -984,7 +983,7 @@ void ChartTypeTabPage::initializePage()
}
catch (const uno::Exception& ex)
{
- ASSERT_EXCEPTION(ex);
+ SAL_WARN("chart2", "Exception caught. " << ex);
}
fillAllControls( aParameter );
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index cc68931dd437..ea5c7f6ef704 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -21,7 +21,6 @@
#include <strings.hrc>
#include <ResId.hxx>
#include <chartview/ChartSfxItemIds.hxx>
-#include <macros.hxx>
#include "ChartTypeTemplateProvider.hxx"
#include <RangeSelectionHelper.hxx>
#include <DataSeriesHelper.hxx>
@@ -843,7 +842,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
catch( const uno::Exception & ex )
{
// should work as validation should have happened before
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
else if( xLabeledSeq.is())
@@ -904,7 +903,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
catch( const uno::Exception & ex )
{
// should work as validation should have happened before
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
if( xNewSeq.is())
{
@@ -935,7 +934,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
catch( const uno::Exception & ex )
{
// should work as validation should have happened before
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
if( xNewSeq.is())
{
@@ -967,7 +966,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
catch( const uno::Exception & ex )
{
bResult = false;
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -989,7 +988,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 1cce59e51d5e..c81cde82baea 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -20,7 +20,6 @@
#include "tp_RangeChooser.hxx"
#include <strings.hrc>
#include <ResId.hxx>
-#include <macros.hxx>
#include <DataSourceHelper.hxx>
#include <DiagramHelper.hxx>
#include "ChartTypeTemplateProvider.hxx"
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 39b80248cbe6..ac79b0c45f39 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -23,7 +23,6 @@
#include <res_LegendPosition.hxx>
#include <ResId.hxx>
#include <helpids.h>
-#include <macros.hxx>
#include <ChartModelHelper.hxx>
#include <AxisHelper.hxx>
#include <LegendHelper.hxx>
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 433bdbc30e59..9ed6517cf7df 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -20,7 +20,6 @@
#include <DrawViewWrapper.hxx>
#include <chartview/DrawModelWrapper.hxx>
#include <ConfigurationAccess.hxx>
-#include <macros.hxx>
#include <unotools/lingucfg.hxx>
#include <editeng/langitem.hxx>
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index f7e28f69a8b6..954426f925a5 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -21,7 +21,6 @@
#include <ViewElementListProvider.hxx>
#include <chartview/DrawModelWrapper.hxx>
#include <chartview/DataPointSymbolSupplier.hxx>
-#include <macros.hxx>
#include <DrawViewWrapper.hxx>
#include <svx/xtable.hxx>
@@ -139,7 +138,7 @@ SdrObjList* ViewElementListProvider::GetSymbolList() const
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
return pSymbolList;
}
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 7be452732137..657575b36923 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -24,7 +24,6 @@
#include <chartview/ChartSfxItemIds.hxx>
#include <chartview/ExplicitValueProvider.hxx>
#include "SchWhichPairs.hxx"
-#include <macros.hxx>
#include <ChartModelHelper.hxx>
#include <AxisHelper.hxx>
#include <CommonConverters.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index cf1b4a0c15e1..062b4b173b3e 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -19,7 +19,6 @@
#include <CharacterPropertyItemConverter.hxx>
#include "SchWhichPairs.hxx"
-#include <macros.hxx>
#include <ItemPropertyMap.hxx>
#include <RelativeSizeHelper.hxx>
#include <editeng/memberids.h>
@@ -279,7 +278,7 @@ void CharacterPropertyItemConverter::FillSpecialItem(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
break;
@@ -538,7 +537,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
break;
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index d0749dad1e26..02bb29c2f8df 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -19,7 +19,6 @@
#include <DataPointItemConverter.hxx>
#include "SchWhichPairs.hxx"
-#include <macros.hxx>
#include <ItemPropertyMap.hxx>
#include <GraphicPropertyItemConverter.hxx>
@@ -367,7 +366,7 @@ bool DataPointItemConverter::ApplySpecialItem(
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
break;
@@ -398,7 +397,7 @@ bool DataPointItemConverter::ApplySpecialItem(
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
break;
@@ -433,7 +432,7 @@ bool DataPointItemConverter::ApplySpecialItem(
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
break;
@@ -617,7 +616,7 @@ void DataPointItemConverter::FillSpecialItem(
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
break;
@@ -632,7 +631,7 @@ void DataPointItemConverter::FillSpecialItem(
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
break;
@@ -649,7 +648,7 @@ void DataPointItemConverter::FillSpecialItem(
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
break;
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index 677ad2a88b9f..9f2e2091df74 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -19,7 +19,6 @@
#include <ErrorBarItemConverter.hxx>
#include "SchWhichPairs.hxx"
-#include <macros.hxx>
#include <ItemPropertyMap.hxx>
#include <ErrorBar.hxx>
#include <PropertyHelper.hxx>
@@ -61,7 +60,7 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -79,7 +78,7 @@ void lcl_getErrorIndicatorValues(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 580a5e722b2d..8847c3aaf50b 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -19,7 +19,6 @@
#include <GraphicPropertyItemConverter.hxx>
#include "SchWhichPairs.hxx"
-#include <macros.hxx>
#include <ItemPropertyMap.hxx>
#include <PropertyHelper.hxx>
#include <CommonConverters.hxx>
@@ -258,7 +257,7 @@ void GraphicPropertyItemConverter::FillSpecialItem(
}
catch( const beans::UnknownPropertyException &ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
break;
@@ -507,7 +506,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
}
catch( const beans::UnknownPropertyException &ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
break;
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 4b4a86281f70..e5542ca2c379 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -18,7 +18,6 @@
*/
#include <ItemConverter.hxx>
-#include <macros.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <osl/diagnose.h>
#include <svl/itempool.hxx>
@@ -122,7 +121,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
}
catch( const uno::Exception &ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -134,7 +133,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
}
catch( const uno::Exception &ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 0cc4a6565638..a3a30c165981 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -19,7 +19,6 @@
#include <LegendItemConverter.hxx>
#include "SchWhichPairs.hxx"
-#include <macros.hxx>
#include <ItemPropertyMap.hxx>
#include <GraphicPropertyItemConverter.hxx>
#include <CharacterPropertyItemConverter.hxx>
@@ -153,7 +152,7 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 65dd74390bfe..9842121c170c 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -20,7 +20,6 @@
#include <RegressionCurveHelper.hxx>
#include <RegressionCurveItemConverter.hxx>
#include "SchWhichPairs.hxx"
-#include <macros.hxx>
#include <ItemPropertyMap.hxx>
#include <GraphicPropertyItemConverter.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index fdc6205802b6..86a0e2c6dd69 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -19,7 +19,6 @@
#include <RegressionEquationItemConverter.hxx>
#include "SchWhichPairs.hxx"
-#include <macros.hxx>
#include <ItemPropertyMap.hxx>
#include <GraphicPropertyItemConverter.hxx>
#include <CharacterPropertyItemConverter.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index e6c1bff2aabb..a17110665e45 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -20,7 +20,6 @@
#include <SeriesOptionsItemConverter.hxx>
#include "SchWhichPairs.hxx"
-#include <macros.hxx>
#include <ItemPropertyMap.hxx>
#include <GraphicPropertyItemConverter.hxx>
#include <MultipleItemConverter.hxx>
@@ -158,7 +157,7 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter(
}
catch( const uno::Exception &ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -330,7 +329,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
}
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 60f534426998..81b3abe3c803 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -19,7 +19,6 @@
#include <StatisticsItemConverter.hxx>
#include "SchWhichPairs.hxx"
-#include <macros.hxx>
#include <RegressionCurveHelper.hxx>
#include <ItemPropertyMap.hxx>
#include <ErrorBar.hxx>
@@ -62,7 +61,7 @@ uno::Reference< beans::XPropertySet > lcl_GetErrorBar(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return xResult;
@@ -86,7 +85,7 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -104,7 +103,7 @@ void lcl_getErrorIndicatorValues(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index 1da1ce1a785c..1cd91fb483f7 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -25,7 +25,6 @@
#include <DiagramHelper.hxx>
#include <ItemPropertyMap.hxx>
#include "SchWhichPairs.hxx"
-#include <macros.hxx>
#include <unonames.hxx>
#include <editeng/brushitem.hxx>
@@ -327,7 +326,7 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
}
catch (const uno::Exception& e)
{
- ASSERT_EXCEPTION(e);
+ SAL_WARN("chart2", "Exception caught. " << e);
}
}
break;
@@ -357,7 +356,7 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
break;
@@ -390,7 +389,7 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
}
catch (const uno::Exception& e)
{
- ASSERT_EXCEPTION(e);
+ SAL_WARN("chart2", "Exception caught. " << e);
}
}
break;
@@ -565,7 +564,7 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r
}
catch (const uno::Exception& e)
{
- ASSERT_EXCEPTION(e);
+ SAL_WARN("chart2", "Exception caught. " << e);
}
}
break;
@@ -579,7 +578,7 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
break;
@@ -595,7 +594,7 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r
}
catch (const uno::Exception& e)
{
- ASSERT_EXCEPTION(e);
+ SAL_WARN("chart2", "Exception caught. " << e);
}
}
break;
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 7327f631640e..1bfdb5b215ce 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -19,7 +19,6 @@
#include <TitleItemConverter.hxx>
#include "SchWhichPairs.hxx"
-#include <macros.hxx>
#include <ItemPropertyMap.hxx>
#include <GraphicPropertyItemConverter.hxx>
#include <CharacterPropertyItemConverter.hxx>
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 3ff4c2309961..a505335cfa9a 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -41,7 +41,6 @@
#include "UndoGuard.hxx"
#include "ChartDropTargetHelper.hxx"
-#include <macros.hxx>
#include <dlg_CreationWizard.hxx>
#include <dlg_ChartType.hxx>
#include <AccessibleChartView.hxx>
@@ -489,7 +488,7 @@ void SAL_CALL ChartController::attachFrame(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -852,7 +851,7 @@ void SAL_CALL ChartController::dispose()
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
#endif
aModelRef->tryTermination();
@@ -867,7 +866,7 @@ void SAL_CALL ChartController::dispose()
catch( const uno::Exception & ex )
{
assert(!m_xChartView.is());
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx
index c59cdd8531ab..3ad6b90b8770 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -18,7 +18,6 @@
*/
#include <ChartController.hxx>
-#include <macros.hxx>
#include <dlg_DataEditor.hxx>
#include <DataSourceHelper.hxx>
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 67bc424ca377..5ad74c244d2f 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -32,7 +32,6 @@
#include <AxisHelper.hxx>
#include <TitleHelper.hxx>
#include <DiagramHelper.hxx>
-#include <macros.hxx>
#include <chartview/DrawModelWrapper.hxx>
#include <NumberFormatterWrapper.hxx>
#include <ViewElementListProvider.hxx>
@@ -118,7 +117,7 @@ void ChartController::executeDispatch_InsertAxes()
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
@@ -152,7 +151,7 @@ void ChartController::executeDispatch_InsertGrid()
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
@@ -183,7 +182,7 @@ void ChartController::executeDispatch_InsertTitles()
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
@@ -235,7 +234,7 @@ void ChartController::executeDispatch_OpenLegendDialog()
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
@@ -297,7 +296,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels()
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
@@ -508,7 +507,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError )
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
}
@@ -733,7 +732,7 @@ void ChartController::executeDispatch_InsertAxisTitle()
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
@@ -755,7 +754,7 @@ void ChartController::executeDispatch_InsertAxis()
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
@@ -777,7 +776,7 @@ void ChartController::executeDispatch_DeleteAxis()
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
@@ -799,7 +798,7 @@ void ChartController::executeDispatch_InsertMajorGrid()
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
@@ -821,7 +820,7 @@ void ChartController::executeDispatch_DeleteMajorGrid()
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
@@ -845,7 +844,7 @@ void ChartController::executeDispatch_InsertMinorGrid()
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
@@ -869,7 +868,7 @@ void ChartController::executeDispatch_DeleteMinorGrid()
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index c7b590e3ce95..1421fc1cbc12 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -19,7 +19,6 @@
#include <ChartController.hxx>
-#include <macros.hxx>
#include <ChartWindow.hxx>
#include <DrawViewWrapper.hxx>
#include <PositionAndSizeHelper.hxx>
@@ -170,7 +169,7 @@ void ChartController::executeDispatch_PositionAndSize()
}
catch(const uno::Exception& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 0a96732f3038..e61194bce8da 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -22,7 +22,6 @@
#include <chartview/DrawModelWrapper.hxx>
#include <ObjectIdentifier.hxx>
#include <chartview/ExplicitValueProvider.hxx>
-#include <macros.hxx>
#include <dlg_ObjectProperties.hxx>
#include <dlg_View3D.hxx>
#include <dlg_InsertErrorBars.hxx>
@@ -826,7 +825,7 @@ void ChartController::executeDispatch_View3D()
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 3f98cbb078f6..9c129617fc6a 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -25,7 +25,6 @@
#include <ChartWindow.hxx>
#include <TitleHelper.hxx>
#include <ObjectIdentifier.hxx>
-#include <macros.hxx>
#include <ControllerLockGuard.hxx>
#include <AccessibleTextHelper.hxx>
#include <strings.hrc>
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 837854a9b856..d06524480847 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -25,7 +25,6 @@
#include <DataSeriesHelper.hxx>
#include "UndoGuard.hxx"
#include <ControllerLockGuard.hxx>
-#include <macros.hxx>
#include <ResId.hxx>
#include <strings.hrc>
#include <ObjectIdentifier.hxx>
@@ -229,7 +228,7 @@ void ChartController::executeDispatch_NewArrangement()
}
catch( const uno::RuntimeException & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -482,7 +481,7 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons
}
catch ( const uno::Exception& ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
@@ -846,7 +845,7 @@ void ChartController::executeDispatch_ToggleLegend()
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
else
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 75210747c496..ec9e4323ffe2 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -30,7 +30,6 @@
#include <ControllerLockGuard.hxx>
#include <ObjectNameProvider.hxx>
#include <strings.hrc>
-#include <macros.hxx>
#include "DragMethod_PieSegment.hxx"
#include "DragMethod_RotateDiagram.hxx"
#include <ObjectHierarchy.hxx>
@@ -482,7 +481,7 @@ void ChartController::execute_Paint(vcl::RenderContext& rRenderContext, const to
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
catch( ... )
{
@@ -861,7 +860,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
//all wanted model changes will take effect
//and all unwanted view modifications are cleaned
@@ -1090,7 +1089,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -1816,7 +1815,7 @@ bool ChartController::impl_DragDataPoint( const OUString & rCID, double fAdditio
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index acb56be6d155..c26afdc54b84 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -20,7 +20,6 @@
#include "ChartFrameloader.hxx"
#include <servicenames.hxx>
#include <MediaDescriptorHelper.hxx>
-#include <macros.hxx>
#include <unotools/mediadescriptor.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/document/XImporter.hpp>
@@ -176,7 +175,7 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyVa
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return true;
diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx
index 53bd4b96c7c6..3dca6c7cab22 100644
--- a/chart2/source/controller/main/CommandDispatch.cxx
+++ b/chart2/source/controller/main/CommandDispatch.cxx
@@ -19,7 +19,6 @@
#include "CommandDispatch.hxx"
#include <CommonFunctors.hxx>
-#include <macros.hxx>
#include <com/sun/star/util/URLTransformer.hpp>
#include <algorithm>
@@ -161,7 +160,7 @@ void CommandDispatch::fireStatusEventForURL(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
}
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 31b0c7798d95..ab93e3347057 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -21,7 +21,6 @@
#include "UndoCommandDispatch.hxx"
#include "StatusBarCommandDispatch.hxx"
#include <DisposeHelper.hxx>
-#include <macros.hxx>
#include <ChartController.hxx>
#include "DrawCommandDispatch.hxx"
#include "ShapeController.hxx"
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx
index 7d2f9a1adcd5..4f8f1a39e95c 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -18,7 +18,6 @@
*/
#include <ConfigurationAccess.hxx>
-#include <macros.hxx>
#include <unotools/syslocale.hxx>
#include <unotools/configitem.hxx>
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 57f7a33cb7fa..a7650ecb2f8b 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -25,7 +25,6 @@
#include <TitleHelper.hxx>
#include <LegendHelper.hxx>
#include <ObjectIdentifier.hxx>
-#include <macros.hxx>
#include <ChartTypeHelper.hxx>
#include <ChartController.hxx>
#include <RegressionCurveHelper.hxx>
@@ -297,7 +296,7 @@ void ControllerState::update(
}
catch(const uno::RuntimeException& e)
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
bMayAddR2Value = !bHasR2Value;
bMayDeleteR2Value = bHasR2Value;
@@ -541,7 +540,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
}
catch( const uno::Exception& e )
{
- ASSERT_EXCEPTION( e );
+ SAL_WARN("chart2", "Exception caught. " << e );
}
}
}
diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx
index fa01247681c8..d6331871f7ad 100644
--- a/chart2/source/controller/main/DragMethod_Base.cxx
+++ b/chart2/source/controller/main/DragMethod_Base.cxx
@@ -21,7 +21,6 @@
#include <strings.hrc>
#include <ResId.hxx>
-#include <macros.hxx>
#include <ObjectNameProvider.hxx>
#include <ObjectIdentifier.hxx>
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index b11cec18e822..85cf8cdd6fd1 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -21,7 +21,6 @@
#include <strings.hrc>
#include <ResId.hxx>
-#include <macros.hxx>
#include <ObjectIdentifier.hxx>
#include <rtl/math.hxx>
#include <svx/svdpagv.hxx>
@@ -121,7 +120,7 @@ bool DragMethod_PieSegment::EndSdrDrag(bool /*bCopy*/)
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return true;
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index 31a5811b2899..b099ca239dbb 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -22,7 +22,6 @@
#include <SelectionHelper.hxx>
#include <CommonConverters.hxx>
#include <ChartModelHelper.hxx>
-#include <macros.hxx>
#include <DiagramHelper.hxx>
#include <ChartTypeHelper.hxx>
#include <ThreeDHelper.hxx>
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index a5d65cbf2bf5..c460d856b692 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -22,7 +22,6 @@
#include <ChartController.hxx>
#include <DrawViewWrapper.hxx>
#include <chartview/DrawModelWrapper.hxx>
-#include <macros.hxx>
#include <com/sun/star/frame/CommandGroup.hpp>
#include <vcl/svapp.hxx>
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 4f660cf8cb8b..2f9ec11510c8 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -18,7 +18,6 @@
*/
#include "ElementSelector.hxx"
-#include <macros.hxx>
#include <ObjectNameProvider.hxx>
#include <ObjectHierarchy.hxx>
#include <servicenames.hxx>
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index ddf9e50af25b..5be67a46917a 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -24,7 +24,6 @@
#include <RegressionCurveHelper.hxx>
#include <AxisHelper.hxx>
#include <chartview/ExplicitValueProvider.hxx>
-#include <macros.hxx>
#include <ChartTypeHelper.hxx>
#include <DataSeriesHelper.hxx>
#include <LegendHelper.hxx>
@@ -500,7 +499,7 @@ void ImplObjectHierarchy::createDataSeriesTree(
}
catch( const uno::Exception & ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
@@ -529,7 +528,7 @@ void ImplObjectHierarchy::createAdditionalShapesTree( ObjectHierarchy::tChildCon
}
catch ( const uno::Exception& ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
}
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index 2726fe5bd601..7cc51f8e478a 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -18,7 +18,6 @@
*/
#include <PositionAndSizeHelper.hxx>
-#include <macros.hxx>
#include <ChartModelHelper.hxx>
#include <ControllerLockGuard.hxx>
#include <com/sun/star/chart2/LegendPosition.hpp>
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 9ba2456e0656..cf6ebddf102e 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -19,7 +19,6 @@
#include <SelectionHelper.hxx>
#include <ObjectIdentifier.hxx>
-#include <macros.hxx>
#include <DiagramHelper.hxx>
#include <ChartModelHelper.hxx>
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index c241318c2b71..aabf175e0e33 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -25,7 +25,6 @@
#include <dlg_ShapeFont.hxx>
#include <dlg_ShapeParagraph.hxx>
#include <chartview/DrawModelWrapper.hxx>
-#include <macros.hxx>
#include <com/sun/star/frame/CommandGroup.hpp>
#include <com/sun/star/frame/XStorable.hpp>
@@ -616,7 +615,7 @@ SdrObject* ShapeController::getFirstAdditionalShape()
}
catch ( const uno::Exception& ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return pFirstObj;
@@ -656,7 +655,7 @@ SdrObject* ShapeController::getLastAdditionalShape()
}
catch ( const uno::Exception& ex )
{
- ASSERT_EXCEPTION( ex );
+ SAL_WARN("chart2", "Exception caught. " << ex );
}
return pLastObj;
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index 3feb2b9e0953..f34e7794fed0 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -19,7 +19,6 @@
#include "StatusBarCommandDispatch.hxx"
#include <ObjectNameProvider.hxx>
-#include <macros.hxx>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <ResId.hxx>
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index 4910442e549c..97a11c444813 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -19,7 +19,6 @@
#include "UndoCommandDispatch.hxx"
#include <ResId.hxx>
-#include <macros.hxx>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/document/UndoFailedException.hpp>
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
deleted file mode 100644
index 1139f245b873..000000000000
--- a/chart2/source/inc/macros.hxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_CHART2_SOURCE_INC_MACROS_HXX
-#define INCLUDED_CHART2_SOURCE_INC_MACROS_HXX
-
-#include <sal/config.h>
-
-#include <typeinfo>
-
-#include <sal/log.hxx>
-
-#define ASSERT_EXCEPTION(ex) SAL_WARN("chart2", "Exception caught. " << ex )
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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 );
}
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list