summaryrefslogtreecommitdiffstats
path: root/chart2/source/controller/main/ShapeController.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/main/ShapeController.cxx
parentRevert "tdf#101349 Default table styles" (diff)
downloadcore-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/controller/main/ShapeController.cxx')
-rw-r--r--chart2/source/controller/main/ShapeController.cxx5
1 files changed, 2 insertions, 3 deletions
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;