summaryrefslogtreecommitdiff
path: root/chart2/source/controller/dialogs/DialogModel.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-11-02 15:44:50 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-11-03 13:03:13 +0100
commitc4abbb6e10ecd382fd4fe6816cd4f29ea7d931a5 (patch)
tree5103eb6d820d4c89f6c6a76d2bbfb419ed8372ce /chart2/source/controller/dialogs/DialogModel.cxx
parent22a95ea367cc005a382de23e51cba850b6dd5e6f (diff)
inline ASSERT_EXCEPTION macro in chart2
Change-Id: I6bdcde5fd416531e2cdd3c9ec160833f1022247c Reviewed-on: https://gerrit.libreoffice.org/44246 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/controller/dialogs/DialogModel.cxx')
-rw-r--r--chart2/source/controller/dialogs/DialogModel.cxx19
1 files changed, 9 insertions, 10 deletions
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 );
}
}