[Libreoffice-commits] core.git: chart2/source cppcanvas/source cui/source dbaccess/source oox/source sc/source sdext/Library_PresenterScreen.mk sdext/source sd/source sfx2/source slideshow/source starmath/source stoc/test svtools/source sw/source toolkit/source unotools/source vcl/backendtest vcl/source writerfilter/source writerperfect/source xmloff/source xmlsecurity/source

Noel Grandin noel.grandin at collabora.co.uk
Mon Apr 9 06:47:02 UTC 2018


 chart2/source/controller/accessibility/AccessibleBase.cxx                       |    5 
 chart2/source/controller/accessibility/AccessibleChartElement.cxx               |    5 
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx                        |    5 
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx               |   57 ++++----
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx                     |   17 +-
 chart2/source/controller/chartapiwrapper/GridWrapper.cxx                        |    5 
 chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx                  |    5 
 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx                   |    5 
 chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx |    5 
 chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx         |    5 
 chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx             |    5 
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx            |    5 
 chart2/source/controller/dialogs/ChartTypeDialogController.cxx                  |    9 -
 chart2/source/controller/dialogs/DataBrowserModel.cxx                           |   13 +-
 chart2/source/controller/dialogs/DialogModel.cxx                                |   37 ++---
 chart2/source/controller/dialogs/ObjectNameProvider.cxx                         |    9 -
 chart2/source/controller/dialogs/RangeSelectionHelper.cxx                       |   13 +-
 chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx                     |    5 
 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx                       |    5 
 chart2/source/controller/dialogs/res_LegendPosition.cxx                         |    9 -
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx                      |    9 -
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx                        |    5 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx                    |   17 +-
 chart2/source/controller/dialogs/tp_ChartType.cxx                               |   13 +-
 chart2/source/controller/dialogs/tp_DataSource.cxx                              |   21 +--
 chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx      |    9 -
 chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx               |    9 -
 chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx        |    9 -
 chart2/source/controller/itemsetwrapper/ItemConverter.cxx                       |    9 -
 chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx                 |    5 
 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx          |    5 
 chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx             |   13 +-
 chart2/source/controller/main/ChartController.cxx                               |   16 +-
 chart2/source/controller/main/ChartController_Tools.cxx                         |   13 +-
 chart2/source/controller/main/ChartController_Window.cxx                        |   17 +-
 chart2/source/controller/main/ChartFrameloader.cxx                              |    5 
 chart2/source/controller/main/CommandDispatch.cxx                               |    5 
 chart2/source/controller/main/DragMethod_PieSegment.cxx                         |    5 
 chart2/source/controller/main/ObjectHierarchy.cxx                               |    9 -
 chart2/source/controller/main/ShapeController.cxx                               |    9 -
 chart2/source/model/filter/XMLFilter.cxx                                        |   29 ++--
 chart2/source/model/main/Axis.cxx                                               |   13 +-
 chart2/source/model/main/BaseCoordinateSystem.cxx                               |   13 +-
 chart2/source/model/main/ChartModel.cxx                                         |   17 +-
 chart2/source/model/main/ChartModel_Persistence.cxx                             |   37 ++---
 chart2/source/model/main/DataPoint.cxx                                          |   13 +-
 chart2/source/model/main/DataSeries.cxx                                         |   13 +-
 chart2/source/model/main/Diagram.cxx                                            |   13 +-
 chart2/source/model/main/FormattedString.cxx                                    |    9 -
 chart2/source/model/main/GridProperties.cxx                                     |    9 -
 chart2/source/model/main/Legend.cxx                                             |    9 -
 chart2/source/model/main/PageBackground.cxx                                     |    9 -
 chart2/source/model/main/StockBar.cxx                                           |    9 -
 chart2/source/model/main/Title.cxx                                              |    9 -
 chart2/source/model/main/Wall.cxx                                               |    9 -
 chart2/source/model/template/AreaChartTypeTemplate.cxx                          |    9 -
 chart2/source/model/template/BarChartTypeTemplate.cxx                           |    9 -
 chart2/source/model/template/BubbleChartTypeTemplate.cxx                        |    9 -
 chart2/source/model/template/BubbleDataInterpreter.cxx                          |   13 +-
 chart2/source/model/template/CandleStickChartType.cxx                           |    5 
 chart2/source/model/template/ChartType.cxx                                      |    9 -
 chart2/source/model/template/ChartTypeManager.cxx                               |    5 
 chart2/source/model/template/ChartTypeTemplate.cxx                              |   33 ++---
 chart2/source/model/template/ColumnLineChartTypeTemplate.cxx                    |   13 +-
 chart2/source/model/template/DataInterpreter.cxx                                |   25 ++-
 chart2/source/model/template/GL3DBarChartTypeTemplate.cxx                       |    9 -
 chart2/source/model/template/LineChartTypeTemplate.cxx                          |   21 +--
 chart2/source/model/template/NetChartTypeTemplate.cxx                           |   13 +-
 chart2/source/model/template/PieChartTypeTemplate.cxx                           |   33 ++---
 chart2/source/model/template/ScatterChartTypeTemplate.cxx                       |   21 +--
 chart2/source/model/template/StockChartTypeTemplate.cxx                         |   17 +-
 chart2/source/model/template/StockDataInterpreter.cxx                           |    9 -
 chart2/source/model/template/XYDataInterpreter.cxx                              |   13 +-
 chart2/source/tools/AxisHelper.cxx                                              |   17 +-
 chart2/source/tools/CachedDataSequence.cxx                                      |    9 -
 chart2/source/tools/ChartModelHelper.cxx                                        |    5 
 chart2/source/tools/ChartTypeHelper.cxx                                         |    5 
 chart2/source/tools/ChartViewHelper.cxx                                         |    5 
 chart2/source/tools/DataSeriesHelper.cxx                                        |   17 +-
 chart2/source/tools/DataSourceHelper.cxx                                        |   13 +-
 chart2/source/tools/DiagramHelper.cxx                                           |   65 +++++-----
 chart2/source/tools/ErrorBar.cxx                                                |    9 -
 chart2/source/tools/ExplicitCategoriesProvider.cxx                              |    5 
 chart2/source/tools/FormattedStringHelper.cxx                                   |    5 
 chart2/source/tools/InternalDataProvider.cxx                                    |    5 
 chart2/source/tools/LabeledDataSequence.cxx                                     |    9 -
 chart2/source/tools/LegendHelper.cxx                                            |    5 
 chart2/source/tools/LifeTime.cxx                                                |    5 
 chart2/source/tools/LinePropertiesHelper.cxx                                    |   17 +-
 chart2/source/tools/ModifyListenerHelper.cxx                                    |    9 -
 chart2/source/tools/ObjectIdentifier.cxx                                        |   13 +-
 chart2/source/tools/PropertyHelper.cxx                                          |    9 -
 chart2/source/tools/RangeHighlighter.cxx                                        |    9 -
 chart2/source/tools/ReferenceSizeProvider.cxx                                   |   17 +-
 chart2/source/tools/RegressionCurveHelper.cxx                                   |   41 +++---
 chart2/source/tools/RegressionCurveModel.cxx                                    |    9 -
 chart2/source/tools/RegressionEquation.cxx                                      |    9 -
 chart2/source/tools/RelativeSizeHelper.cxx                                      |    5 
 chart2/source/tools/StatisticsHelper.cxx                                        |    5 
 chart2/source/tools/ThreeDHelper.cxx                                            |   29 ++--
 chart2/source/tools/TitleHelper.cxx                                             |    9 -
 chart2/source/tools/UncachedDataSequence.cxx                                    |    9 -
 chart2/source/tools/WrappedDefaultProperty.cxx                                  |    5 
 chart2/source/tools/WrappedProperty.cxx                                         |    5 
 chart2/source/tools/WrappedPropertySet.cxx                                      |   13 +-
 chart2/source/view/charttypes/VSeriesPlotter.cxx                                |    5 
 chart2/source/view/diagram/VDiagram.cxx                                         |    5 
 chart2/source/view/main/ChartView.cxx                                           |   21 +--
 chart2/source/view/main/ShapeFactory.cxx                                        |    5 
 chart2/source/view/main/VLegend.cxx                                             |   26 ++--
 chart2/source/view/main/VLegendSymbolFactory.cxx                                |    5 
 cppcanvas/source/mtfrenderer/implrenderer.cxx                                   |    4 
 cui/source/options/optpath.cxx                                                  |    5 
 dbaccess/source/core/api/RowSetCache.cxx                                        |    4 
 oox/source/export/chartexport.cxx                                               |   17 +-
 sc/source/ui/vba/vbachartobjects.cxx                                            |    5 
 sd/source/ui/view/drviewsa.cxx                                                  |    5 
 sdext/Library_PresenterScreen.mk                                                |    1 
 sdext/source/presenter/PresenterConfigurationAccess.cxx                         |    5 
 sfx2/source/sidebar/PanelTitleBar.cxx                                           |    5 
 sfx2/source/sidebar/Theme.cxx                                                   |    5 
 slideshow/source/engine/shapes/drawshape.cxx                                    |    4 
 starmath/source/mathmlexport.cxx                                                |    5 
 starmath/source/mathmlimport.cxx                                                |    5 
 starmath/source/unofilter.cxx                                                   |    5 
 stoc/test/javavm/testjavavm.cxx                                                 |    2 
 stoc/test/testconv.cxx                                                          |    2 
 stoc/test/testcorefl.cxx                                                        |    2 
 stoc/test/testintrosp.cxx                                                       |    2 
 svtools/source/config/accessibilityoptions.cxx                                  |   49 +++----
 svtools/source/config/printoptions.cxx                                          |   57 ++++----
 svtools/source/misc/embedhlp.cxx                                                |    9 -
 sw/source/core/edit/edfcol.cxx                                                  |    5 
 sw/source/filter/ww8/rtfsdrexport.cxx                                           |    5 
 sw/source/filter/ww8/ww8par.cxx                                                 |    5 
 toolkit/source/awt/vclxtoolkit.cxx                                              |   17 +-
 unotools/source/config/configitem.cxx                                           |    5 
 unotools/source/config/historyoptions.cxx                                       |   38 ++---
 unotools/source/config/useroptions.cxx                                          |   13 +-
 unotools/source/misc/mediadescriptor.cxx                                        |    5 
 vcl/backendtest/VisualBackendTest.cxx                                           |    5 
 vcl/source/window/builder.cxx                                                   |    3 
 writerfilter/source/dmapper/DomainMapper.cxx                                    |    9 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx                               |   13 +-
 writerfilter/source/dmapper/ModelEventListener.cxx                              |    5 
 writerfilter/source/dmapper/PropertyMap.cxx                                     |    9 -
 writerfilter/source/dmapper/StyleSheetTable.cxx                                 |    5 
 writerperfect/source/writer/exp/xmlimp.cxx                                      |   13 +-
 xmloff/source/chart/SchXMLExport.cxx                                            |   13 +-
 xmloff/source/chart/SchXMLImport.cxx                                            |    9 -
 xmloff/source/chart/SchXMLSeries2Context.cxx                                    |    5 
 xmloff/source/chart/SchXMLSeriesHelper.cxx                                      |    5 
 xmloff/source/chart/SchXMLTools.cxx                                             |   13 +-
 xmloff/source/draw/shapeimport.cxx                                              |    5 
 xmloff/source/forms/officeforms.cxx                                             |    5 
 xmlsecurity/source/helper/pdfsignaturehelper.cxx                                |    5 
 xmlsecurity/source/helper/xmlsignaturehelper.cxx                                |    5 
 157 files changed, 964 insertions(+), 817 deletions(-)

New commits:
commit 48fbfe38f60de731ff8bec0372179bedd6670af4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Apr 5 16:20:13 2018 +0200

    use more DBG_UNHANDLED_EXCEPTION
    
    so we get nice logs of the exception dynamic type for UNO exceptions.
    
    Change-Id: Ic0b10dc14d354a2c9a0591b3a51d2f1640d54bdb
    Reviewed-on: https://gerrit.libreoffice.org/52465
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 3f910e5914ef..cac25182d8e1 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -49,6 +49,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/settings.hxx>
 #include <o3tl/functional.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 #include <iterator>
@@ -807,9 +808,9 @@ Color AccessibleBase::getColor( eColorType eColType )
                 xObjProp->getPropertyValue( aPropName ) >>= nResult;
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index bd37dc235403..82f55eeda53f 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -31,6 +31,7 @@
 
 #include <vcl/svapp.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -104,9 +105,9 @@ void AccessibleChartElement::InitTextEdit()
             aArgs[2] <<= Reference< awt::XWindow >( GetInfo().m_xWindow );
             xInit->initialize( aArgs );
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
 }
 
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index ba1fb4b91ae0..d5662f5d2981 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -48,6 +48,7 @@
 #include <algorithm>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
@@ -584,9 +585,9 @@ Reference< chart2::XAxis > AxisWrapper::getAxis()
                 xProp->setPropertyValue("Show", uno::Any( false ) );
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     return xAxis;
 }
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 21c965854fba..93b413f25189 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -59,6 +59,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/util/DateTime.hpp>
+#include <tools/diagnose_ex.h>
 
 #include <vector>
 #include <algorithm>
@@ -469,9 +470,9 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R
                 xLegendProp->setPropertyValue("Show", uno::Any( bNewValue ));
         }
     }
-    catch (const uno::Exception& ex)
+    catch (const uno::Exception&)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -487,9 +488,9 @@ Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropert
         else
             aRet <<= false;
     }
-    catch (const uno::Exception& ex)
+    catch (const uno::Exception&)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     return aRet;
 }
@@ -536,9 +537,9 @@ void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, cons
         else
             TitleHelper::removeTitle( TitleHelper::MAIN_TITLE, m_spChart2ModelContact->getChartModel() );
     }
-    catch (const uno::Exception& ex)
+    catch (const uno::Exception&)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -549,9 +550,9 @@ Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XProp
     {
         aRet <<= TitleHelper::getTitle( TitleHelper::MAIN_TITLE, m_spChart2ModelContact->getChartModel() ).is();
     }
-    catch (const uno::Exception& ex)
+    catch (const uno::Exception&)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     return aRet;
 }
@@ -598,9 +599,9 @@ void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const
         else
             TitleHelper::removeTitle( TitleHelper::SUB_TITLE, m_spChart2ModelContact->getChartModel() );
     }
-    catch (const uno::Exception& ex)
+    catch (const uno::Exception&)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -611,9 +612,9 @@ Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPrope
     {
         aRet <<= TitleHelper::getTitle( TitleHelper::SUB_TITLE, m_spChart2ModelContact->getChartModel() ).is();
     }
-    catch (const uno::Exception& ex)
+    catch (const uno::Exception&)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     return aRet;
 }
@@ -697,9 +698,9 @@ Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram()
         {
             m_xDiagram = new DiagramWrapper( m_spChart2ModelContact );
         }
-        catch (const uno::Exception& ex)
+        catch (const uno::Exception&)
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 
@@ -731,9 +732,9 @@ void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDi
                 m_xDiagram = xDiagram;
             }
         }
-        catch (const uno::Exception& ex)
+        catch (const uno::Exception&)
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 }
@@ -884,9 +885,9 @@ void SAL_CALL ChartDocumentWrapper::dispose()
             // this is ok, don't panic
         }
     }
-    catch (const uno::Exception &ex)
+    catch (const uno::Exception &)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -916,13 +917,13 @@ void ChartDocumentWrapper::impl_resetAddIn()
                 }
             }
         }
-        catch (const uno::RuntimeException& ex)
+        catch (const uno::RuntimeException&)
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
-        catch (const uno::Exception& ex)
+        catch (const uno::Exception&)
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 }
@@ -1230,9 +1231,9 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
 
                 xResult = static_cast< ::cppu::OWeakObject* >( new DiagramWrapper( m_spChart2ModelContact ));
             }
-            catch (const uno::Exception& ex)
+            catch (const uno::Exception&)
             {
-                SAL_WARN("chart2", "Exception caught. " << ex );
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         }
 
@@ -1265,9 +1266,9 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                         aArguments[1] <<= true; // bRefreshAddIn
                         xViewInit->initialize(aArguments);
                     }
-                    catch (const uno::Exception& ex)
+                    catch (const uno::Exception&)
                     {
-                        SAL_WARN("chart2", "Exception caught. " << ex );
+                        DBG_UNHANDLED_EXCEPTION("chart2");
                     }
                 }
             }
@@ -1370,9 +1371,9 @@ void SAL_CALL ChartDocumentWrapper::setDelegator(
         {
             dispose();
         }
-        catch (const uno::Exception& ex)
+        catch (const uno::Exception&)
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 }
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 7f6048e68ce5..b2da48874a18 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -66,6 +66,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::chart::wrapper;
@@ -1467,9 +1468,9 @@ bool WrappedNumberOfLinesProperty::detectInnerValue( uno::Any& rInnerValue ) con
                     xProp->getPropertyValue( m_aOuterName ) >>= nNumberOfLines;
                     bHasDetectableInnerValue = true;
                 }
-                catch( const uno::Exception & ex )
+                catch( const uno::Exception & )
                 {
-                    SAL_WARN("chart2", "Exception caught. " << ex );
+                    DBG_UNHANDLED_EXCEPTION("chart2");
                 }
             }
         }
@@ -1510,9 +1511,9 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con
                     if( nOldValue == nNewValue )
                         return;
                 }
-                catch( const uno::Exception & ex )
+                catch( const uno::Exception & )
                 {
-                    SAL_WARN("chart2", "Exception caught. " << ex );
+                    DBG_UNHANDLED_EXCEPTION("chart2");
                 }
             }
             else
@@ -1537,9 +1538,9 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con
                 xProp->setPropertyValue( "NumberOfLines", uno::Any(nNewValue) );
                 xTemplate->changeDiagram( xDiagram );
             }
-            catch( const uno::Exception & ex )
+            catch( const uno::Exception & )
             {
-                SAL_WARN("chart2", "Exception caught. " << ex );
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         }
     }
@@ -1758,9 +1759,9 @@ void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, con
                     xInnerPropertySet->setPropertyValue( "RelativeSize", Any() );
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 }
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 21dec1a71530..f61f17a616e0 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -31,6 +31,7 @@
 #include <algorithm>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
@@ -144,9 +145,9 @@ Reference< beans::XPropertySet > GridWrapper::getInnerPropertySet()
         sal_Int32 nSubGridIndex = bSubGrid ? 0 : -1;
         xRet.set( AxisHelper::getGridProperties( xCooSys , nDimensionIndex, MAIN_AXIS_INDEX, nSubGridIndex ) );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     return xRet;
 }
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index cd626e611bf9..658f626b83b6 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -29,6 +29,7 @@
 
 #include <LinePropertiesHelper.hxx>
 #include <UserDefinedProperties.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
@@ -258,9 +259,9 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUStrin
         {
             setPropertyValue( aPropertyName, rValueSeq[nN] );
         }
-        catch( const beans::UnknownPropertyException& ex )
+        catch( const beans::UnknownPropertyException& )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
     //todo: store unknown properties elsewhere
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index fef4f56afdc9..e235e4bd21ee 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -29,6 +29,7 @@
 #include <LinePropertiesHelper.hxx>
 #include <FillProperties.hxx>
 #include <UserDefinedProperties.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
@@ -234,9 +235,9 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString
         {
             setPropertyValue( aPropertyName, rValueSeq[nN] );
         }
-        catch( const beans::UnknownPropertyException& ex )
+        catch( const beans::UnknownPropertyException& )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
     //todo: store unknown properties elsewhere
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index a418504eba57..52d52d159cab 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -21,6 +21,7 @@
 #include <FastPropertyIdRanges.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;
@@ -64,9 +65,9 @@ void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue,
                     xInnerPropertySet->setPropertyValue( "RelativePosition", Any() );
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 }
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 90a3e1942e5a..fa92ef88339d 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -21,6 +21,7 @@
 #include <FastPropertyIdRanges.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;
@@ -74,9 +75,9 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R
             else
                 xInnerPropertySet->setPropertyValue( aRefSizeName, Any() );
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 }
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index d57d65fcac89..a7db7ce4e8fc 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -24,6 +24,7 @@
 #include <ControllerLockGuard.hxx>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
@@ -91,9 +92,9 @@ void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, c
                 ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
                 xTemplate->changeDiagram( xDiagram );
             }
-            catch( const uno::Exception & ex )
+            catch( const uno::Exception & )
             {
-                SAL_WARN("chart2", "Exception caught. " << ex );
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         }
     }
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index f2f02898f3b9..8f0986b36d99 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -34,6 +34,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/GraphicObject.hxx>
 #include <vcl/outdev.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;
@@ -429,9 +430,9 @@ beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Referenc
                 return beans::PropertyState_DIRECT_VALUE;
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     return beans::PropertyState_DEFAULT_VALUE;
 }
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index c57536c59800..c87b765b0a8e 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -40,6 +40,7 @@
 #include <vcl/settings.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <tools/diagnose_ex.h>
 
 namespace chart
 {
@@ -311,9 +312,9 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla
                 {
                     setTemplateProperties( xTemplateProps );
                 }
-                catch( const uno::Exception & ex )
+                catch( const uno::Exception & )
                 {
-                    SAL_WARN("chart2", "Exception caught. " << ex );
+                    DBG_UNHANDLED_EXCEPTION("chart2");
                 }
             }
         }
@@ -1201,9 +1202,9 @@ void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypePar
         {
             xTemplateProps->getPropertyValue( "NumberOfLines" ) >>= nNumLines;
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
     if( nNumLines < 0 )
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 1b570be90e49..dcd67beb5330 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -44,6 +44,7 @@
 #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp>
 #include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
+#include <tools/diagnose_ex.h>
 
 #include <rtl/math.hxx>
 
@@ -69,9 +70,9 @@ OUString lcl_getRole(
         {
             xProp->getPropertyValue( "Role" ) >>= aResult;
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
     return aResult;
@@ -117,9 +118,9 @@ bool lcl_SequenceOfSeriesIsShared(
                 break;
             }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     return bResult;
 }
@@ -954,9 +955,9 @@ void DataBrowserModel::addErrorBarRanges(
             ++rInOutHeaderEnd;
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 86beb8eb7a11..13b85804c9c7 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 #include <comphelper/sequence.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <rtl/ustring.hxx>
 
@@ -155,9 +156,9 @@ struct lcl_DataSeriesContainerAppend
                 }
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
         return *this;
     }
@@ -214,9 +215,9 @@ struct lcl_RolesWithRangeAppend
                 }
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
         return *this;
     }
@@ -443,9 +444,9 @@ std::vector< Reference< XDataSeriesContainer > >
             }
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     return aResult;
@@ -534,9 +535,9 @@ DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
             addMissingRoles(aResult, aRoles);
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     return aResult;
 }
@@ -591,9 +592,9 @@ Reference< chart2::XDataSeries > DialogModel::insertSeriesAfter(
 
         ThreeDHelper::setScheme( xDiagram, e3DScheme );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     return xNewSeries;
 }
@@ -619,9 +620,9 @@ Reference< data::XLabeledDataSequence > DialogModel::getCategories() const
             xResult.set( DiagramHelper::getCategoriesFromDiagram( xDiagram ));
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     return xResult;
 }
@@ -684,9 +685,9 @@ void DialogModel::detectArguments(
                 Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY_THROW ),
                 rOutRangeString, aSequenceMapping, rOutUseColumns, rOutFirstCellAsLabel, rOutHasCategories );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -737,9 +738,9 @@ void DialogModel::setData(
             ThreeDHelper::setScheme( xDiagram, e3DScheme );
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -837,9 +838,9 @@ void DialogModel::applyInterpretedData(
                 OSL_ASSERT( (*aDestIt).is());
                 (*aDestIt)->setDataSeries( *aSrcIt );
             }
-            catch( const uno::Exception & ex )
+            catch( const uno::Exception & )
             {
-                SAL_WARN("chart2", "Exception caught. " << ex );
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         }
 
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 072db4f18d45..163592ac420c 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -37,6 +37,7 @@
 
 #include <com/sun/star/chart2/XTitle.hpp>
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
+#include <tools/diagnose_ex.h>
 
 namespace chart
 {
@@ -623,9 +624,9 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
                                     fR*fR, rtl_math_StringFormat_G, 4, cDecSeparator, true ));
                         }
                     }
-                    catch( const uno::Exception & ex )
+                    catch( const uno::Exception & )
                     {
-                        SAL_WARN("chart2", "Exception caught. " << ex );
+                        DBG_UNHANDLED_EXCEPTION("chart2");
                     }
                 }
             }
@@ -692,9 +693,9 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
                                     fStdDev, rtl_math_StringFormat_G, 4, cDecSeparator, true ));
                         }
                     }
-                    catch( const uno::Exception & ex )
+                    catch( const uno::Exception & )
                     {
-                        SAL_WARN("chart2", "Exception caught. " << ex );
+                        DBG_UNHANDLED_EXCEPTION("chart2");
                     }
                 }
             }
diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
index dc3b943c021b..df3b1a190ce1 100644
--- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
@@ -20,6 +20,7 @@
 #include <RangeSelectionHelper.hxx>
 #include <RangeSelectionListener.hxx>
 #include <com/sun/star/awt/XTopWindow.hpp>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
@@ -53,9 +54,9 @@ Reference< sheet::XRangeSelection > const & RangeSelectionHelper::getRangeSelect
             if( xDataProvider.is())
                 m_xRangeSelection.set( xDataProvider->getRangeSelection());
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
 
             m_xRangeSelection.clear();
         }
@@ -84,9 +85,9 @@ void RangeSelectionHelper::raiseRangeSelectionDocument()
                 }
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 }
@@ -130,10 +131,10 @@ bool RangeSelectionHelper::chooseRange(
             xRangeSel->startRangeSelection( aArgs );
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
+        DBG_UNHANDLED_EXCEPTION("chart2");
         bResult = false;
-        SAL_WARN("chart2", "Exception caught. " << ex );
     }
 
     return bResult;
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 29b8cfc7185b..2ef8b41ff185 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <comphelper/sequence.hxx>
+#include <tools/diagnose_ex.h>
 
 namespace chart
 {
@@ -249,9 +250,9 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
         uno::Reference< frame::XTerminateListener > xListener( this );
         xDesktop->removeTerminateListener( xListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 11c3d3ec0869..9d6df50719c6 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -66,6 +66,7 @@
 #include <svx/numinf.hxx>
 
 #include <svl/cjkoptions.hxx>
+#include <tools/diagnose_ex.h>
 
 namespace chart
 {
@@ -238,9 +239,9 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
                     }
                 }
             }
-            catch( const Exception & ex )
+            catch( const Exception & )
             {
-                SAL_WARN("chart2", "Exception caught. " << ex );
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         }
         if( !bXValuesFound && bYValuesFound )
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index e530fb07d241..4c179554ab57 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -30,6 +30,7 @@
 #include <chartview/ChartSfxItemIds.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
+#include <tools/diagnose_ex.h>
 
 namespace chart
 {
@@ -114,9 +115,9 @@ void LegendPositionResources::writeToResources( const uno::Reference< frame::XMo
             }
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -158,9 +159,9 @@ void LegendPositionResources::writeToModel( const css::uno::Reference< frame::XM
             xProp->setPropertyValue( "RelativePosition" , uno::Any());
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2" );
     }
 }
 
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 0ae2112711a0..f095eb068cbe 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -22,6 +22,7 @@
 #include <ThreeDHelper.hxx>
 #include <rtl/math.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
@@ -54,9 +55,9 @@ lcl_ModelProperties lcl_getPropertiesFromModel( uno::Reference< frame::XModel >
         ::chart::ThreeDHelper::getRoundedEdgesAndObjectLines( xDiagram, aProps.m_nRoundedEdges, aProps.m_nObjectLines );
         aProps.m_eScheme = ::chart::ThreeDHelper::detectScheme( xDiagram );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     return aProps;
 }
@@ -69,9 +70,9 @@ void lcl_setShadeModeAtModel( uno::Reference< frame::XModel > const & xModel, dr
             ::chart::ChartModelHelper::findDiagram( xModel ), uno::UNO_QUERY_THROW );
         xDiaProp->setPropertyValue( "D3DSceneShadeMode" , uno::Any( aShadeMode ));
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 87d2b73c1564..ae8449dcf257 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -26,6 +26,7 @@
 #include <rtl/math.hxx>
 #include <editeng/unoprnms.hxx>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
+#include <tools/diagnose_ex.h>
 
 namespace chart
 {
@@ -220,9 +221,9 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel()
         m_xSceneProperties->setPropertyValue( "D3DScenePerspective" , uno::Any( aMode ));
         m_xSceneProperties->setPropertyValue( "Perspective" , uno::Any( static_cast<sal_Int32>(m_pMFPerspective->GetValue()) ));
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     m_bPerspectiveChangePending = false;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 259b7721b8ee..ac1f95d7265d 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -30,6 +30,7 @@
 #include <svx/svx3ditems.hxx>
 #include <svx/svddef.hxx>
 #include <vcl/builderfactory.hxx>
+#include <tools/diagnose_ex.h>
 
 namespace chart
 {
@@ -137,9 +138,9 @@ namespace
                 xSceneProperties->getPropertyValue( "D3DSceneLightDirection" + aIndex ) >>= aResult.aDirection;
                 xSceneProperties->getPropertyValue( "D3DSceneLightOn" + aIndex ) >>= aResult.bIsEnabled;
             }
-            catch( const uno::Exception & ex )
+            catch( const uno::Exception & )
             {
-                SAL_WARN( "chart2", "Property Exception caught. Message: " << ex);
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         }
         return aResult;
@@ -163,9 +164,9 @@ namespace
                 xSceneProperties->setPropertyValue( "D3DSceneLightOn" + aIndex,
                                                     uno::Any( rLightSource.bIsEnabled ));
             }
-            catch( const uno::Exception & ex )
+            catch( const uno::Exception & )
             {
-                SAL_WARN( "chart2", "Property Exception caught. Message: " << ex);
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         }
     }
@@ -178,9 +179,9 @@ namespace
         {
             xSceneProperties->getPropertyValue("D3DSceneAmbientColor") >>= nResult;
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN( "chart2", "Property Exception caught. Message: " << ex);
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
         return Color( nResult );
     }
@@ -194,9 +195,9 @@ namespace
             xSceneProperties->setPropertyValue("D3DSceneAmbientColor",
                                                uno::makeAny( rColor ));
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN( "chart2", "Property Exception caught. Message: " << ex);
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 }
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index ba21b3018581..7005fa80b8cb 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -31,6 +31,7 @@
 #include <svtools/miscopt.hxx>
 
 #include <vcl/layout.hxx>
+#include <tools/diagnose_ex.h>
 
 namespace chart
 {
@@ -827,9 +828,9 @@ void ChartTypeTabPage::stateChanged( ChangingResource* /*pResource*/ )
         uno::Reference<beans::XPropertySet> xPropSet(xDiagram, uno::UNO_QUERY_THROW);
         xPropSet->getPropertyValue(CHART_UNONAME_SORT_BY_XVALUES) >>= aParameter.bSortByXValues;
     }
-    catch ( const uno::Exception& ex )
+    catch ( const uno::Exception& )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex);
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     //the controls have to be enabled/disabled accordingly
     fillAllControls( aParameter );
@@ -891,9 +892,9 @@ void ChartTypeTabPage::selectMainType()
             uno::Reference<beans::XPropertySet> xPropSet(xDiagram, uno::UNO_QUERY_THROW);
             xPropSet->getPropertyValue(CHART_UNONAME_SORT_BY_XVALUES) >>= aParameter.bSortByXValues;
         }
-        catch ( const uno::Exception& ex )
+        catch ( const uno::Exception& )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex);
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
 
         fillAllControls( aParameter );
@@ -975,9 +976,9 @@ void ChartTypeTabPage::initializePage()
                 uno::Reference<beans::XPropertySet> xPropSet(xDiagram, uno::UNO_QUERY_THROW);
                 xPropSet->getPropertyValue(CHART_UNONAME_SORT_BY_XVALUES) >>= aParameter.bSortByXValues;
             }
-            catch (const uno::Exception& ex)
+            catch (const uno::Exception&)
             {
-                SAL_WARN("chart2", "Exception caught. " << ex);
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
 
             fillAllControls( aParameter );
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 25b53d9b6ffc..95cb5495d4ad 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 
 #include <rtl/ustrbuf.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <functional>
 #include <algorithm>
@@ -836,10 +837,10 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
                 {
                     xLabeledSeq->setValues( xDataProvider->createDataSequenceByRangeRepresentation( aRange ));
                 }
-                catch( const uno::Exception & ex )
+                catch( const uno::Exception & )
                 {
                     // should work as validation should have happened before
-                    SAL_WARN("chart2", "Exception caught. " << ex );
+                    DBG_UNHANDLED_EXCEPTION("chart2");
                 }
             }
             else if( xLabeledSeq.is())
@@ -897,10 +898,10 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
                                 {
                                     xNewSeq.set( xDataProvider->createDataSequenceByRangeRepresentation( aRange ));
                                 }
-                                catch( const uno::Exception & ex )
+                                catch( const uno::Exception & )
                                 {
                                     // should work as validation should have happened before
-                                    SAL_WARN("chart2", "Exception caught. " << ex );
+                                    DBG_UNHANDLED_EXCEPTION("chart2");
                                 }
                                 if( xNewSeq.is())
                                 {
@@ -928,10 +929,10 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
                             {
                                 xNewSeq.set( xDataProvider->createDataSequenceByRangeRepresentation( aRange ));
                             }
-                            catch( const uno::Exception & ex )
+                            catch( const uno::Exception & )
                             {
                                 // should work as validation should have happened before
-                                SAL_WARN("chart2", "Exception caught. " << ex );
+                                DBG_UNHANDLED_EXCEPTION("chart2");
                             }
                             if( xNewSeq.is())
                             {
@@ -960,10 +961,10 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
 
                 lcl_UpdateCurrentRange( *m_pLB_ROLE, aSelectedRole, aRange );
             }
-            catch( const uno::Exception & ex )
+            catch( const uno::Exception & )
             {
+                DBG_UNHANDLED_EXCEPTION("chart2");
                 bResult = false;
-                SAL_WARN("chart2", "Exception caught. " << ex );
             }
         }
     }
@@ -983,9 +984,9 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
                 m_rDialogModel.setTimeBasedRange(rInfo.bTimeBased, rInfo.nStart, rInfo.nEnd);
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 062b4b173b3e..39ed990d3141 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -34,6 +34,7 @@
 
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/chart2/XFormattedString.hpp>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
@@ -276,9 +277,9 @@ void CharacterPropertyItemConverter::FillSpecialItem(
                     rOutItemSet.Put( aItem );
                 }
             }
-            catch( const uno::Exception & ex )
+            catch( const uno::Exception & )
             {
-                SAL_WARN("chart2", "Exception caught. " << ex );
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         }
         break;
@@ -535,9 +536,9 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
                     }
                 }
             }
-            catch( const uno::Exception & ex )
+            catch( const uno::Exception & )
             {
-                SAL_WARN("chart2", "Exception caught. " << ex );
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         }
         break;
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index 3c81e03bfa62..1374c4c4f2c7 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/chart2/XInternalDataProvider.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
+#include <tools/diagnose_ex.h>
 
 #include <functional>
 #include <algorithm>
@@ -58,9 +59,9 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar
         xErrorBarProp->getPropertyValue( "PositiveError" ) >>= rOutPosError;
         xErrorBarProp->getPropertyValue( "NegativeError" ) >>= rOutNegError;
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -76,9 +77,9 @@ void lcl_getErrorIndicatorValues(
         xErrorBarProp->getPropertyValue( "ShowPositiveError" ) >>= rOutShowPosError;
         xErrorBarProp->getPropertyValue( "ShowNegativeError" ) >>= rOutShowNegError;
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index df440bdf8ce6..906318a6bdd6 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/chart2/FillBitmap.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
@@ -255,9 +256,9 @@ void GraphicPropertyItemConverter::FillSpecialItem(
                     }
                 }
             }
-            catch( const beans::UnknownPropertyException &ex )
+            catch( const beans::UnknownPropertyException & )
             {
-                SAL_WARN("chart2", "Exception caught. " << ex );
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         break;
 
@@ -502,9 +503,9 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
                     }
                 }
             }
-            catch( const beans::UnknownPropertyException &ex )
+            catch( const beans::UnknownPropertyException & )
             {
-                SAL_WARN("chart2", "Exception caught. " << ex );
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         break;
 
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 72de9427016f..cf1a57b37a19 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -25,6 +25,7 @@
 #include <svl/itemiter.hxx>
 #include <svl/whiter.hxx>
 #include <svx/svxids.hrc>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
@@ -119,9 +120,9 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
                         delete pItem;
                         SAL_WARN( "chart2", ex << " - unknown Property: " << aProperty.first);
                     }
-                    catch( const uno::Exception &ex )
+                    catch( const uno::Exception & )
                     {
-                        SAL_WARN("chart2", "Exception caught. " << ex );
+                        DBG_UNHANDLED_EXCEPTION("chart2");
                     }
                 }
             }
@@ -131,9 +132,9 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
                 {
                     FillSpecialItem( nWhich, rOutItemSet );
                 }
-                catch( const uno::Exception &ex )
+                catch( const uno::Exception & )
                 {
-                    SAL_WARN("chart2", "Exception caught. " << ex );
+                    DBG_UNHANDLED_EXCEPTION("chart2");
                 }
             }
         }
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 80e42df5c7fb..0c6bbca33d59 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -28,6 +28,7 @@
 
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <functional>
 #include <algorithm>
@@ -150,9 +151,9 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
                         bChanged = true;
                     }
                 }
-                catch( const uno::Exception & ex )
+                catch( const uno::Exception & )
                 {
-                    SAL_WARN("chart2", "Exception caught. " << ex );
+                    DBG_UNHANDLED_EXCEPTION("chart2");
                 }
             }
         }
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 1d9324e6bcb9..4c7c9071e251 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -36,6 +36,7 @@
 #include <svl/intitem.hxx>
 #include <svl/ilstitem.hxx>
 #include <rtl/math.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <functional>
 #include <algorithm>
@@ -155,9 +156,9 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter(
             }
         }
     }
-    catch( const uno::Exception &ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 0a1c5d678510..f74bf202a370 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/chart2/XInternalDataProvider.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
+#include <tools/diagnose_ex.h>
 
 #include <functional>
 #include <algorithm>
@@ -59,9 +60,9 @@ uno::Reference< beans::XPropertySet > lcl_GetErrorBar(
         {
         ( xProp->getPropertyValue( bYError ? OUString(CHART_UNONAME_ERRORBAR_Y) : OUString(CHART_UNONAME_ERRORBAR_X) ) >>= xResult );
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
 
     return xResult;
@@ -83,9 +84,9 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar
         xErrorBarProp->getPropertyValue( "PositiveError" ) >>= rOutPosError;
         xErrorBarProp->getPropertyValue( "NegativeError" ) >>= rOutNegError;
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -101,9 +102,9 @@ void lcl_getErrorIndicatorValues(
         xErrorBarProp->getPropertyValue( "ShowPositiveError" ) >>= rOutShowPosError;
         xErrorBarProp->getPropertyValue( "ShowNegativeError" ) >>= rOutShowNegError;
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 02c444d8f041..a57ddc676396 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -213,9 +213,9 @@ void ChartController::TheModel::tryTermination()
             return;
         }
     }
-    catch(const uno::Exception& ex)
+    catch(const uno::Exception&)
     {
-        SAL_WARN( "chart2", "Termination of model failed: " << ex );
+        DBG_UNHANDLED_EXCEPTION( "chart2", "Termination of model failed" );
     }
 }
 
@@ -487,9 +487,9 @@ void SAL_CALL ChartController::attachFrame(
                         m_xLayoutManagerEventBroadcaster->addLayoutManagerEventListener( this );
                 }
             }
-            catch( const uno::Exception & ex )
+            catch( const uno::Exception & )
             {
-                SAL_WARN("chart2", "Exception caught. " << ex );
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         }
     }
@@ -842,9 +842,9 @@ void SAL_CALL ChartController::dispose()
                 if( xMBroadcaster.is())
                     xMBroadcaster->removeModifyListener( this );
             }
-            catch( const uno::Exception & ex )
+            catch( const uno::Exception & )
             {
-                SAL_WARN("chart2", "Exception caught. " << ex );
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
 #endif
             aModelRef->tryTermination();
@@ -856,10 +856,10 @@ void SAL_CALL ChartController::dispose()
         SolarMutexGuard g;
         m_aDispatchContainer.DisposeAndClear();
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
+        DBG_UNHANDLED_EXCEPTION("chart2");
         assert(!m_xChartView.is());
-        SAL_WARN("chart2", "Exception caught. " << ex );
     }
  }
 
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 00abbf63ad5e..3c361e923333 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -71,6 +71,7 @@
 #include <svx/unopage.hxx>
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#include <tools/diagnose_ex.h>
 
 #include <memory>
 
@@ -226,9 +227,9 @@ void ChartController::executeDispatch_NewArrangement()
             aUndoGuard.commit();
         }
     }
-    catch( const uno::RuntimeException & ex )
+    catch( const uno::RuntimeException & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -480,9 +481,9 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons
                     impl_switchDiagramPositioningToExcludingPositioning();
                 }
             }
-            catch ( const uno::Exception& ex )
+            catch ( const uno::Exception& )
             {
-                SAL_WARN("chart2", "Exception caught. " << ex );
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         }
     }
@@ -846,9 +847,9 @@ void ChartController::executeDispatch_ToggleLegend()
                 bChanged = true;
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
     else
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 83dfc4a1a0c0..f3cd46bb5ee1 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -76,6 +76,7 @@
 #include <vcl/weld.hxx>
 #include <rtl/math.hxx>
 #include <svtools/acceleratorexecute.hxx>
+#include <tools/diagnose_ex.h>
 
 #define DRGPIX    2     // Drag MinMove in Pixel
 
@@ -480,9 +481,9 @@ void ChartController::execute_Paint(vcl::RenderContext& rRenderContext, const to
                 pDrawViewWrapper->CompleteRedraw(&rRenderContext, vcl::Region(rRect));
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     catch( ... )
     {
@@ -859,9 +860,9 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
                         }
                     }
                 }
-                catch( const uno::Exception & ex )
+                catch( const uno::Exception & )
                 {
-                    SAL_WARN("chart2", "Exception caught. " << ex );
+                    DBG_UNHANDLED_EXCEPTION("chart2");
                 }
                 //all wanted model changes will take effect
                 //and all unwanted view modifications are cleaned
@@ -1088,9 +1089,9 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
                                 }
                             }
                         }
-                        catch( const uno::Exception & ex )
+                        catch( const uno::Exception & )
                         {
-                            SAL_WARN("chart2", "Exception caught. " << ex );
+                            DBG_UNHANDLED_EXCEPTION("chart2");
                         }
                     }
 
@@ -1823,9 +1824,9 @@ bool ChartController::impl_DragDataPoint( const OUString & rCID, double fAdditio
                 bResult = true;
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index cc15fc5a035e..e14a064fcbdd 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/frame/XLoadable.hpp>
+#include <tools/diagnose_ex.h>
 
 namespace chart
 {
@@ -173,9 +174,9 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyVa
                 }
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
 
     return true;
diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx
index 3dca6c7cab22..34e3d3e1ba1c 100644
--- a/chart2/source/controller/main/CommandDispatch.cxx
+++ b/chart2/source/controller/main/CommandDispatch.cxx
@@ -20,6 +20,7 @@
 #include "CommandDispatch.hxx"
 #include <CommonFunctors.hxx>
 #include <com/sun/star/util/URLTransformer.hpp>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 #include <functional>
@@ -158,9 +159,9 @@ void CommandDispatch::fireStatusEventForURL(
                         if( xListener.is())
                             xListener->statusChanged( aEventToSend );
                     }
-                    catch( const uno::Exception & ex )
+                    catch( const uno::Exception & )
                     {
-                        SAL_WARN("chart2", "Exception caught. " << ex );
+                        DBG_UNHANDLED_EXCEPTION("chart2");
                     }
                 }
             }
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 735afbc82778..e9fbde74357a 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -26,6 +26,7 @@
 #include <svx/svdpagv.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <tools/diagnose_ex.h>
 
 namespace chart
 {
@@ -118,9 +119,9 @@ bool DragMethod_PieSegment::EndSdrDrag(bool /*bCopy*/)
                 xPointProperties->setPropertyValue( "Offset", uno::Any( m_fAdditionalOffset+m_fInitialOffset ));
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     return true;
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 062792b81aba..213d9d91df77 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/KeyModifier.hpp>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
@@ -497,9 +498,9 @@ void ImplObjectHierarchy::createDataSeriesTree(
             }
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -526,9 +527,9 @@ void ImplObjectHierarchy::createAdditionalShapesTree( ObjectHierarchy::tChildCon
             }
         }
     }
-    catch ( const uno::Exception& ex )
+    catch ( const uno::Exception& )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 0fbb314ace5e..1ffe80d2786b 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -39,6 +39,7 @@
 #include <editeng/spltitem.hxx>
 #include <svx/svxdlg.hxx>
 #include <editeng/widwitem.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <memory>
 
@@ -614,9 +615,9 @@ SdrObject* ShapeController::getFirstAdditionalShape()
             }
         }
     }
-    catch ( const uno::Exception& ex )
+    catch ( const uno::Exception& )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     return pFirstObj;
@@ -654,9 +655,9 @@ SdrObject* ShapeController::getLastAdditionalShape()
             }
         }
     }
-    catch ( const uno::Exception& ex )
+    catch ( const uno::Exception& )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     return pLastObj;
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index b18207ac277c..b45b0fb23b5d 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -47,6 +47,7 @@
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 #include <com/sun/star/document/GraphicObjectResolver.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
@@ -117,9 +118,9 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage(
             xProp->setPropertyValue( "MediaType", uno::Any( _sMediaType ));
         }
     }
-    catch (const uno::Exception& ex)
+    catch (const uno::Exception&)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     return xStorage;
 }
@@ -170,9 +171,9 @@ uno::Reference< embed::XStorage > lcl_getReadStorage(
 
         OSL_ENSURE( xStorage.is(), "No Storage" );
     }
-    catch (const uno::Exception& ex)
+    catch (const uno::Exception&)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     return xStorage;
@@ -390,9 +391,9 @@ ErrCode XMLFilter::impl_Import(
                 xStorage, xSaxParser, xFactory, xGraphicObjectResolver, xImportInfo );
         }
     }
-    catch (const uno::Exception& ex)
+    catch (const uno::Exception&)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
 
         // something went awry
         nWarning = ERRCODE_SFX_GENERAL;
@@ -500,9 +501,9 @@ ErrCode XMLFilter::impl_ImportStream(
         catch (const io::IOException&)
         {
         }
-        catch (const uno::Exception& rEx)
+        catch (const uno::Exception&)
         {
-            SAL_WARN("chart2", "Exception caught. " << rEx);
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 
@@ -644,9 +645,9 @@ ErrCode XMLFilter::impl_Export(
         if ( xTransact.is() )
             xTransact->commit();
     }
-    catch (const uno::Exception& ex)
+    catch (const uno::Exception&)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
 
         // something went awry
         nWarning = ERRCODE_SFX_GENERAL;
@@ -687,9 +688,9 @@ ErrCode XMLFilter::impl_ExportStream(
             xStreamProp->setPropertyValue( "Compressed", uno::Any( true ) );//@todo?
             xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption", uno::Any( true ) );
         }
-        catch (const uno::Exception& rEx)
+        catch (const uno::Exception&)
         {
-            SAL_WARN("chart2", "Exception caught. " << rEx );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
 
         xActiveDataSource->setOutputStream(xOutputStream);
@@ -717,9 +718,9 @@ ErrCode XMLFilter::impl_ExportStream(
 
         xFilter->filter(m_aMediaDescriptor);
     }
-    catch (const uno::Exception& rEx)
+    catch (const uno::Exception&)
     {
-        SAL_WARN("chart2", "Exception caught. " << rEx );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     return ERRCODE_NONE;
 }
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 49340ee8d9b8..af7e8338699c 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -42,6 +42,7 @@
 #include <rtl/uuid.h>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <vector>
 #include <algorithm>
@@ -380,9 +381,9 @@ Axis::~Axis()
             m_aScaleData.Categories.set(nullptr);
         }
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     m_aSubGridProperties.realloc(0);
@@ -530,9 +531,9 @@ void SAL_CALL Axis::addModifyListener( const Reference< util::XModifyListener >&
         Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->addModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception &)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -543,9 +544,9 @@ void SAL_CALL Axis::removeModifyListener( const Reference< util::XModifyListener
         Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->removeModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 0079926c4f04..04782bde3757 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -26,6 +26,7 @@
 #include <AxisHelper.hxx>
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 #include <iterator>
@@ -179,9 +180,9 @@ BaseCoordinateSystem::~BaseCoordinateSystem()
             ModifyListenerHelper::removeListenerFromAllElements( i, m_xModifyEventForwarder );
         ModifyListenerHelper::removeListenerFromAllElements( m_aChartTypes, m_xModifyEventForwarder );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2" );
     }
 }
 
@@ -292,9 +293,9 @@ void SAL_CALL BaseCoordinateSystem::addModifyListener( const Reference< util::XM
         Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->addModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2" );
     }
 }
 
@@ -305,9 +306,9 @@ void SAL_CALL BaseCoordinateSystem::removeModifyListener( const Reference< util:
         Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->removeModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2" );
     }
 }
 
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 2c989c474230..d0ceb73b88e7 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -67,6 +67,7 @@
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 
 #include <svl/zforlist.hxx>
+#include <tools/diagnose_ex.h>
 
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
@@ -871,9 +872,9 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >&
         {
             throw;
         }
-        catch (const uno::Exception& ex)
+        catch (const uno::Exception&)
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
         unlockControllers();
     }
@@ -980,9 +981,9 @@ uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType )
             if( m_xOldModelAgg.is())
                 aResult = m_xOldModelAgg->queryAggregation( aType );
         }
-        catch (const uno::Exception& ex)
+        catch (const uno::Exception&)
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 
@@ -1059,9 +1060,9 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio
 
         aResult.Data <<= aMetafile;
     }
-    catch (const uno::Exception& ex)
+    catch (const uno::Exception&)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     return aResult;
@@ -1093,9 +1094,9 @@ uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& a
             aResult = xTransferable->getTransferData( aFlavor );
         }
     }
-    catch (const uno::Exception& ex)
+    catch (const uno::Exception&)
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     return aResult;
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 946569312380..6c8312832bff 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -56,6 +56,7 @@
 #include <comphelper/sequence.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 
@@ -131,13 +132,13 @@ Reference< embed::XStorage > lcl_createStorage(
             xStorageFact->createInstanceWithArguments( aStorageArgs ), uno::UNO_QUERY_THROW );
         OSL_ENSURE( xStorage.is(), "No Storage" );
     }
-    catch(const css::ucb::ContentCreationException& rEx)
+    catch(const css::ucb::ContentCreationException&)
     {
-        SAL_WARN("chart2", "Exception caught. " << rEx );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
-    catch(const css::ucb::CommandFailedException& rEx)
+    catch(const css::ucb::CommandFailedException&)
     {
-        SAL_WARN("chart2", "Exception caught. " << rEx );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     return xStorage;
@@ -184,9 +185,9 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
                 }
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
         OSL_ENSURE( xFilter.is(), "Filter not found via factory" );
     }
@@ -315,9 +316,9 @@ void SAL_CALL ChartModel::storeToURL(
                 }
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
     else
@@ -345,9 +346,9 @@ void ChartModel::impl_store(
             xExporter->setSourceDocument( Reference< lang::XComponent >( this ));
             xFilter->filter( aMD );
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
     else
@@ -458,16 +459,16 @@ void ChartModel::insertDefaultChart()
 
                 }
             }
-            catch( const uno::Exception & ex )
+            catch( const uno::Exception & )
             {
-                SAL_WARN("chart2", "Exception caught. " << ex );
+                DBG_UNHANDLED_EXCEPTION("chart2");
             }
         }
         ChartModelHelper::setIncludeHiddenCells( false, *this );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
     setModified( false );
     unlockControllers();
@@ -533,9 +534,9 @@ void SAL_CALL ChartModel::load(
         if( aMDHelper.ISSET_URL )
             aURL = aMDHelper.URL;
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     if( xStorage.is())
@@ -728,9 +729,9 @@ void SAL_CALL ChartModel::modified( const lang::EventObject& rEvenObject)
             css::uno::Reference<css::chart2::XChartTypeTemplate> xChartTypeTemplate(aTemplateAndService.first);
             xChartTypeTemplate->changeDiagramData(xDiagram, xDataSource, aArguments);
         }
-        catch (const uno::Exception & ex)
+        catch (const uno::Exception &)
         {
-            SAL_WARN("chart2", "Exception caught. " << ex);
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
         unlockControllers();
     }
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index 3887451b9bcc..b85f3f5ab2e0 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 
@@ -141,9 +142,9 @@ DataPoint::~DataPoint()
             && xPropertySet.is())
             ModifyListenerHelper::removeListener( xPropertySet, m_xModifyEventForwarder );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -226,9 +227,9 @@ void SAL_CALL DataPoint::addModifyListener( const uno::Reference< util::XModifyL
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->addModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -239,9 +240,9 @@ void SAL_CALL DataPoint::removeModifyListener( const uno::Reference< util::XModi
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->removeModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 4a429e4a8be5..f24b3c1e0ae8 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <cppuhelper/supportsservice.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 
@@ -211,9 +212,9 @@ DataSeries::~DataSeries()
             && xPropertySet.is())
             ModifyListenerHelper::removeListener( xPropertySet, m_xModifyEventForwarder );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -481,9 +482,9 @@ void SAL_CALL DataSeries::addModifyListener( const Reference< util::XModifyListe
         Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->addModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -494,9 +495,9 @@ void SAL_CALL DataSeries::removeModifyListener( const Reference< util::XModifyLi
         Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->removeModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 6dd8b747de32..db848302a875 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -40,6 +40,7 @@
 
 #include <com/sun/star/drawing/HomogenMatrix.hpp>
 #include <cppuhelper/supportsservice.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 #include <iterator>
@@ -327,9 +328,9 @@ Diagram::~Diagram()
         ModifyListenerHelper::removeListener( m_xTitle, m_xModifyEventForwarder );
         ModifyListenerHelper::removeListener( m_xLegend, m_xModifyEventForwarder );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -553,9 +554,9 @@ void SAL_CALL Diagram::addModifyListener( const Reference< util::XModifyListener
         Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->addModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -566,9 +567,9 @@ void SAL_CALL Diagram::removeModifyListener( const Reference< util::XModifyListe
         Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->removeModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index 8d1eff75349b..ec3e73d6ff92 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -23,6 +23,7 @@
 #include <PropertyHelper.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <cppuhelper/supportsservice.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
@@ -180,9 +181,9 @@ void SAL_CALL FormattedString::addModifyListener( const uno::Reference< util::XM
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->addModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -193,9 +194,9 @@ void SAL_CALL FormattedString::removeModifyListener( const uno::Reference< util:
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->removeModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index 479d261367f3..2d09454f069c 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
@@ -174,9 +175,9 @@ void SAL_CALL GridProperties::addModifyListener( const Reference< util::XModifyL
         Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->addModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -187,9 +188,9 @@ void SAL_CALL GridProperties::removeModifyListener( const Reference< util::XModi
         Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->removeModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 4694e3b744c8..b989809050ae 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/chart2/RelativePosition.hpp>
 #include <com/sun/star/chart2/RelativeSize.hpp>
 #include <cppuhelper/supportsservice.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 
@@ -206,9 +207,9 @@ void SAL_CALL Legend::addModifyListener( const Reference< util::XModifyListener
         Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->addModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -219,9 +220,9 @@ void SAL_CALL Legend::removeModifyListener( const Reference< util::XModifyListen
         Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->removeModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 0a88bc4af34d..f89831f91d7d 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -27,6 +27,7 @@
 #include <rtl/uuid.h>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <vector>
 #include <algorithm>
@@ -159,9 +160,9 @@ void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XMo
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->addModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -172,9 +173,9 @@ void SAL_CALL PageBackground::removeModifyListener( const uno::Reference< util::
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->removeModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index 2668f6ec0c85..a9b2ff2cc8a2 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 
@@ -170,9 +171,9 @@ void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyLi
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->addModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -183,9 +184,9 @@ void SAL_CALL StockBar::removeModifyListener( const uno::Reference< util::XModif
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->removeModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 058087529d31..1611e5d31ca5 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -33,6 +33,7 @@
 #include <rtl/uuid.h>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <vector>
 #include <algorithm>
@@ -308,9 +309,9 @@ void SAL_CALL Title::addModifyListener( const uno::Reference< util::XModifyListe
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->addModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -321,9 +322,9 @@ void SAL_CALL Title::removeModifyListener( const uno::Reference< util::XModifyLi
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->removeModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index 719425231e49..f5c4c0a1f317 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/drawing/LineJoint.hpp>
 #include <rtl/uuid.h>
 #include <cppuhelper/queryinterface.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <vector>
 #include <algorithm>
@@ -163,9 +164,9 @@ void SAL_CALL Wall::addModifyListener( const uno::Reference< util::XModifyListen
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->addModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -176,9 +177,9 @@ void SAL_CALL Wall::removeModifyListener( const uno::Reference< util::XModifyLis
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->removeModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index 131202e082fb..e615403fca0e 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -24,6 +24,7 @@
 #include <PropertyHelper.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 
@@ -156,9 +157,9 @@ sal_Int32 AreaChartTypeTemplate::getDimension() const
         const_cast< AreaChartTypeTemplate * >( this )->
             getFastPropertyValue( PROP_AREA_TEMPLATE_DIMENSION ) >>= nDim;
     }
-    catch( const beans::UnknownPropertyException & ex )
+    catch( const beans::UnknownPropertyException & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     return nDim;
@@ -210,9 +211,9 @@ Reference< chart2::XChartType > AreaChartTypeTemplate::getChartTypeForIndex( sal
         xResult.set( xFact->createInstance(
                          CHART2_SERVICE_NAME_CHARTTYPE_AREA ), uno::UNO_QUERY_THROW );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     return xResult;
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 226bb6b509b5..cf875e8a9a46 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/chart2/DataPointGeometry3D.hpp>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 
@@ -203,9 +204,9 @@ Reference< chart2::XChartType > BarChartTypeTemplate::getChartTypeForIndex( sal_
         xResult.set( xFact->createInstance(
                          CHART2_SERVICE_NAME_CHARTTYPE_COLUMN ), uno::UNO_QUERY_THROW );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     return xResult;
@@ -257,9 +258,9 @@ void SAL_CALL BarChartTypeTemplate::applyStyle(
             getFastPropertyValue( aAGeometry3D, PROP_BAR_TEMPLATE_GEOMETRY3D );
             DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Geometry3D", aAGeometry3D );
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 }
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index 07eb859e104b..e117e5b7c55b 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <PropertyHelper.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 
@@ -166,9 +167,9 @@ Reference< chart2::XChartType > BubbleChartTypeTemplate::getChartTypeForIndex( s
         xResult.set( xFact->createInstance(
                          CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE ), uno::UNO_QUERY_THROW );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     return xResult;
@@ -188,9 +189,9 @@ Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeFo
 
         ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 
     return xResult;
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx
index b509f7fc5126..f20bb39fecb3 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
@@ -109,9 +110,9 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
                 bNextIsYValues = (nDataSeqCount-(nDataIdx+1)) >= 2;//two or more left
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 
@@ -256,9 +257,9 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries(
                 xSink->setData( aNewSequences );
             }
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 
@@ -278,9 +279,9 @@ sal_Bool SAL_CALL BubbleDataInterpreter::isDataCompatible(
             if( aSeq.getLength() != 3 )
                 return false;
         }
-        catch( const uno::Exception & ex )
+        catch( const uno::Exception & )
         {
-            SAL_WARN("chart2", "Exception caught. " << ex );
+            DBG_UNHANDLED_EXCEPTION("chart2");
         }
     }
 
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 4c1e4783d68f..653bd35129df 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -23,6 +23,7 @@
 #include <servicenames_charttypes.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <cppuhelper/supportsservice.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
@@ -190,9 +191,9 @@ CandleStickChartType::~CandleStickChartType()
             && xPropertySet.is())
             ModifyListenerHelper::removeListener( xPropertySet, m_xModifyEventForwarder );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 26f3b700af71..e398fcad65b5 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -27,6 +27,7 @@
 #include <vcl/svapp.hxx>
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
@@ -249,9 +250,9 @@ void SAL_CALL ChartType::addModifyListener( const uno::Reference< util::XModifyL
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->addModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
@@ -262,9 +263,9 @@ void SAL_CALL ChartType::removeModifyListener( const uno::Reference< util::XModi
         uno::Reference< util::XModifyBroadcaster > xBroadcaster( m_xModifyEventForwarder, uno::UNO_QUERY_THROW );
         xBroadcaster->removeModifyListener( aListener );
     }
-    catch( const uno::Exception & ex )
+    catch( const uno::Exception & )
     {
-        SAL_WARN("chart2", "Exception caught. " << ex );
+        DBG_UNHANDLED_EXCEPTION("chart2");
     }
 }
 
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index 4d174d968130..bb9656f76692 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/chart/ChartSolidType.hpp>
 #include <com/sun/star/chart2/CurveStyle.hpp>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 #include <iterator>
@@ -246,14 +247,14 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance(
                 aServiceSpecifier, m_xContext );
         }

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list