diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-29 16:21:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-04 15:18:00 +0200 |
| commit | 2c05d758b2b62c9df413e2514fb3cd233d0f3ec7 (patch) | |
| tree | e0a23d3da6fb17ae97d18957fc14f4a4a8de2d3f /chart2 | |
| parent | a3088b1e72ef17babe3d3664c610afd02cfe0891 (diff) | |
add << operator for css::uno::Exception
Change-Id: Ia23dafd07133779144965682df3b7125a3214235
Reviewed-on: https://gerrit.libreoffice.org/43046
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'chart2')
4 files changed, 9 insertions, 12 deletions
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 7f9d4fe106c6..d1dca8371e59 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -141,7 +141,7 @@ namespace } catch( const uno::Exception & ex ) { - SAL_WARN( "chart2", "Property Exception caught. Message: " << ex.Message); + SAL_WARN( "chart2", "Property Exception caught. Message: " << ex); } } return aResult; @@ -167,7 +167,7 @@ namespace } catch( const uno::Exception & ex ) { - SAL_WARN( "chart2", "Property Exception caught. Message: " << ex.Message); + SAL_WARN( "chart2", "Property Exception caught. Message: " << ex); } } } @@ -182,7 +182,7 @@ namespace } catch( const uno::Exception & ex ) { - SAL_WARN( "chart2", "Property Exception caught. Message: " << ex.Message); + SAL_WARN( "chart2", "Property Exception caught. Message: " << ex); } return Color( nResult ); } @@ -198,7 +198,7 @@ namespace } catch( const uno::Exception & ex ) { - SAL_WARN( "chart2", "Property Exception caught. Message: " << ex.Message); + SAL_WARN( "chart2", "Property Exception caught. Message: " << ex); } } } diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index fe339e917399..aa4747728b18 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -118,7 +118,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const catch( const beans::UnknownPropertyException &ex ) { delete pItem; - SAL_WARN( "chart2", ex.Message << " - unknown Property: " << aProperty.first); + SAL_WARN( "chart2", ex << " - unknown Property: " << aProperty.first); } catch( const uno::Exception &ex ) { @@ -182,11 +182,11 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet ) } catch( const beans::UnknownPropertyException &ex ) { - SAL_WARN( "chart2", ex.Message << " - unknown Property: " << aProperty.first); + SAL_WARN( "chart2", ex << " - unknown Property: " << aProperty.first); } catch( const uno::Exception &ex ) { - SAL_WARN( "chart2", ex.Message ); + SAL_WARN( "chart2", ex ); } } else diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index e660dfb24be7..9cd74635a90a 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -215,7 +215,7 @@ void ChartController::TheModel::tryTermination() } catch(const uno::Exception& ex) { - SAL_WARN( "chart2", "Termination of model failed: " << ex.Message ); + SAL_WARN( "chart2", "Termination of model failed: " << ex ); } } diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx index daf66c45b9a2..6b435c71c6f8 100644 --- a/chart2/source/inc/macros.hxx +++ b/chart2/source/inc/macros.hxx @@ -25,10 +25,7 @@ #include "sal/log.hxx" -#define ASSERT_EXCEPTION(ex) \ - SAL_WARN("chart2", "Exception caught. Type: " <<\ - typeid( ex ).name() << ", Message: " << \ - ex.Message ) +#define ASSERT_EXCEPTION(ex) SAL_WARN("chart2", "Exception caught. " << ex ) #endif |