diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-02 15:44:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-03 13:03:13 +0100 |
| commit | c4abbb6e10ecd382fd4fe6816cd4f29ea7d931a5 (patch) | |
| tree | 5103eb6d820d4c89f6c6a76d2bbfb419ed8372ce /chart2 | |
| parent | 22a95ea367cc005a382de23e51cba850b6dd5e6f (diff) | |
inline ASSERT_EXCEPTION macro in chart2
Change-Id: I6bdcde5fd416531e2cdd3c9ec160833f1022247c
Reviewed-on: https://gerrit.libreoffice.org/44246
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2')
220 files changed, 416 insertions, 667 deletions
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 ); } } diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index fb4ff6305751..4f26acc95e3f 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -21,7 +21,6 @@ #include <CharacterProperties.hxx> #include <PropertyHelper.hxx> -#include <macros.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <cppuhelper/supportsservice.hxx> @@ -144,7 +143,7 @@ void SAL_CALL FormattedString::addModifyListener( const uno::Reference< util::XM } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -157,7 +156,7 @@ void SAL_CALL FormattedString::removeModifyListener( const uno::Reference< util: } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index 5e33c3e2fb37..0c106f70668d 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -21,7 +21,6 @@ #include <LinePropertiesHelper.hxx> #include <UserDefinedProperties.hxx> #include <PropertyHelper.hxx> -#include <macros.hxx> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -177,7 +176,7 @@ void SAL_CALL GridProperties::addModifyListener( const Reference< util::XModifyL } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -190,7 +189,7 @@ void SAL_CALL GridProperties::removeModifyListener( const Reference< util::XModi } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index d24b2030f948..fc9ab86de607 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -18,7 +18,6 @@ */ #include "Legend.hxx" -#include <macros.hxx> #include <LinePropertiesHelper.hxx> #include <FillProperties.hxx> #include <CharacterProperties.hxx> @@ -209,7 +208,7 @@ void SAL_CALL Legend::addModifyListener( const Reference< util::XModifyListener } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -222,7 +221,7 @@ void SAL_CALL Legend::removeModifyListener( const Reference< util::XModifyListen } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 7aa6bc455098..e90a42797c6d 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -18,7 +18,6 @@ */ #include "PageBackground.hxx" -#include <macros.hxx> #include <LinePropertiesHelper.hxx> #include <FillProperties.hxx> #include <UserDefinedProperties.hxx> @@ -162,7 +161,7 @@ void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XMo } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -175,7 +174,7 @@ void SAL_CALL PageBackground::removeModifyListener( const uno::Reference< util:: } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index ce79dc4dcde4..d6c58ee24c76 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -18,7 +18,6 @@ */ #include <PolarCoordinateSystem.hxx> -#include <macros.hxx> #include <servicenames_coosystems.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 557bb00dd2a2..2668f6ec0c85 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -22,7 +22,6 @@ #include <FillProperties.hxx> #include <UserDefinedProperties.hxx> #include <PropertyHelper.hxx> -#include <macros.hxx> #include <ModifyListenerHelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/style/XStyle.hpp> @@ -173,7 +172,7 @@ void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyLi } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -186,7 +185,7 @@ void SAL_CALL StockBar::removeModifyListener( const uno::Reference< util::XModif } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index bf992a23688e..6dbd924d08dc 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -18,7 +18,6 @@ */ #include "Title.hxx" -#include <macros.hxx> #include "FormattedString.hxx" #include <LinePropertiesHelper.hxx> #include <FillProperties.hxx> @@ -311,7 +310,7 @@ void SAL_CALL Title::addModifyListener( const uno::Reference< util::XModifyListe } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -324,7 +323,7 @@ void SAL_CALL Title::removeModifyListener( const uno::Reference< util::XModifyLi } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index bf12ad122d85..719425231e49 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -18,7 +18,6 @@ */ #include "Wall.hxx" -#include <macros.hxx> #include <LinePropertiesHelper.hxx> #include <FillProperties.hxx> #include <UserDefinedProperties.hxx> @@ -166,7 +165,7 @@ void SAL_CALL Wall::addModifyListener( const uno::Reference< util::XModifyListen } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -179,7 +178,7 @@ void SAL_CALL Wall::removeModifyListener( const uno::Reference< util::XModifyLis } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index a961416059f3..45ebcf72b310 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -18,7 +18,6 @@ */ #include "AreaChartType.hxx" -#include <macros.hxx> #include <servicenames_charttypes.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index f76e8b0a43ef..6e443c948fe4 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -18,7 +18,6 @@ */ #include "AreaChartTypeTemplate.hxx" -#include <macros.hxx> #include <servicenames_charttypes.hxx> #include <DiagramHelper.hxx> #include <DataSeriesHelper.hxx> @@ -159,7 +158,7 @@ sal_Int32 AreaChartTypeTemplate::getDimension() const } catch( const beans::UnknownPropertyException & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return nDim; @@ -214,7 +213,7 @@ Reference< chart2::XChartType > AreaChartTypeTemplate::getChartTypeForIndex( sal } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index 5d5391152527..6f11dd5458a2 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -18,7 +18,6 @@ */ #include "BarChartType.hxx" -#include <macros.hxx> #include <servicenames_charttypes.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 05c45dfd9021..3845ae98d039 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -18,7 +18,6 @@ */ #include "BarChartTypeTemplate.hxx" -#include <macros.hxx> #include <DiagramHelper.hxx> #include <servicenames_charttypes.hxx> #include <DataSeriesHelper.hxx> @@ -206,7 +205,7 @@ Reference< chart2::XChartType > BarChartTypeTemplate::getChartTypeForIndex( sal_ } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; @@ -260,7 +259,7 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index 6fc213a9ca14..8179594e2ceb 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -19,7 +19,6 @@ #include "BubbleChartType.hxx" #include <PropertyHelper.hxx> -#include <macros.hxx> #include <servicenames_charttypes.hxx> #include <CartesianCoordinateSystem.hxx> #include <AxisHelper.hxx> diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 89de378bb4ed..07eb859e104b 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -18,7 +18,6 @@ */ #include "BubbleChartTypeTemplate.hxx" -#include <macros.hxx> #include "BubbleDataInterpreter.hxx" #include <CartesianCoordinateSystem.hxx> #include <Scaling.hxx> @@ -169,7 +168,7 @@ Reference< chart2::XChartType > BubbleChartTypeTemplate::getChartTypeForIndex( s } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; @@ -191,7 +190,7 @@ Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeFo } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index da09e143dd08..364ed3459e38 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -19,7 +19,6 @@ #include "BubbleDataInterpreter.hxx" #include <DataSeries.hxx> -#include <macros.hxx> #include <DataSeriesHelper.hxx> #include <CommonConverters.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -112,7 +111,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -259,7 +258,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -281,7 +280,7 @@ sal_Bool SAL_CALL BubbleDataInterpreter::isDataCompatible( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 805cec720538..81f084540815 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -19,7 +19,6 @@ #include "CandleStickChartType.hxx" #include <PropertyHelper.hxx> -#include <macros.hxx> #include <StockBar.hxx> #include <servicenames_charttypes.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -195,7 +194,7 @@ CandleStickChartType::~CandleStickChartType() } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index 920ce5696b54..d7eb954901bc 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -20,7 +20,6 @@ #include "ChartType.hxx" #include <PropertyHelper.hxx> #include <CommonFunctors.hxx> -#include <macros.hxx> #include <CartesianCoordinateSystem.hxx> #include <AxisHelper.hxx> #include <CloneHelper.hxx> @@ -255,7 +254,7 @@ void SAL_CALL ChartType::addModifyListener( const uno::Reference< util::XModifyL } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -268,7 +267,7 @@ void SAL_CALL ChartType::removeModifyListener( const uno::Reference< util::XModi } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index db79928d211c..a94253a577ac 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -18,7 +18,6 @@ */ #include <ChartTypeManager.hxx> -#include <macros.hxx> #include <StackMode.hxx> #include <CartesianCoordinateSystem.hxx> @@ -254,7 +253,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( // As XMultiServiceFactory does not specify, what to do in case // createInstance is called with an unknown service-name, this // function will just return an empty XInterface. - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); SAL_WARN("chart2", "Couldn't instantiate service: "<< aServiceSpecifier ); xResult.set( nullptr ); } diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 8f64b3291cc4..b06adcdfbda6 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -19,7 +19,6 @@ #include "ChartTypeTemplate.hxx" #include <PropertyHelper.hxx> -#include <macros.hxx> #include <DataSeriesHelper.hxx> #include "DataInterpreter.hxx" #include <CommonConverters.hxx> @@ -170,7 +169,7 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xDia; @@ -251,7 +250,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram > } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -302,7 +301,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -361,7 +360,7 @@ sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return bResult; @@ -411,7 +410,7 @@ void SAL_CALL ChartTypeTemplate::applyStyle( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } @@ -668,7 +667,7 @@ void ChartTypeTemplate::adaptScales( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } @@ -782,7 +781,7 @@ void ChartTypeTemplate::FillDiagram( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -852,7 +851,7 @@ void ChartTypeTemplate::createChartTypes( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 3f0b0bbeaace..0655689d8f4e 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -18,7 +18,6 @@ */ #include "ColumnChartType.hxx" -#include <macros.hxx> #include <servicenames_charttypes.hxx> #include <PropertyHelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index e245300cc4bc..afa2d8bcd038 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -18,7 +18,6 @@ */ #include "ColumnLineChartTypeTemplate.hxx" -#include <macros.hxx> #include <CommonConverters.hxx> #include <DiagramHelper.hxx> #include <DataSeriesHelper.hxx> @@ -227,7 +226,7 @@ void ColumnLineChartTypeTemplate::createChartTypes( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -339,7 +338,7 @@ sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return bResult; @@ -375,7 +374,7 @@ Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNew } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index 5a32fa1856c2..7f15eb7bcc70 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -19,7 +19,6 @@ #include "ColumnLineDataInterpreter.hxx" #include <DataSeries.hxx> -#include <macros.hxx> #include <DataSeriesHelper.hxx> #include <CommonConverters.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index bb6fdd0f3f69..445bc3598df7 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -21,7 +21,6 @@ #include <DataSeries.hxx> #include <DataSourceHelper.hxx> #include <DataSeriesHelper.hxx> -#include <macros.hxx> #include <CommonConverters.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> @@ -98,7 +97,7 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -179,7 +178,7 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -202,7 +201,7 @@ sal_Bool SAL_CALL DataInterpreter::isDataCompatible( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -296,7 +295,7 @@ Reference< data::XDataSource > SAL_CALL DataInterpreter::mergeInterpretedData( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -318,7 +317,7 @@ OUString DataInterpreter::GetRole( const Reference< data::XDataSequence > & xSeq } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return aResult; } @@ -334,7 +333,7 @@ void DataInterpreter::SetRole( const Reference< data::XDataSequence > & xSeq, co } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 2ee5272edeca..e693671f9b07 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -19,7 +19,6 @@ #include "FilledNetChartType.hxx" #include <PropertyHelper.hxx> -#include <macros.hxx> #include <PolarCoordinateSystem.hxx> #include <Scaling.hxx> #include <servicenames_charttypes.hxx> diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx index ed5ba7807abf..668472e54f04 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx @@ -14,7 +14,6 @@ #include <PropertyHelper.hxx> #include <DiagramHelper.hxx> #include <unonames.hxx> -#include <macros.hxx> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -119,7 +118,7 @@ uno::Reference<chart2::XChartType> GL3DBarChartTypeTemplate::getChartTypeForInde } catch (const uno::Exception & ex) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; @@ -161,7 +160,7 @@ GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Ref } catch (const uno::Exception & ex) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index df7b76ecb91f..3c25980e2eaa 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -19,7 +19,6 @@ #include "LineChartType.hxx" #include <PropertyHelper.hxx> -#include <macros.hxx> #include <servicenames_charttypes.hxx> #include <unonames.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index bdba0b44c3e1..58adeffc6659 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -18,7 +18,6 @@ */ #include "LineChartTypeTemplate.hxx" -#include <macros.hxx> #include <DiagramHelper.hxx> #include <servicenames_charttypes.hxx> #include <DataSeriesHelper.hxx> @@ -243,7 +242,7 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -272,7 +271,7 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -303,7 +302,7 @@ Reference< chart2::XChartType > LineChartTypeTemplate::getChartTypeForIndex( sal } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; @@ -336,7 +335,7 @@ Reference< chart2::XChartType > SAL_CALL LineChartTypeTemplate::getChartTypeForN } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; @@ -360,7 +359,7 @@ void SAL_CALL LineChartTypeTemplate::applyStyle( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index 0e195ce33886..829a2f27d41d 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -19,7 +19,6 @@ #include "NetChartType.hxx" #include <PropertyHelper.hxx> -#include <macros.hxx> #include <PolarCoordinateSystem.hxx> #include <servicenames_charttypes.hxx> #include <AxisIndexDefines.hxx> diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 3cae40b53763..9cea513a8f8d 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -18,7 +18,6 @@ */ #include "NetChartTypeTemplate.hxx" -#include <macros.hxx> #include <PolarCoordinateSystem.hxx> #include <DiagramHelper.hxx> #include <servicenames_charttypes.hxx> @@ -75,7 +74,7 @@ void SAL_CALL NetChartTypeTemplate::applyStyle( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -139,7 +138,7 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -175,7 +174,7 @@ Reference< chart2::XChartType > NetChartTypeTemplate::getChartTypeForIndex( sal_ } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 247b5480a2fa..f99ab3c1a408 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -19,7 +19,6 @@ #include "PieChartType.hxx" #include <PropertyHelper.hxx> -#include <macros.hxx> #include <PolarCoordinateSystem.hxx> #include <AxisHelper.hxx> #include <servicenames_charttypes.hxx> diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index 15fdbf494d13..b7b9f109df0c 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -18,7 +18,6 @@ */ #include "PieChartTypeTemplate.hxx" -#include <macros.hxx> #include <CommonConverters.hxx> #include <DiagramHelper.hxx> #include <servicenames_charttypes.hxx> @@ -197,7 +196,7 @@ sal_Int32 PieChartTypeTemplate::getDimension() const } catch( const beans::UnknownPropertyException & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return nDim; @@ -250,7 +249,7 @@ void PieChartTypeTemplate::adaptScales( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } @@ -292,7 +291,7 @@ void PieChartTypeTemplate::createChartTypes( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -362,7 +361,7 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); bResult = false; } } @@ -402,7 +401,7 @@ Reference< chart2::XChartType > PieChartTypeTemplate::getChartTypeForIndex( sal_ } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; @@ -430,7 +429,7 @@ Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNe } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; @@ -521,7 +520,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -558,7 +557,7 @@ void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagr } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 2dd540dce972..0e5e2c66cc62 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -19,7 +19,6 @@ #include "ScatterChartType.hxx" #include <PropertyHelper.hxx> -#include <macros.hxx> #include <servicenames_charttypes.hxx> #include <CartesianCoordinateSystem.hxx> #include <AxisHelper.hxx> diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 2e3c63453131..9e1874d82801 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -18,7 +18,6 @@ */ #include "ScatterChartTypeTemplate.hxx" -#include <macros.hxx> #include "XYDataInterpreter.hxx" #include <CartesianCoordinateSystem.hxx> #include <DiagramHelper.hxx> @@ -213,7 +212,7 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -275,7 +274,7 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -304,7 +303,7 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -335,7 +334,7 @@ Reference< chart2::XChartType > ScatterChartTypeTemplate::getChartTypeForIndex( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; @@ -368,7 +367,7 @@ Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeF } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 73c9f2ff1691..e53f285c472f 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -18,7 +18,6 @@ */ #include "StockChartTypeTemplate.hxx" -#include <macros.hxx> #include <DataSeriesHelper.hxx> #include "StockDataInterpreter.hxx" #include <CartesianCoordinateSystem.hxx> @@ -252,7 +251,7 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -387,7 +386,7 @@ void StockChartTypeTemplate::createChartTypes( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -467,7 +466,7 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return bResult; @@ -488,7 +487,7 @@ Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSerie } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index d3854b4db598..ea0b1c68f1d4 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -19,7 +19,6 @@ #include "StockDataInterpreter.hxx" #include <DataSeries.hxx> -#include <macros.hxx> #include <DataSeriesHelper.hxx> #include <CommonConverters.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -246,7 +245,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } @@ -304,7 +303,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index de6b8eba5bff..f7d1ec1ca2de 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -19,7 +19,6 @@ #include "XYDataInterpreter.hxx" #include <DataSeries.hxx> -#include <macros.hxx> #include <DataSeriesHelper.hxx> #include <CommonConverters.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -96,7 +95,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -220,7 +219,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -243,7 +242,7 @@ sal_Bool SAL_CALL XYDataInterpreter::isDataCompatible( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index c3ea86eb08d6..ecde1f639144 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -20,7 +20,6 @@ #include <AxisHelper.hxx> #include <DiagramHelper.hxx> #include <ChartTypeHelper.hxx> -#include <macros.hxx> #include <AxisIndexDefines.hxx> #include <LinePropertiesHelper.hxx> #include <servicenames_coosystems.hxx> @@ -292,7 +291,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } if( ! aKeyMap.empty()) @@ -398,7 +397,7 @@ Reference< XAxis > AxisHelper::createAxis( } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } return xAxis; @@ -840,7 +839,7 @@ std::vector< Reference< XAxis > > AxisHelper::getAllAxesOfCoordinateSystem( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } @@ -1117,7 +1116,7 @@ void AxisHelper::setRTLAxisLayout( const Reference< XCoordinateSystem >& xCooSys } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } try @@ -1142,7 +1141,7 @@ void AxisHelper::setRTLAxisLayout( const Reference< XCoordinateSystem >& xCooSys } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index edf9465384fe..5db3cbdb45f0 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -18,7 +18,6 @@ */ #include <CachedDataSequence.hxx> -#include <macros.hxx> #include <PropertyHelper.hxx> #include <CommonFunctors.hxx> #include <ModifyListenerHelper.hxx> @@ -327,7 +326,7 @@ void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XMod } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -340,7 +339,7 @@ void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::X } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index 7386efa18a09..6472b1ebf3cd 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -18,7 +18,6 @@ */ #include <CharacterProperties.hxx> -#include <macros.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/style/XStyle.hpp> diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index 0eea7fdd9fed..f37d4d7581c9 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -18,7 +18,6 @@ */ #include <ChartModelHelper.hxx> -#include <macros.hxx> #include <DiagramHelper.hxx> #include <DataSourceHelper.hxx> #include <ControllerLockGuard.hxx> @@ -99,7 +98,7 @@ uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference< } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return nullptr; } @@ -278,7 +277,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, ChartMod } catch (const uno::Exception& e) { - ASSERT_EXCEPTION(e); + SAL_WARN("chart2", "Exception caught. " << e); } return bChanged; } diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index 03fb5a5219c9..a586d04bb7ad 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -20,7 +20,6 @@ #include <ChartTypeHelper.hxx> #include <DiagramHelper.hxx> #include <DataSeriesHelper.hxx> -#include <macros.hxx> #include <servicenames_charttypes.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -557,7 +556,7 @@ sal_Int32 ChartTypeHelper::getNumberOfDisplayedSeries( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } return nNumberOfSeries; diff --git a/chart2/source/tools/ChartViewHelper.cxx b/chart2/source/tools/ChartViewHelper.cxx index 2cc26159726e..c5a757b2e7ba 100644 --- a/chart2/source/tools/ChartViewHelper.cxx +++ b/chart2/source/tools/ChartViewHelper.cxx @@ -18,7 +18,6 @@ */ #include <ChartViewHelper.hxx> -#include <macros.hxx> #include <servicenames.hxx> #include <com/sun/star/lang/XComponent.hpp> @@ -48,7 +47,7 @@ void ChartViewHelper::setViewToDirtyState( const uno::Reference< frame::XModel > } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } //namespace chart diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx index b729162be421..34aeb7866021 100644 --- a/chart2/source/tools/ColorPerPointHelper.cxx +++ b/chart2/source/tools/ColorPerPointHelper.cxx @@ -18,7 +18,6 @@ */ #include <ColorPerPointHelper.hxx> -#include <macros.hxx> #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/beans/XPropertyState.hpp> diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 4cc134a38704..72e3ca7e6a7f 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -18,7 +18,6 @@ */ #include <ConfigColorScheme.hxx> -#include <macros.hxx> #include <unotools/configitem.hxx> #include <sal/macros.h> diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index 82b7c2a59cb5..d946b3f9a62c 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -20,7 +20,6 @@ #include <DataSeriesHelper.hxx> #include <DiagramHelper.hxx> #include <DataSource.hxx> -#include <macros.hxx> #include <ContainerHelper.hxx> #include <unonames.hxx> @@ -179,7 +178,7 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( const Reference< chart2:: } catch(const uno::Exception &e) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } @@ -411,7 +410,7 @@ void setStackModeAtSeries( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -460,7 +459,7 @@ sal_Int32 getAttachedAxisIndex( const Reference< chart2::XDataSeries > & xSeries } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return nRet; } @@ -483,7 +482,7 @@ sal_Int32 getNumberFormatKeyFromAxis( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return nResult; @@ -530,7 +529,7 @@ void deleteSeries( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -728,7 +727,7 @@ bool hasDataLabelsAtSeries( const Reference< chart2::XDataSeries >& xSeries ) } catch(const uno::Exception &e) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } return bRet; } @@ -761,7 +760,7 @@ bool hasDataLabelsAtPoints( const Reference< chart2::XDataSeries >& xSeries ) } catch(const uno::Exception &e) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } return bRet; } @@ -795,7 +794,7 @@ bool hasDataLabelAtPoint( const Reference< chart2::XDataSeries >& xSeries, sal_I } catch(const uno::Exception &e) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } return bRet; } @@ -824,7 +823,7 @@ void insertDataLabelToPoint( const Reference< beans::XPropertySet >& xPointProp } catch(const uno::Exception &e) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } @@ -844,7 +843,7 @@ void deleteDataLabelsFromPoint( const Reference< beans::XPropertySet >& xPointPr } catch(const uno::Exception &e) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index 17c7a6352b50..7ade8542e4b7 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -18,7 +18,6 @@ */ #include <DataSourceHelper.hxx> -#include <macros.hxx> #include <ChartModelHelper.hxx> #include <DiagramHelper.hxx> #include <DataSeriesHelper.hxx> @@ -110,7 +109,7 @@ void lcl_addErrorBarRanges( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -379,7 +378,7 @@ bool DataSourceHelper::detectRangeSegmentation( } catch( uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return bSomethingDetected; } @@ -424,7 +423,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return (bHasCellRangeRepresentation && bHasDataRowSource && bHasFirstCellAsLabel); diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 214434e67197..7430402e9af5 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -20,7 +20,6 @@ #include <DiagramHelper.hxx> #include <LegendHelper.hxx> #include <PropertyHelper.hxx> -#include <macros.hxx> #include <DataSeriesHelper.hxx> #include <AxisHelper.hxx> #include <ContainerHelper.hxx> @@ -103,7 +102,7 @@ DiagramHelper::tTemplateWithServiceName } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -184,7 +183,7 @@ void DiagramHelper::setVertical( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -307,7 +306,7 @@ void DiagramHelper::setStackMode( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -428,7 +427,7 @@ StackMode DiagramHelper::getStackModeFromChartType( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return eStackMode; @@ -460,7 +459,7 @@ sal_Int32 DiagramHelper::getDimension( const Reference< XDiagram > & xDiagram ) } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return nResult; @@ -522,7 +521,7 @@ void DiagramHelper::setDimension( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -556,7 +555,7 @@ void DiagramHelper::replaceCoordinateSystem( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } @@ -594,7 +593,7 @@ bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -696,7 +695,7 @@ std::vector< Reference< XDataSeries > > } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return aResult; @@ -803,7 +802,7 @@ std::vector< Reference< XAxis > > lcl_getAxisHoldingCategoriesFromDiagram( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } if( aRet.empty() ) @@ -846,7 +845,7 @@ bool DiagramHelper::isCategoryDiagram( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return false; @@ -914,7 +913,7 @@ Reference< data::XLabeledDataSequence > } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } @@ -923,7 +922,7 @@ Reference< data::XLabeledDataSequence > } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; @@ -1040,7 +1039,7 @@ void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, c } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } sal_Int32 nType = util::NumberFormat::UNDEFINED; if( xKeyProps.is() ) @@ -1233,7 +1232,7 @@ Sequence< Reference< XChartType > > } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -1531,7 +1530,7 @@ sal_Int32 DiagramHelper::getGeometry3D( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index a316c70b7f3d..682a13827ba1 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -18,7 +18,6 @@ */ #include <ErrorBar.hxx> -#include <macros.hxx> #include <ContainerHelper.hxx> #include <EventListenerHelper.hxx> #include <PropertyHelper.hxx> @@ -404,7 +403,7 @@ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyLi } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -417,7 +416,7 @@ void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModif } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index 392b8fc529a1..443de9e233e2 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -24,7 +24,6 @@ #include <CommonConverters.hxx> #include <DataSourceHelper.hxx> #include <ChartModelHelper.hxx> -#include <macros.hxx> #include <NumberFormatterWrapper.hxx> #include <unonames.hxx> @@ -123,7 +122,7 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2: } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index fd52506b1253..db59250b76b0 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -18,7 +18,6 @@ */ #include <ExponentialRegressionCurveCalculator.hxx> -#include <macros.hxx> #include <RegressionCalculationHelper.hxx> #include <SpecialCharacters.hxx> diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx index b00fea6a96ef..d0c888d748f2 100644 --- a/chart2/source/tools/FillProperties.cxx +++ b/chart2/source/tools/FillProperties.cxx @@ -18,7 +18,6 @@ */ #include <FillProperties.hxx> -#include <macros.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> #include <com/sun/star/drawing/FillStyle.hpp> diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx index 485a1f9d4b5b..a1f4829c1e53 100644 --- a/chart2/source/tools/FormattedStringHelper.cxx +++ b/chart2/source/tools/FormattedStringHelper.cxx @@ -18,7 +18,6 @@ */ #include <FormattedStringHelper.hxx> -#include <macros.hxx> #include <PropertyHelper.hxx> #include <com/sun/star/chart2/FormattedString.hpp> @@ -52,7 +51,7 @@ Sequence< Reference< chart2::XFormattedString2 > > } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return Sequence< Reference< XFormattedString2 > >( & xFormStr, 1 ); diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 72f3d0a888ad..a8e0c93759f9 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -25,7 +25,6 @@ #include <LabeledDataSequence.hxx> #include <DataSource.hxx> #include <PropertyHelper.hxx> -#include <macros.hxx> #include <XMLRangeHelper.hxx> #include <ContainerHelper.hxx> #include <CommonConverters.hxx> @@ -396,7 +395,7 @@ InternalDataProvider::InternalDataProvider( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index c9227fc15e1c..85c0a2747d4f 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -19,7 +19,6 @@ #include <LabeledDataSequence.hxx> #include <ModifyListenerHelper.hxx> -#include <macros.hxx> #include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -125,7 +124,7 @@ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XMo } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -138,7 +137,7 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util:: } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx index 7f4b36cf93eb..ef09cfae512d 100644 --- a/chart2/source/tools/LegendHelper.cxx +++ b/chart2/source/tools/LegendHelper.cxx @@ -18,7 +18,6 @@ */ #include <LegendHelper.hxx> -#include <macros.hxx> #include <com/sun/star/chart/ChartLegendExpansion.hpp> #include <com/sun/star/chart2/LegendPosition.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> @@ -100,7 +99,7 @@ uno::Reference< chart2::XLegend > LegendHelper::getLegend( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index b7c985460335..6ffe8849f1da 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -18,7 +18,6 @@ */ #include <LifeTime.hxx> -#include <macros.hxx> #include <osl/diagnose.h> #include <com/sun/star/util/XModifyListener.hpp> @@ -347,7 +346,7 @@ void CloseableLifeTimeManager::impl_doClose() } catch( const uno::Exception& ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } if(xCloseable.is()) diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx index a92c9ae6b076..508f1be13733 100644 --- a/chart2/source/tools/LinePropertiesHelper.cxx +++ b/chart2/source/tools/LinePropertiesHelper.cxx @@ -18,7 +18,6 @@ */ #include <LinePropertiesHelper.hxx> -#include <macros.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/LineDash.hpp> @@ -113,7 +112,7 @@ bool LinePropertiesHelper::IsLineVisible( const css::uno::Reference< } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return bRet; } @@ -138,7 +137,7 @@ void LinePropertiesHelper::SetLineVisible( const css::uno::Reference< } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -157,7 +156,7 @@ void LinePropertiesHelper::SetLineInvisible( const css::uno::Reference< } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -173,7 +172,7 @@ void LinePropertiesHelper::SetLineColor( const css::uno::Reference< } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index 786063c49d13..026c0df98023 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -18,7 +18,6 @@ */ #include <LinearRegressionCurveCalculator.hxx> -#include <macros.hxx> #include <RegressionCalculationHelper.hxx> #include <rtl/math.hxx> diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index b00ee699bcd8..377c1ccfe102 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -18,7 +18,6 @@ */ #include <LogarithmicRegressionCurveCalculator.hxx> -#include <macros.hxx> #include <RegressionCalculationHelper.hxx> #include <SpecialCharacters.hxx> diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index 4ac8b470994e..3f052eb5da51 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -18,7 +18,6 @@ */ #include <MeanValueRegressionCurveCalculator.hxx> -#include <macros.hxx> #include <osl/diagnose.h> #include <rtl/math.hxx> diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 3beebb8cb5d9..96661ab3886e 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -19,7 +19,6 @@ #include <ModifyListenerHelper.hxx> #include <WeakListenerAdapter.hxx> -#include <macros.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -116,7 +115,7 @@ void ModifyEventForwarder::AddListener( const Reference< util::XModifyListener > } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -139,7 +138,7 @@ void ModifyEventForwarder::RemoveListener( const Reference< util::XModifyListene } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx index b1cc6f317994..3da6d4f7afe4 100644 --- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx @@ -21,7 +21,6 @@ #include <RegressionCalculationHelper.hxx> #include <ResId.hxx> #include <strings.hrc> -#include <macros.hxx> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index d1d8992b2290..b5ff0c2e0028 100644 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -18,7 +18,6 @@ */ #include <NumberFormatterWrapper.hxx> -#include <macros.hxx> #include <comphelper/processfactory.hxx> #include <svl/numuno.hxx> #include <svl/zformat.hxx> diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index 4fe7a342fc73..cb25bb066101 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -22,7 +22,6 @@ #include <map> #include <ObjectIdentifier.hxx> -#include <macros.hxx> #include <TitleHelper.hxx> #include <ChartModelHelper.hxx> #include <AxisHelper.hxx> @@ -376,7 +375,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( } catch(const uno::Exception& ex) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } if( eObjectType != OBJECTTYPE_UNKNOWN ) @@ -458,7 +457,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( } catch(const uno::Exception& ex) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } if( eObjectType != OBJECTTYPE_UNKNOWN ) @@ -1387,7 +1386,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet( } catch(const uno::Exception& ex) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xObjectProperties; } diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx index aa2110ac00b3..953efc8a3351 100644 --- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx @@ -18,7 +18,6 @@ */ #include <PolynomialRegressionCurveCalculator.hxx> -#include <macros.hxx> #include <RegressionCalculationHelper.hxx> #include <cmath> diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index aa37189542ca..d4901d843279 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -18,7 +18,6 @@ */ #include <PotentialRegressionCurveCalculator.hxx> -#include <macros.hxx> #include <RegressionCalculationHelper.hxx> #include <SpecialCharacters.hxx> diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index 4d084777a6ce..12ff04e21b0d 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -19,7 +19,6 @@ #include <PropertyHelper.hxx> #include <ContainerHelper.hxx> -#include <macros.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <osl/diagnose.h> @@ -51,7 +50,7 @@ struct lcl_EqualsElement } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return false; } @@ -164,7 +163,7 @@ OUString lcl_addNamedPropertyUniqueNameToTable( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return rPreferredName; diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 6d5f30fb87b8..8804fa0f6d40 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -21,7 +21,6 @@ #include <WeakListenerAdapter.hxx> #include <ChartModelHelper.hxx> #include <DataSourceHelper.hxx> -#include <macros.hxx> #include <ObjectIdentifier.hxx> #include <DataSeriesHelper.hxx> @@ -183,7 +182,7 @@ void RangeHighlighter::determineRanges() } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } @@ -229,7 +228,7 @@ void RangeHighlighter::fillRangesForErrorBars( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } if( bUsesRangesAsErrorBars ) diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 9fd45d74e65d..b083f1e09323 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -21,7 +21,6 @@ #include <RelativeSizeHelper.hxx> #include <ChartModelHelper.hxx> #include <DiagramHelper.hxx> -#include <macros.hxx> #include <AxisHelper.hxx> #include <DataSeriesHelper.hxx> @@ -86,7 +85,7 @@ void ReferenceSizeProvider::setValuesAtTitle( } catch (const uno::Exception& ex) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -117,7 +116,7 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries() } catch (const uno::Exception& ex) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } //it is important to correct the datapoint properties first as they do reference the series properties @@ -160,7 +159,7 @@ void ReferenceSizeProvider::setValuesAtPropertySet( } catch (const uno::Exception& ex) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -296,7 +295,7 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState } catch (const uno::Exception& ex) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index 70ae1d7bed42..53b12b6397e9 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -29,7 +29,6 @@ #include "RegressionCurveModel.hxx" #include <ChartTypeHelper.hxx> #include <ChartModelHelper.hxx> -#include <macros.hxx> #include <PropertyHelper.hxx> #include <ResId.hxx> #include <strings.hrc> @@ -200,7 +199,7 @@ void RegressionCurveHelper::initializeCurveCalculator( } catch( const Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -252,7 +251,7 @@ bool RegressionCurveHelper::hasMeanValueLine( } catch( const Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return false; @@ -285,7 +284,7 @@ uno::Reference< chart2::XRegressionCurve > } catch( const Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -340,7 +339,7 @@ void RegressionCurveHelper::removeMeanValueLine( } catch( const Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -422,7 +421,7 @@ bool RegressionCurveHelper::removeAllExceptMeanValueLine( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } return bRemovedSomething; @@ -458,7 +457,7 @@ void RegressionCurveHelper::removeEquations( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } @@ -496,7 +495,7 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getFirstCurveN } catch( const Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return nullptr; @@ -520,7 +519,7 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getRegressionC } catch( const Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return nullptr; @@ -570,7 +569,7 @@ SvxChartRegress RegressionCurveHelper::getRegressionType( } catch( const Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return eResult; @@ -719,7 +718,7 @@ void RegressionCurveHelper::resetEquationPosition( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index a9a847b187ea..04816377ae1c 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -18,7 +18,6 @@ */ #include "RegressionCurveModel.hxx" -#include <macros.hxx> #include <LinePropertiesHelper.hxx> #include <RegressionCurveHelper.hxx> #include <RegressionCalculationHelper.hxx> @@ -255,7 +254,7 @@ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< uti } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -268,7 +267,7 @@ void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference< } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index f308490964ed..c7ac08ec1928 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -23,7 +23,6 @@ #include <UserDefinedProperties.hxx> #include <CharacterProperties.hxx> #include <PropertyHelper.hxx> -#include <macros.hxx> #include <ContainerHelper.hxx> #include <unonames.hxx> #include <cppuhelper/supportsservice.hxx> @@ -240,7 +239,7 @@ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util: } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -253,7 +252,7 @@ void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< ut } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx index 235de3ff5c10..7f9c63e94e86 100644 --- a/chart2/source/tools/RelativeSizeHelper.cxx +++ b/chart2/source/tools/RelativeSizeHelper.cxx @@ -18,7 +18,6 @@ */ #include <RelativeSizeHelper.hxx> -#include <macros.hxx> #include <vector> #include <algorithm> @@ -79,7 +78,7 @@ void RelativeSizeHelper::adaptFontSizes( } catch( const Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx index c4e2c32e8d93..a939117257ec 100644 --- a/chart2/source/tools/SceneProperties.cxx +++ b/chart2/source/tools/SceneProperties.cxx @@ -18,7 +18,6 @@ */ #include <SceneProperties.hxx> -#include <macros.hxx> #include <ChartTypeHelper.hxx> #include <ThreeDHelper.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index bef8c11a49e7..7613a071d3e4 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -20,7 +20,6 @@ #include <StatisticsHelper.hxx> #include <DataSeriesHelper.hxx> #include <ErrorBar.hxx> -#include <macros.hxx> #include <unonames.hxx> #include <rtl/math.hxx> @@ -153,7 +152,7 @@ void lcl_setXMLRangePropertyAtDataSequence( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index 20c0515c1016..facec9710c8e 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -18,7 +18,6 @@ */ #include <ThreeDHelper.hxx> -#include <macros.hxx> #include <DiagramHelper.hxx> #include <ChartTypeHelper.hxx> #include <BaseGFXHelper.hxx> @@ -973,7 +972,7 @@ void ThreeDHelper::switchRightAngledAxes( const Reference< beans::XPropertySet > } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -1028,7 +1027,7 @@ void ThreeDHelper::setRotationAngleToDiagram( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -1105,7 +1104,7 @@ double ThreeDHelper::getCameraDistance( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return fCameraDistance; } @@ -1133,7 +1132,7 @@ void ThreeDHelper::setCameraDistance( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -1183,7 +1182,7 @@ ThreeDLookScheme ThreeDHelper::detectScheme( const uno::Reference< XDiagram >& x } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } if( lcl_isSimpleScheme( aShadeMode, nRoundedEdges, nObjectLines, xDiagram ) ) @@ -1233,7 +1232,7 @@ void ThreeDHelper::setScheme( const uno::Reference< XDiagram >& xDiagram, ThreeD } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -1290,7 +1289,7 @@ void ThreeDHelper::setDefaultIllumination( const uno::Reference< beans::XPropert } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } ThreeDLookScheme aScheme = (aShadeMode==drawing::ShadeMode_FLAT) ? ThreeDLookScheme_Simple : ThreeDLookScheme_Realistic; @@ -1337,7 +1336,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines( } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); bDifferentRoundedEdges = true; } try @@ -1350,7 +1349,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines( } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); bDifferentObjectLines = true; } } @@ -1392,7 +1391,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines( } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index 1720c50da77d..1c7412ea2f8a 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -19,7 +19,6 @@ #include <TitleHelper.hxx> #include <ChartModelHelper.hxx> -#include <macros.hxx> #include <AxisHelper.hxx> #include <DiagramHelper.hxx> #include <com/sun/star/chart2/FormattedString.hpp> @@ -288,7 +287,7 @@ uno::Reference< XTitle > TitleHelper::createTitle( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } @@ -374,7 +373,7 @@ void TitleHelper::setCompleteString( const OUString& rNewText } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 3d2e8226e6d2..682500515416 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -18,7 +18,6 @@ */ #include <UncachedDataSequence.hxx> -#include <macros.hxx> #include <PropertyHelper.hxx> #include <CommonFunctors.hxx> #include <ModifyListenerHelper.hxx> @@ -300,7 +299,7 @@ void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XM } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -313,7 +312,7 @@ void SAL_CALL UncachedDataSequence::removeModifyListener( const Reference< util: } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx index 7f74c2f8d9bc..91738c1bd38d 100644 --- a/chart2/source/tools/UserDefinedProperties.cxx +++ b/chart2/source/tools/UserDefinedProperties.cxx @@ -18,7 +18,6 @@ */ #include <UserDefinedProperties.hxx> -#include <macros.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx index 0f1c242102ab..e6d00fdcd837 100644 --- a/chart2/source/tools/WrappedDefaultProperty.cxx +++ b/chart2/source/tools/WrappedDefaultProperty.cxx @@ -18,7 +18,6 @@ */ #include <WrappedDefaultProperty.hxx> -#include <macros.hxx> using namespace ::com::sun::star; @@ -64,7 +63,7 @@ beans::PropertyState WrappedDefaultProperty::getPropertyState( } catch( const beans::UnknownPropertyException& ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return aState; } diff --git a/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx index 42a88171c9cf..ff74fac8c1a1 100644 --- a/chart2/source/tools/WrappedDirectStateProperty.cxx +++ b/chart2/source/tools/WrappedDirectStateProperty.cxx @@ -18,7 +18,6 @@ */ #include <WrappedDirectStateProperty.hxx> -#include <macros.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index 63e3e10411fd..976c0c282cfa 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -18,7 +18,6 @@ */ #include <WrappedIgnoreProperty.hxx> -#include <macros.hxx> #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/drawing/Hatch.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx index fd490700d533..b738293c58cc 100644 --- a/chart2/source/tools/WrappedProperty.cxx +++ b/chart2/source/tools/WrappedProperty.cxx @@ -18,7 +18,6 @@ */ #include <WrappedProperty.hxx> -#include <macros.hxx> #include <com/sun/star/drawing/LineStyle.hpp> using namespace ::com::sun::star; @@ -113,7 +112,7 @@ beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans:: } catch( const beans::UnknownPropertyException& ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } return aState; diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index 245d37f31db9..f7855233c5a7 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -18,7 +18,6 @@ */ #include <WrappedPropertySet.hxx> -#include <macros.hxx> #include <tools/solar.h> @@ -238,7 +237,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >& } catch( const beans::UnknownPropertyException& ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); bUnknownProperty = true; } } @@ -262,11 +261,11 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< } catch( const beans::UnknownPropertyException& ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } catch( const lang::WrappedTargetException& ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index da1b1b50acfd..468d21003292 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -18,7 +18,6 @@ */ #include <ScaleAutomatism.hxx> -#include <macros.hxx> #include "Tickmarks_Equidistant.hxx" #include <DateHelper.hxx> #include "DateScaling.hxx" diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index b6f55029deb8..bfda7c01277f 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -21,7 +21,6 @@ #include <ShapeFactory.hxx> #include <CommonConverters.hxx> #include "Tickmarks.hxx" -#include <macros.hxx> #include <memory> diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index b5c04232a08f..7ce9d4d8ad08 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -18,7 +18,6 @@ */ #include "VAxisProperties.hxx" -#include <macros.hxx> #include <ViewDefines.hxx> #include <CommonConverters.hxx> #include <AxisHelper.hxx> @@ -236,7 +235,7 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } @@ -326,7 +325,7 @@ void AxisProperties::init( bool bCartesian ) } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } @@ -377,7 +376,7 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel ) } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } } diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index c9ec6d564d12..c53f890a07a6 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -21,7 +21,6 @@ #include <PlottingPositionHelper.hxx> #include <AbstractShapeFactory.hxx> #include <CommonConverters.hxx> -#include <macros.hxx> #include <ViewDefines.hxx> #include <PropertyMapper.hxx> #include <NumberFormatterWrapper.hxx> @@ -1702,7 +1701,7 @@ void VCartesianAxis::updatePositions() } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 8a5850400f4c..8e777f351bf1 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -20,7 +20,6 @@ #include "VCartesianCoordinateSystem.hxx" #include "VCartesianGrid.hxx" #include "VCartesianAxis.hxx" -#include <macros.hxx> #include <AxisIndexDefines.hxx> #include <AxisHelper.hxx> #include <ChartTypeHelper.hxx> diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 6a18e6d730a9..5bb47b0ac011 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -22,7 +22,6 @@ #include <PlottingPositionHelper.hxx> #include <ShapeFactory.hxx> #include <ObjectIdentifier.hxx> -#include <macros.hxx> #include <CommonConverters.hxx> #include <AxisHelper.hxx> #include <com/sun/star/drawing/PointSequenceSequence.hpp> diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 2c680b92f47a..2b0830d0dfee 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -24,7 +24,6 @@ #include <VSeriesPlotter.hxx> #include <AbstractShapeFactory.hxx> #include <servicenames_coosystems.hxx> -#include <macros.hxx> #include <AxisIndexDefines.hxx> #include <ObjectIdentifier.hxx> #include <ExplicitCategoriesProvider.hxx> @@ -556,7 +555,7 @@ bool VCoordinateSystem::getPropertySwapXAndYAxis() const } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } return bSwapXAndY; } diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index e263101795c1..da7eeb3733c7 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -22,7 +22,6 @@ #include "VPolarAngleAxis.hxx" #include "VPolarGrid.hxx" #include <AbstractShapeFactory.hxx> -#include <macros.hxx> #include <NumberFormatterWrapper.hxx> #include <PolarLabelPositionHelper.hxx> #include <tools/color.hxx> diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx index a456f4de3369..4416394cf105 100644 --- a/chart2/source/view/axes/VPolarAxis.cxx +++ b/chart2/source/view/axes/VPolarAxis.cxx @@ -20,7 +20,6 @@ #include "VPolarAxis.hxx" #include "VPolarAngleAxis.hxx" #include "VPolarRadiusAxis.hxx" -#include <macros.hxx> #include "Tickmarks.hxx" #include <ShapeFactory.hxx> diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index 51b3a12373d5..edf30d95b832 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -23,7 +23,6 @@ #include <PlottingPositionHelper.hxx> #include <ShapeFactory.hxx> #include <ObjectIdentifier.hxx> -#include <macros.hxx> #include <CommonConverters.hxx> #include "Tickmarks_Equidistant.hxx" #include <com/sun/star/drawing/LineStyle.hpp> diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 951119d817f9..d0bf32064738 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -21,7 +21,6 @@ #include <PlottingPositionHelper.hxx> #include <AbstractShapeFactory.hxx> #include <CommonConverters.hxx> -#include <macros.hxx> #include <ViewDefines.hxx> #include <ObjectIdentifier.hxx> #include "Splines.hxx" diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 06c87d475c25..27634b283c7e 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -23,7 +23,6 @@ #include <ObjectIdentifier.hxx> #include <LabelPositionHelper.hxx> #include "BarPositionHelper.hxx" -#include <macros.hxx> #include <AxisIndexDefines.hxx> #include <Clipping.hxx> #include <DateHelper.hxx> @@ -57,7 +56,7 @@ BarChart::BarChart( const uno::Reference<XChartType>& xChartTypeModel } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } @@ -286,7 +285,7 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint3D_Bar( } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } uno::Reference< drawing::XShape > xShape(nullptr); @@ -643,7 +642,7 @@ void BarChart::createShapes() } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } //@todo iterate through all subsystems to create partial points diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index 1e65978597c7..85ff761f40d2 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -21,7 +21,6 @@ #include <PlottingPositionHelper.hxx> #include <AbstractShapeFactory.hxx> #include <CommonConverters.hxx> -#include <macros.hxx> #include <ViewDefines.hxx> #include <ObjectIdentifier.hxx> #include "Splines.hxx" diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 511169a254a9..079c907c4fa2 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -23,7 +23,6 @@ #include <ObjectIdentifier.hxx> #include <LabelPositionHelper.hxx> #include "BarPositionHelper.hxx" -#include <macros.hxx> #include <VLegendSymbolFactory.hxx> #include <FormattedStringHelper.hxx> #include <DataSeriesHelper.hxx> @@ -129,7 +128,7 @@ void CandleStickChart::createShapes() } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } //(@todo maybe different iteration for breaks in axis ?) diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index 28e690f2ffac..e9ebb0c459d6 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -21,7 +21,6 @@ #include <PlottingPositionHelper.hxx> #include <AbstractShapeFactory.hxx> #include <CommonConverters.hxx> -#include <macros.hxx> #include <ViewDefines.hxx> #include <ObjectIdentifier.hxx> #include <ChartTypeHelper.hxx> diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index c8bbd2a27a29..2d1ebd9fc634 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -21,7 +21,6 @@ #include <PlottingPositionHelper.hxx> #include <AbstractShapeFactory.hxx> #include <PolarLabelPositionHelper.hxx> -#include <macros.hxx> #include <CommonConverters.hxx> #include <ViewDefines.hxx> #include <ObjectIdentifier.hxx> @@ -188,7 +187,7 @@ PieChart::PieChart( const uno::Reference<XChartType>& xChartTypeModel } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } @@ -644,7 +643,7 @@ void PieChart::createShapes() } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } ///see notes for `PolarPlottingPositionHelper` methods @@ -716,7 +715,7 @@ void PieChart::createShapes() } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } }//next series in x slot (next y slot) }//next category diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index c35e3cb262c6..9b90d88e5470 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -24,7 +24,6 @@ #include <svl/zformat.hxx> #include <CommonConverters.hxx> -#include <macros.hxx> #include <ViewDefines.hxx> #include <ObjectIdentifier.hxx> #include <StatisticsHelper.hxx> @@ -492,7 +491,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } sal_Int32 nLineCountForSymbolsize = 0; @@ -686,7 +685,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } return xTextShape; @@ -776,7 +775,7 @@ double lcl_getErrorBarLogicLength( } catch( const uno::Exception & e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } return fResult; @@ -994,7 +993,7 @@ void VSeriesPlotter::createErrorBar( } catch( const uno::Exception & e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } @@ -2499,7 +2498,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return aResult; } diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 1120271333d8..829cb3265260 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -21,7 +21,6 @@ #include <PropertyMapper.hxx> #include <ViewDefines.hxx> #include <Stripe.hxx> -#include <macros.hxx> #include <ObjectIdentifier.hxx> #include <DiagramHelper.hxx> #include <BaseGFXHelper.hxx> @@ -199,7 +198,7 @@ void VDiagram::createShapes_2d() } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } @@ -444,7 +443,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize ) } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } } @@ -607,7 +606,7 @@ void VDiagram::createShapes_3d() } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } //add floor plate @@ -663,7 +662,7 @@ void VDiagram::createShapes_3d() } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } } diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx index 122b1177133a..8bb4f3debfbc 100644 --- a/chart2/source/view/main/AbstractShapeFactory.cxx +++ b/chart2/source/view/main/AbstractShapeFactory.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <macros.hxx> #include <PropertyMapper.hxx> #include <CommonConverters.hxx> @@ -159,7 +158,7 @@ void AbstractShapeFactory::makeShapeInvisible( const uno::Reference< drawing::XS } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } } @@ -182,7 +181,7 @@ void AbstractShapeFactory::setShapeName( const uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } } @@ -201,7 +200,7 @@ OUString AbstractShapeFactory::getShapeName( const uno::Reference< drawing::XSha } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index 37c83d50ef12..387e83944c31 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -18,7 +18,6 @@ */ #include "ChartItemPool.hxx" -#include <macros.hxx> #include <chartview/ChartSfxItemIds.hxx> #include <svx/chrtitem.hxx> #include <svl/intitem.hxx> diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index e13d6b9cbc56..49f1670e9f37 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -30,7 +30,6 @@ #include <VCoordinateSystem.hxx> #include <VSeriesPlotter.hxx> #include <CommonConverters.hxx> -#include <macros.hxx> #include <TitleHelper.hxx> #include <LegendHelper.hxx> #include "VLegend.hxx" @@ -483,7 +482,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } //prepare for autoscaling and shape creation @@ -779,7 +778,7 @@ void SeriesPlotterContainer::setNumberFormatsFromAxes() } catch( const lang::IndexOutOfBoundsException& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } } @@ -1544,7 +1543,7 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw } catch( const uno::Exception& ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } } @@ -2001,7 +2000,7 @@ bool lcl_getPropertySwapXAndYAxis( const uno::Reference< XDiagram >& xDiagram ) } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } } @@ -2586,7 +2585,7 @@ void formatPage( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -2642,7 +2641,7 @@ void ChartView::impl_refreshAddIn() } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } @@ -2820,7 +2819,7 @@ void ChartView::impl_updateView( bool bCheckLockedCtrler ) m_bViewDirty = m_bViewUpdatePending; m_bViewUpdatePending = false; m_bInViewUpdate = false; - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } { @@ -2926,7 +2925,7 @@ void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode ) } catch( const uno::Exception& ex) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx index 10cd8fada13f..54ba3f7eb8c6 100644 --- a/chart2/source/view/main/DataPointSymbolSupplier.cxx +++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx @@ -19,7 +19,6 @@ #include <chartview/DataPointSymbolSupplier.hxx> #include <AbstractShapeFactory.hxx> -#include <macros.hxx> namespace chart { diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 180c55006e41..ab87a0769172 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -18,7 +18,6 @@ */ #include <chartview/DrawModelWrapper.hxx> -#include <macros.hxx> #include <AbstractShapeFactory.hxx> #include "ChartItemPool.hxx" #include <ObjectIdentifier.hxx> diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx index d0f65c4b2670..29dfc3259d4b 100644 --- a/chart2/source/view/main/LabelPositionHelper.cxx +++ b/chart2/source/view/main/LabelPositionHelper.cxx @@ -22,7 +22,6 @@ #include <CommonConverters.hxx> #include <PropertyMapper.hxx> #include <AbstractShapeFactory.hxx> -#include <macros.hxx> #include <RelativeSizeHelper.hxx> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx index 0b63e0c0f2d2..9cb3318f7fa2 100644 --- a/chart2/source/view/main/OpenglShapeFactory.cxx +++ b/chart2/source/view/main/OpenglShapeFactory.cxx @@ -23,7 +23,6 @@ #include <ViewDefines.hxx> #include <Stripe.hxx> #include <CommonConverters.hxx> -#include <macros.hxx> #include <PropertyMapper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/CircleKind.hpp> diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index 5240872264e9..23593449a64f 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -18,7 +18,6 @@ */ #include <PropertyMapper.hxx> -#include <macros.hxx> #include <unonames.hxx> #include <com/sun/star/beans/XMultiPropertySet.hpp> @@ -114,7 +113,7 @@ void PropertyMapper::getValueMap( } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } } @@ -407,7 +406,7 @@ void PropertyMapper::setMultiProperties( } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); //if this occurs more often think of removing the XMultiPropertySet completely for better performance + SAL_WARN("chart2", "Exception caught. " << e ); //if this occurs more often think of removing the XMultiPropertySet completely for better performance } if(!bSuccess) @@ -427,13 +426,13 @@ void PropertyMapper::setMultiProperties( } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index d6c408f583d4..3ed37f316225 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -21,7 +21,6 @@ #include <ViewDefines.hxx> #include <Stripe.hxx> #include <CommonConverters.hxx> -#include <macros.hxx> #include <RelativeSizeHelper.hxx> #include <PropertyMapper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -363,7 +362,7 @@ uno::Reference<drawing::XShape> } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } uno::Reference<drawing::XShape> xShape = impl_createCube( xTarget, rPosition, rSize, nRotateZAngleHundredthDegree, bRounded ); @@ -427,7 +426,7 @@ uno::Reference<drawing::XShape> } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } return xShape; @@ -676,7 +675,7 @@ uno::Reference<drawing::XShape> } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } return xShape; @@ -885,7 +884,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } @@ -966,7 +965,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } return xShape; @@ -1026,7 +1025,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } return xShape; @@ -1089,7 +1088,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } return xShape; @@ -1129,7 +1128,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } return xShape; @@ -1678,7 +1677,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } return xShape; @@ -1715,7 +1714,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception & e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY ); OSL_ENSURE(xProp.is(), "created shape offers no XPropertySet"); @@ -1727,7 +1726,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } return xShape; @@ -1763,7 +1762,7 @@ uno::Reference< drawing::XShapes > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } return nullptr; } @@ -1800,7 +1799,7 @@ uno::Reference< drawing::XShapes > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } } @@ -1816,7 +1815,7 @@ uno::Reference< drawing::XShapes > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } return nullptr; } @@ -1846,7 +1845,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception & e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } //set properties @@ -1860,7 +1859,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } return xShape; @@ -1936,7 +1935,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } return xShape; @@ -2000,7 +1999,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } return xShape; @@ -2042,7 +2041,7 @@ uno::Reference< drawing::XShape > ShapeFactory::createInvisibleRectangle( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return nullptr; } @@ -2127,7 +2126,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } return xShape; @@ -2230,7 +2229,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } } @@ -2299,7 +2298,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } if(bStackCharacters) @@ -2382,7 +2381,7 @@ uno::Reference< drawing::XShape > } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } return xShape; } diff --git a/chart2/source/view/main/VButton.cxx b/chart2/source/view/main/VButton.cxx index 4902d54ff750..0f4e2bd534ae 100644 --- a/chart2/source/view/main/VButton.cxx +++ b/chart2/source/view/main/VButton.cxx @@ -20,7 +20,6 @@ #include <CommonConverters.hxx> #include <editeng/unoprnms.hxx> -#include <macros.hxx> namespace chart { diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index a7b99992c39d..9f37d5237d04 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -20,7 +20,6 @@ #include <memory> #include <VDataSeries.hxx> #include <ObjectIdentifier.hxx> -#include <macros.hxx> #include <CommonConverters.hxx> #include <LabelPositionHelper.hxx> #include <ChartTypeHelper.hxx> @@ -236,7 +235,7 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries ) } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } } @@ -272,7 +271,7 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries ) } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } } @@ -649,7 +648,7 @@ sal_Int32 VDataSeries::getLabelPlacement( sal_Int32 nPointIndex, const uno::Refe } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } return nLabelPlacement; } @@ -794,7 +793,7 @@ std::unique_ptr<Symbol> getSymbolPropertiesFromPropertySet( const uno::Reference } catch(const uno::Exception &e) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } return apSymbolProps; } @@ -884,7 +883,7 @@ bool VDataSeries::hasPointOwnColor( sal_Int32 index ) const } catch(const uno::Exception& e) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } return false; } @@ -933,7 +932,7 @@ std::unique_ptr<DataPointLabel> getDataPointLabelFromPropertySet( const uno::Ref } catch(const uno::Exception &e) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } return apLabel; } diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 012070dfebff..497c23acaec4 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -19,7 +19,6 @@ #include "VLegend.hxx" #include "VButton.hxx" -#include <macros.hxx> #include <PropertyMapper.hxx> #include <CommonConverters.hxx> #include <ObjectIdentifier.hxx> @@ -81,7 +80,7 @@ double lcl_CalcViewFontSize( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -187,7 +186,7 @@ awt::Size lcl_createTextShapes( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -769,7 +768,7 @@ bool lcl_shouldSymbolsBePlacedOnTheLeftSide( const Reference< beans::XPropertySe } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return bSymbolsLeftSide; } @@ -860,7 +859,7 @@ bool VLegend::isVisible( const Reference< XLegend > & xLegend ) } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return bShow; @@ -1005,7 +1004,7 @@ void VLegend::createShapes( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } @@ -1057,7 +1056,7 @@ void VLegend::changePosition( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } } diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index 17b1939e16ad..e72757e378c8 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -18,7 +18,6 @@ */ #include <VLegendSymbolFactory.hxx> -#include <macros.hxx> #include <PropertyMapper.hxx> #include <AbstractShapeFactory.hxx> #include <ObjectIdentifier.hxx> @@ -188,7 +187,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( } catch( const uno::Exception & ex ) { - ASSERT_EXCEPTION( ex ); + SAL_WARN("chart2", "Exception caught. " << ex ); } return xResult; diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx index 1d30060ddcad..e694410ad298 100644 --- a/chart2/source/view/main/VLineProperties.cxx +++ b/chart2/source/view/main/VLineProperties.cxx @@ -18,7 +18,6 @@ */ #include <VLineProperties.hxx> -#include <macros.hxx> #include <com/sun/star/drawing/LineStyle.hpp> namespace chart @@ -49,7 +48,7 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } else diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index ec723460cbf2..3ef4e161bc15 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -19,7 +19,6 @@ #include "VTitle.hxx" #include <CommonConverters.hxx> -#include <macros.hxx> #include <PropertyMapper.hxx> #include <AbstractShapeFactory.hxx> #include <com/sun/star/chart2/XFormattedString.hpp> @@ -100,7 +99,7 @@ void VTitle::changePosition( const awt::Point& rPos ) } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } } @@ -128,7 +127,7 @@ void VTitle::createShapes( } catch( const uno::Exception& e ) { - ASSERT_EXCEPTION( e ); + SAL_WARN("chart2", "Exception caught. " << e ); } AbstractShapeFactory* pShapeFactory = AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory); |