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/source/model/template/ChartTypeTemplate.cxx | |
| parent | Revert "tdf#101349 Default table styles" (diff) | |
| download | core-c4abbb6e10ecd382fd4fe6816cd4f29ea7d931a5.tar.gz core-c4abbb6e10ecd382fd4fe6816cd4f29ea7d931a5.zip | |
inline ASSERT_EXCEPTION macro in chart2
Change-Id: I6bdcde5fd416531e2cdd3c9ec160833f1022247c
Reviewed-on: https://gerrit.libreoffice.org/44246
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/model/template/ChartTypeTemplate.cxx')
| -rw-r--r-- | chart2/source/model/template/ChartTypeTemplate.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
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 ); } } |