summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-04-05 16:20:13 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-04-09 08:46:34 +0200
commit48fbfe38f60de731ff8bec0372179bedd6670af4 (patch)
tree2a1bbc4a2207d049d38c058d7f4ebb06a4f01182 /chart2
parent115a8539038ecdd5e496fb6c84101c5b14d11068 (diff)
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@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/accessibility/AccessibleBase.cxx5
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartElement.cxx5
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.cxx5
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx57
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx17
-rw-r--r--chart2/source/controller/chartapiwrapper/GridWrapper.cxx5
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx5
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx5
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx5
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx5
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx5
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx5
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.cxx9
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.cxx13
-rw-r--r--chart2/source/controller/dialogs/DialogModel.cxx37
-rw-r--r--chart2/source/controller/dialogs/ObjectNameProvider.cxx9
-rw-r--r--chart2/source/controller/dialogs/RangeSelectionHelper.cxx13
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx5
-rw-r--r--chart2/source/controller/dialogs/dlg_ObjectProperties.cxx5
-rw-r--r--chart2/source/controller/dialogs/res_LegendPosition.cxx9
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx9
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx5
-rw-r--r--chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx17
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx13
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx21
-rw-r--r--chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx9
-rw-r--r--chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx9
-rw-r--r--chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx9
-rw-r--r--chart2/source/controller/itemsetwrapper/ItemConverter.cxx9
-rw-r--r--chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx5
-rw-r--r--chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx5
-rw-r--r--chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx13
-rw-r--r--chart2/source/controller/main/ChartController.cxx16
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx13
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx17
-rw-r--r--chart2/source/controller/main/ChartFrameloader.cxx5
-rw-r--r--chart2/source/controller/main/CommandDispatch.cxx5
-rw-r--r--chart2/source/controller/main/DragMethod_PieSegment.cxx5
-rw-r--r--chart2/source/controller/main/ObjectHierarchy.cxx9
-rw-r--r--chart2/source/controller/main/ShapeController.cxx9
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx29
-rw-r--r--chart2/source/model/main/Axis.cxx13
-rw-r--r--chart2/source/model/main/BaseCoordinateSystem.cxx13
-rw-r--r--chart2/source/model/main/ChartModel.cxx17
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx37
-rw-r--r--chart2/source/model/main/DataPoint.cxx13
-rw-r--r--chart2/source/model/main/DataSeries.cxx13
-rw-r--r--chart2/source/model/main/Diagram.cxx13
-rw-r--r--chart2/source/model/main/FormattedString.cxx9
-rw-r--r--chart2/source/model/main/GridProperties.cxx9
-rw-r--r--chart2/source/model/main/Legend.cxx9
-rw-r--r--chart2/source/model/main/PageBackground.cxx9
-rw-r--r--chart2/source/model/main/StockBar.cxx9
-rw-r--r--chart2/source/model/main/Title.cxx9
-rw-r--r--chart2/source/model/main/Wall.cxx9
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.cxx9
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.cxx9
-rw-r--r--chart2/source/model/template/BubbleChartTypeTemplate.cxx9
-rw-r--r--chart2/source/model/template/BubbleDataInterpreter.cxx13
-rw-r--r--chart2/source/model/template/CandleStickChartType.cxx5
-rw-r--r--chart2/source/model/template/ChartType.cxx9
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx5
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.cxx33
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.cxx13
-rw-r--r--chart2/source/model/template/DataInterpreter.cxx25
-rw-r--r--chart2/source/model/template/GL3DBarChartTypeTemplate.cxx9
-rw-r--r--chart2/source/model/template/LineChartTypeTemplate.cxx21
-rw-r--r--chart2/source/model/template/NetChartTypeTemplate.cxx13
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.cxx33
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.cxx21
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.cxx17
-rw-r--r--chart2/source/model/template/StockDataInterpreter.cxx9
-rw-r--r--chart2/source/model/template/XYDataInterpreter.cxx13
-rw-r--r--chart2/source/tools/AxisHelper.cxx17
-rw-r--r--chart2/source/tools/CachedDataSequence.cxx9
-rw-r--r--chart2/source/tools/ChartModelHelper.cxx5
-rw-r--r--chart2/source/tools/ChartTypeHelper.cxx5
-rw-r--r--chart2/source/tools/ChartViewHelper.cxx5
-rw-r--r--chart2/source/tools/DataSeriesHelper.cxx17
-rw-r--r--chart2/source/tools/DataSourceHelper.cxx13
-rw-r--r--chart2/source/tools/DiagramHelper.cxx65
-rw-r--r--chart2/source/tools/ErrorBar.cxx9
-rw-r--r--chart2/source/tools/ExplicitCategoriesProvider.cxx5
-rw-r--r--chart2/source/tools/FormattedStringHelper.cxx5
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx5
-rw-r--r--chart2/source/tools/LabeledDataSequence.cxx9
-rw-r--r--chart2/source/tools/LegendHelper.cxx5
-rw-r--r--chart2/source/tools/LifeTime.cxx5
-rw-r--r--chart2/source/tools/LinePropertiesHelper.cxx17
-rw-r--r--chart2/source/tools/ModifyListenerHelper.cxx9
-rw-r--r--chart2/source/tools/ObjectIdentifier.cxx13
-rw-r--r--chart2/source/tools/PropertyHelper.cxx9
-rw-r--r--chart2/source/tools/RangeHighlighter.cxx9
-rw-r--r--chart2/source/tools/ReferenceSizeProvider.cxx17
-rw-r--r--chart2/source/tools/RegressionCurveHelper.cxx41
-rw-r--r--chart2/source/tools/RegressionCurveModel.cxx9
-rw-r--r--chart2/source/tools/RegressionEquation.cxx9
-rw-r--r--chart2/source/tools/RelativeSizeHelper.cxx5
-rw-r--r--chart2/source/tools/StatisticsHelper.cxx5
-rw-r--r--chart2/source/tools/ThreeDHelper.cxx29
-rw-r--r--chart2/source/tools/TitleHelper.cxx9
-rw-r--r--chart2/source/tools/UncachedDataSequence.cxx9
-rw-r--r--chart2/source/tools/WrappedDefaultProperty.cxx5
-rw-r--r--chart2/source/tools/WrappedProperty.cxx5
-rw-r--r--chart2/source/tools/WrappedPropertySet.cxx13
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx5
-rw-r--r--chart2/source/view/diagram/VDiagram.cxx5
-rw-r--r--chart2/source/view/main/ChartView.cxx21
-rw-r--r--chart2/source/view/main/ShapeFactory.cxx5
-rw-r--r--chart2/source/view/main/VLegend.cxx26
-rw-r--r--chart2/source/view/main/VLegendSymbolFactory.cxx5
111 files changed, 736 insertions, 627 deletions
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 );
}
// catch( registry::InvalidValueException & ex )
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
// couldn't create service via factory
// As XMultiServiceFactory does not specify, what to do in case
// createInstance is called with an unknown service-name, this
// function will just return an empty XInterface.
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
SAL_WARN("chart2", "Couldn't instantiate service: "<< aServiceSpecifier );
xResult.set( nullptr );
}
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index aacb8971c967..de1275c71f46 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -36,6 +36,7 @@
#include <com/sun/star/chart2/AxisType.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
+#include <tools/diagnose_ex.h>
#include <algorithm>
#include <iterator>
@@ -167,9 +168,9 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource
Sequence< Reference< XChartType > > aOldChartTypesSeq;
FillDiagram( xDia, aData.Series, aData.Categories, aOldChartTypesSeq );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return xDia;
@@ -248,9 +249,9 @@ void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >
FillDiagram( xDiagram, aSeriesSeq, aData.Categories, aOldChartTypesSeq );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -299,9 +300,9 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData(
xDSCnt->setDataSeries( aSeriesSeq[i] );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -358,9 +359,9 @@ sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return bResult;
@@ -408,9 +409,9 @@ void SAL_CALL ChartTypeTemplate::applyStyle(
lcl_ensureCorrectLabelPlacement( xSeries->getDataPointByIndex(aAttributedDataPointIndexList[nN]), aAvailablePlacements );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
@@ -665,9 +666,9 @@ void ChartTypeTemplate::adaptScales(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
@@ -779,9 +780,9 @@ void ChartTypeTemplate::FillDiagram(
createChartTypes( aSeriesSeq, aCoordinateSystems, aOldChartTypesSeq );
applyStyles( xDiagram );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -849,9 +850,9 @@ void ChartTypeTemplate::createChartTypes(
}
}
}
- 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/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index afa2d8bcd038..85b1d64a32e7 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
+#include <tools/diagnose_ex.h>
#include <algorithm>
@@ -224,9 +225,9 @@ void ColumnLineChartTypeTemplate::createChartTypes(
xDSCnt->setDataSeries( aLineSeq );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -336,9 +337,9 @@ sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return bResult;
@@ -372,9 +373,9 @@ Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNew
CHART2_SERVICE_NAME_CHARTTYPE_LINE ), uno::UNO_QUERY_THROW );
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/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index 940287572b51..bc81e3821cb0 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
#include <cppuhelper/supportsservice.hxx>
+#include <tools/diagnose_ex.h>
#include <vector>
#include <algorithm>
@@ -95,9 +96,9 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource(
SetRole( aData[i]->getValues(), "values-y");
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -174,9 +175,9 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries(
xSink->setData( aNewSequences );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -197,9 +198,9 @@ sal_Bool SAL_CALL DataInterpreter::isDataCompatible(
if( aSeq.getLength() != 1 )
return false;
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -291,9 +292,9 @@ Reference< data::XDataSource > SAL_CALL DataInterpreter::mergeInterpretedData(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -313,9 +314,9 @@ OUString DataInterpreter::GetRole( const Reference< data::XDataSequence > & xSeq
Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW );
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;
}
@@ -329,9 +330,9 @@ void DataInterpreter::SetRole( const Reference< data::XDataSequence > & xSeq, co
Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW );
xProp->setPropertyValue( "Role", uno::Any( rRole ));
}
- 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/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
index 99eb2860a097..ba7022da71b5 100644
--- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
@@ -17,6 +17,7 @@
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <tools/diagnose_ex.h>
using namespace com::sun::star;
@@ -116,9 +117,9 @@ uno::Reference<chart2::XChartType> GL3DBarChartTypeTemplate::getChartTypeForInde
CHART_UNONAME_ROUNDED_EDGE, getFastPropertyValue(PROP_GL3DCHARTTYPE_ROUNDED_EDGE));
}
}
- catch (const uno::Exception & ex)
+ catch (const uno::Exception &)
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return xResult;
@@ -157,9 +158,9 @@ GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence<uno::Ref
chart->setPropertyValue(CHART_UNONAME_ROUNDED_EDGE, uno::Any(bVal));
xResult = chart.get();
}
- 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/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index f6b76550b9cc..ded77be02c92 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/chart2/Symbol.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <tools/diagnose_ex.h>
#include <algorithm>
@@ -239,9 +240,9 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate(
break;
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -268,9 +269,9 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate(
setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION, xChartTypeProp->getPropertyValue(CHART_UNONAME_CURVE_RESOLUTION) );
setFastPropertyValue_NoBroadcast( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER, xChartTypeProp->getPropertyValue(CHART_UNONAME_SPLINE_ORDER) );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -299,9 +300,9 @@ Reference< chart2::XChartType > LineChartTypeTemplate::getChartTypeForIndex( sal
CHART_UNONAME_SPLINE_ORDER, getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER ));
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return xResult;
@@ -332,9 +333,9 @@ Reference< chart2::XChartType > SAL_CALL LineChartTypeTemplate::getChartTypeForN
CHART_UNONAME_SPLINE_ORDER, getFastPropertyValue( PROP_LINECHARTTYPE_TEMPLATE_SPLINE_ORDER ));
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return xResult;
@@ -356,9 +357,9 @@ void SAL_CALL LineChartTypeTemplate::applyStyle(
DataSeriesHelper::switchLinesOnOrOff( xProp, m_bHasLines );
DataSeriesHelper::makeLinesThickOrThin( xProp, m_nDim==2 );
}
- 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/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx
index b10f0f64299c..2ceb5c20b387 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/chart2/SymbolStyle.hpp>
#include <com/sun/star/chart2/Symbol.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
@@ -72,9 +73,9 @@ void SAL_CALL NetChartTypeTemplate::applyStyle(
DataSeriesHelper::switchLinesOnOrOff( xProp, m_bHasLines );
DataSeriesHelper::makeLinesThickOrThin( xProp, true );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -135,9 +136,9 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate(
break;
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -171,9 +172,9 @@ Reference< chart2::XChartType > NetChartTypeTemplate::getChartTypeForIndex( sal_
xResult.set( xFact->createInstance(
CHART2_SERVICE_NAME_CHARTTYPE_NET ), 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/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 2ce05a6fa941..7082585818d1 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
+#include <tools/diagnose_ex.h>
#include <rtl/math.hxx>
@@ -194,9 +195,9 @@ sal_Int32 PieChartTypeTemplate::getDimension() const
const_cast< PieChartTypeTemplate * >( this )->
getFastPropertyValue( PROP_PIE_TEMPLATE_DIMENSION ) >>= nDim;
}
- catch( const beans::UnknownPropertyException & ex )
+ catch( const beans::UnknownPropertyException & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return nDim;
@@ -247,9 +248,9 @@ void PieChartTypeTemplate::adaptScales(
xAxis->setScaleData( aScaleData );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
@@ -289,9 +290,9 @@ void PieChartTypeTemplate::createChartTypes(
aFlatSeriesSeq, rCoordSys[0], getStackMode( 0 ));
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -359,9 +360,9 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate(
bResult = ( eOffsetMode == ePieOffsetMode );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
bResult = false;
}
}
@@ -399,9 +400,9 @@ Reference< chart2::XChartType > PieChartTypeTemplate::getChartTypeForIndex( sal_
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return xResult;
@@ -427,9 +428,9 @@ Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNe
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return xResult;
@@ -518,9 +519,9 @@ void SAL_CALL PieChartTypeTemplate::applyStyle(
// vary colors by point
xProp->setPropertyValue( "VaryColorsByPoint", uno::Any( true ));
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -555,9 +556,9 @@ void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagr
xAxis->setScaleData( aScaleData );
}
}
- 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/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index d64cbc368e25..05d14cac71e5 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/chart2/Symbol.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <tools/diagnose_ex.h>
#include <algorithm>
@@ -210,9 +211,9 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle(
if( m_nDim==3 )
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -271,9 +272,9 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate(
break;
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -300,9 +301,9 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate(
setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION, xChartTypeProp->getPropertyValue(CHART_UNONAME_CURVE_RESOLUTION) );
setFastPropertyValue_NoBroadcast( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER, xChartTypeProp->getPropertyValue(CHART_UNONAME_SPLINE_ORDER) );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -331,9 +332,9 @@ Reference< chart2::XChartType > ScatterChartTypeTemplate::getChartTypeForIndex(
CHART_UNONAME_SPLINE_ORDER, getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER ));
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return xResult;
@@ -364,9 +365,9 @@ Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeF
CHART_UNONAME_SPLINE_ORDER, getFastPropertyValue( PROP_SCATTERCHARTTYPE_TEMPLATE_SPLINE_ORDER ));
}
}
- 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/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index ae65ce7a0f40..5ebb4ec06214 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -33,6 +33,7 @@
#include <PropertyHelper.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
+#include <tools/diagnose_ex.h>
#include <vector>
#include <algorithm>
@@ -249,9 +250,9 @@ void SAL_CALL StockChartTypeTemplate::applyStyle(
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -383,9 +384,9 @@ void StockChartTypeTemplate::createChartTypes(
Reference< XChartTypeContainer > xCTCnt( rCoordSys[ 0 ], uno::UNO_QUERY_THROW );
xCTCnt->setChartTypes( comphelper::containerToSequence(aChartTypeVec) );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -463,9 +464,9 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return bResult;
@@ -484,9 +485,9 @@ Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSerie
CHART2_SERVICE_NAME_CHARTTYPE_LINE ), uno::UNO_QUERY_THROW );
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/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx
index ea0b1c68f1d4..f766d41aaed9 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -23,6 +23,7 @@
#include <CommonConverters.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
+#include <tools/diagnose_ex.h>
#include <vector>
#include <algorithm>
@@ -243,9 +244,9 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource(
xSink->setData( aSequences[nGroupIndex][nSeriesIdx] );
aResultSeries[nGroupIndex][nSeriesIdx].set( xSeries );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
@@ -301,9 +302,9 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible(
if( aSeq.getLength() != nNumberOfNecessarySequences )
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/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx
index 0e9907138067..e54abe2f285c 100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.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;
@@ -93,9 +94,9 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource(
SetRole( aData[nDataIdx]->getValues(), "values-y");
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -215,9 +216,9 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries(
xSink->setData( aNewSequences );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -238,9 +239,9 @@ sal_Bool SAL_CALL XYDataInterpreter::isDataCompatible(
if( aSeq.getLength() != 2 )
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/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 15d6ae59d9fc..84c008612332 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -44,6 +44,7 @@
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/lang/XServiceName.hpp>
#include <comphelper/sequence.hxx>
+#include <tools/diagnose_ex.h>
#include <map>
@@ -289,9 +290,9 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
if( ! aKeyMap.empty())
@@ -835,9 +836,9 @@ std::vector< Reference< XAxis > > AxisHelper::getAllAxesOfCoordinateSystem(
aAxisVector.push_back( xAxis );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
@@ -1112,9 +1113,9 @@ void AxisHelper::setRTLAxisLayout( const Reference< XCoordinateSystem >& xCooSys
xVerticalMainAxis->setScaleData(aScale);
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2" );
}
try
@@ -1137,9 +1138,9 @@ void AxisHelper::setRTLAxisLayout( const Reference< XCoordinateSystem >& xCooSys
xVerticalSecondaryAxis->setScaleData(aScale);
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 6c3024726585..7861ade125de 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -24,6 +24,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <cppuhelper/supportsservice.hxx>
+#include <tools/diagnose_ex.h>
#include <algorithm>
#include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -324,9 +325,9 @@ void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XMod
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");
}
}
@@ -337,9 +338,9 @@ void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::X
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/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index f37d4d7581c9..7ff25c70df0e 100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -35,6 +35,7 @@
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/XVisualObject.hpp>
#include <com/sun/star/view/XSelectionChangeListener.hpp>
+#include <tools/diagnose_ex.h>
namespace chart
{
@@ -96,9 +97,9 @@ uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference<
if( xChartDoc.is())
return xChartDoc->getFirstDiagram();
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return nullptr;
}
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index a586d04bb7ad..d917d0e30516 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/chart/DataLabelPlacement.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
#include <com/sun/star/chart/MissingValueTreatment.hpp>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
@@ -554,9 +555,9 @@ sal_Int32 ChartTypeHelper::getNumberOfDisplayedSeries(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
return nNumberOfSeries;
diff --git a/chart2/source/tools/ChartViewHelper.cxx b/chart2/source/tools/ChartViewHelper.cxx
index c5a757b2e7ba..0e8332b71750 100644
--- a/chart2/source/tools/ChartViewHelper.cxx
+++ b/chart2/source/tools/ChartViewHelper.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/XModifyListener.hpp>
+#include <tools/diagnose_ex.h>
namespace chart
{
@@ -45,9 +46,9 @@ void ChartViewHelper::setViewToDirtyState( const uno::Reference< frame::XModel >
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
} //namespace chart
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 7a4d4c46a246..59103d56c082 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -37,6 +37,7 @@
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
#include <rtl/ustrbuf.hxx>
+#include <tools/diagnose_ex.h>
#include <algorithm>
#include <iterator>
@@ -408,9 +409,9 @@ void setStackModeAtSeries(
aAxisIndexSet.insert(nAxisIndex);
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -455,9 +456,9 @@ sal_Int32 getAttachedAxisIndex( const Reference< chart2::XDataSeries > & xSeries
xProp->getPropertyValue( "AttachedAxisIndex" ) >>= nRet;
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return nRet;
}
@@ -478,9 +479,9 @@ sal_Int32 getNumberFormatKeyFromAxis(
if( xAxisProp.is())
xAxisProp->getPropertyValue(CHART_UNONAME_NUMFMT) >>= nResult;
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return nResult;
@@ -525,9 +526,9 @@ void deleteSeries(
xSeriesCnt->setDataSeries( comphelper::containerToSequence( aSeries ));
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 4f649239caa0..aa9e7e43b40f 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/chart/ChartDataRowSource.hpp>
#include <com/sun/star/chart/ErrorBarStyle.hpp>
+#include <tools/diagnose_ex.h>
#include <iterator>
@@ -107,9 +108,9 @@ void lcl_addErrorBarRanges(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -371,9 +372,9 @@ bool DataSourceHelper::detectRangeSegmentation(
DiagramHelper::getCategoriesFromDiagram( xChartDocument->getFirstDiagram() ));
rOutHasCategories = xCategories.is();
}
- catch( uno::Exception & ex )
+ catch( uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return bSomethingDetected;
}
@@ -414,9 +415,9 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return (bHasCellRangeRepresentation && bHasDataRowSource && bHasFirstCellAsLabel);
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 0b710adac5b3..801c40e2ce52 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -58,6 +58,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <comphelper/sequence.hxx>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
@@ -100,9 +101,9 @@ DiagramHelper::tTemplateWithServiceName
bTemplateFound = true;
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -181,9 +182,9 @@ void DiagramHelper::setVertical(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -304,9 +305,9 @@ void DiagramHelper::setStackMode(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -425,9 +426,9 @@ StackMode DiagramHelper::getStackModeFromChartType(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return eStackMode;
@@ -457,9 +458,9 @@ sal_Int32 DiagramHelper::getDimension( const Reference< XDiagram > & xDiagram )
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return nResult;
@@ -519,9 +520,9 @@ void DiagramHelper::setDimension(
else if( nNewDimensionCount==2 && eStackMode == StackMode::ZStacked )
DiagramHelper::setStackMode( xDiagram, StackMode::NONE );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -553,9 +554,9 @@ void DiagramHelper::replaceCoordinateSystem(
if( xCategories.is() )
DiagramHelper::setCategoriesToDiagram( xCategories, xDiagram );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
@@ -591,9 +592,9 @@ bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis
xProp->setPropertyValue( "AttachedAxisIndex", uno::Any( nNewAxisIndex ) );
bChanged = true;
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -693,9 +694,9 @@ std::vector< Reference< XDataSeries > >
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return aResult;
@@ -800,9 +801,9 @@ std::vector< Reference< XAxis > > lcl_getAxisHoldingCategoriesFromDiagram(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2" );
}
if( aRet.empty() )
@@ -843,9 +844,9 @@ bool DiagramHelper::isCategoryDiagram(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return false;
@@ -906,18 +907,18 @@ Reference< data::XLabeledDataSequence >
{
xProp->setPropertyValue( "Role", uno::Any( OUString("categories") ) );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- 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");
}
return xResult;
@@ -1032,9 +1033,9 @@ void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, c
{
xKeyProps = xNumberFormats->getByKey( nNumberFormat );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
sal_Int32 nType = util::NumberFormat::UNDEFINED;
if( xKeyProps.is() )
@@ -1225,9 +1226,9 @@ Sequence< Reference< XChartType > >
std::back_inserter( aResult ));
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -1522,9 +1523,9 @@ sal_Int32 DiagramHelper::getGeometry3D(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index d6380b0cb050..d0c58314fa4c 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -36,6 +36,7 @@
#include <rtl/math.hxx>
#include <rtl/ustrbuf.hxx>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
@@ -401,9 +402,9 @@ void SAL_CALL ErrorBar::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");
}
}
@@ -414,9 +415,9 @@ void SAL_CALL ErrorBar::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/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 724f3b2276ba..cab1103655dd 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/chart2/AxisType.hpp>
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <tools/diagnose_ex.h>
namespace chart
{
@@ -120,9 +121,9 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2:
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx
index a1f4829c1e53..e47b706e98fa 100644
--- a/chart2/source/tools/FormattedStringHelper.cxx
+++ b/chart2/source/tools/FormattedStringHelper.cxx
@@ -20,6 +20,7 @@
#include <FormattedStringHelper.hxx>
#include <PropertyHelper.hxx>
#include <com/sun/star/chart2/FormattedString.hpp>
+#include <tools/diagnose_ex.h>
namespace chart
{
@@ -49,9 +50,9 @@ Sequence< Reference< chart2::XFormattedString2 > >
xTextProperties, Reference< beans::XPropertySet >( xFormStr, uno::UNO_QUERY_THROW ) );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return Sequence< Reference< XFormattedString2 > >( & xFormStr, 1 );
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 7338822ff17b..a28314c70b6f 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -42,6 +42,7 @@
#include <unotools/charclass.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/sequenceashashmap.hxx>
+#include <tools/diagnose_ex.h>
#include <vector>
#include <algorithm>
@@ -393,9 +394,9 @@ InternalDataProvider::InternalDataProvider(
ftor( rxScreen );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index d47d26ebdc1a..4e1f0b09b73f 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -20,6 +20,7 @@
#include <LabeledDataSequence.hxx>
#include <ModifyListenerHelper.hxx>
#include <cppuhelper/supportsservice.hxx>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
@@ -122,9 +123,9 @@ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XMo
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");
}
}
@@ -135,9 +136,9 @@ void SAL_CALL LabeledDataSequence::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/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx
index ef09cfae512d..d353d6741b28 100644
--- a/chart2/source/tools/LegendHelper.cxx
+++ b/chart2/source/tools/LegendHelper.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/XLegend.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
@@ -97,9 +98,9 @@ uno::Reference< chart2::XLegend > LegendHelper::getLegend(
OSL_FAIL("need diagram for creation of legend");
}
}
- 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/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index b16da9df71e1..3588bac6331e 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/util/XModifyListener.hpp>
#include <com/sun/star/util/XCloseListener.hpp>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
@@ -344,9 +345,9 @@ void CloseableLifeTimeManager::impl_doClose()
}
}
}
- catch( const uno::Exception& ex )
+ catch( const uno::Exception& )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
if(xCloseable.is())
diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx
index 508f1be13733..b5d7a05f2020 100644
--- a/chart2/source/tools/LinePropertiesHelper.cxx
+++ b/chart2/source/tools/LinePropertiesHelper.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/drawing/LineDash.hpp>
#include <com/sun/star/drawing/LineJoint.hpp>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
@@ -110,9 +111,9 @@ bool LinePropertiesHelper::IsLineVisible( const css::uno::Reference<
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return bRet;
}
@@ -135,9 +136,9 @@ void LinePropertiesHelper::SetLineVisible( const css::uno::Reference<
xLineProperties->setPropertyValue( "LineTransparence", uno::Any( sal_Int16(0) ) );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -154,9 +155,9 @@ void LinePropertiesHelper::SetLineInvisible( const css::uno::Reference<
xLineProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -170,9 +171,9 @@ void LinePropertiesHelper::SetLineColor( const css::uno::Reference<
xLineProperties->setPropertyValue( "LineColor", uno::Any( nColor ) );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 96661ab3886e..7fc6e6208a6c 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -21,6 +21,7 @@
#include <WeakListenerAdapter.hxx>
#include <cppuhelper/interfacecontainer.hxx>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
@@ -113,9 +114,9 @@ void ModifyEventForwarder::AddListener( const Reference< util::XModifyListener >
m_aModifyListeners.addListener( cppu::UnoType<decltype(xListenerToAdd)>::get(), xListenerToAdd );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -136,9 +137,9 @@ void ModifyEventForwarder::RemoveListener( const Reference< util::XModifyListene
m_aModifyListeners.removeListener( cppu::UnoType<decltype(aListener)>::get(), xListenerToRemove );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 54ba3dd910b7..fbfcb6954462 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -38,6 +38,7 @@
#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
#include <rtl/ustrbuf.hxx>
+#include <tools/diagnose_ex.h>
namespace chart
{
@@ -373,9 +374,9 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject(
//datapoint?
//Gridproperties
}
- catch(const uno::Exception& ex)
+ catch(const uno::Exception&)
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
if( eObjectType != OBJECTTYPE_UNKNOWN )
@@ -455,9 +456,9 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject(
//datapoint?
//Gridproperties
}
- catch(const uno::Exception& ex)
+ catch(const uno::Exception&)
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
if( eObjectType != OBJECTTYPE_UNKNOWN )
@@ -1384,9 +1385,9 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
break;
}
}
- catch(const uno::Exception& ex)
+ catch(const uno::Exception&)
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return xObjectProperties;
}
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index 12ff04e21b0d..6cb9061f0202 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
#include <vector>
#include <algorithm>
@@ -48,9 +49,9 @@ struct lcl_EqualsElement
{
return (m_xAccess->getByName( rName ) == m_aValue);
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return false;
}
@@ -161,9 +162,9 @@ OUString lcl_addNamedPropertyUniqueNameToTable(
// element found => return name
return *aIt;
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return rPreferredName;
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index 111d0ee01079..7b47dff7eb93 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/chart/ErrorBarStyle.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <comphelper/sequence.hxx>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
@@ -180,9 +181,9 @@ void RangeHighlighter::determineRanges()
return;
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
@@ -226,9 +227,9 @@ void RangeHighlighter::fillRangesForErrorBars(
(xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle) &&
nStyle == css::chart::ErrorBarStyle::FROM_DATA );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
if( bUsesRangesAsErrorBars )
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 37bbb1c441ae..ada80c8317c4 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/chart2/XTitled.hpp>
#include <com/sun/star/chart2/XTitle.hpp>
#include <com/sun/star/chart2/XDataSeries.hpp>
+#include <tools/diagnose_ex.h>
#include <vector>
@@ -83,9 +84,9 @@ void ReferenceSizeProvider::setValuesAtTitle(
setValuesAtPropertySet( xTitleProp, /* bAdaptFontSizes = */ false );
}
- catch (const uno::Exception& ex)
+ catch (const uno::Exception&)
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -113,9 +114,9 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries()
elem->getDataPointByIndex( aPointIndexes[i] ) );
}
}
- catch (const uno::Exception& ex)
+ catch (const uno::Exception&)
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
//it is important to correct the datapoint properties first as they do reference the series properties
@@ -156,9 +157,9 @@ void ReferenceSizeProvider::setValuesAtPropertySet(
}
}
}
- catch (const uno::Exception& ex)
+ catch (const uno::Exception&)
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -291,9 +292,9 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState
}
}
}
- catch (const uno::Exception& ex)
+ catch (const uno::Exception&)
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 6d397b1449bb..c6235094cd40 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -34,6 +34,7 @@
#include <strings.hrc>
#include <DiagramHelper.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
@@ -197,9 +198,9 @@ void RegressionCurveHelper::initializeCurveCalculator(
}
}
}
- catch( const Exception & ex )
+ catch( const Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -249,9 +250,9 @@ bool RegressionCurveHelper::hasMeanValueLine(
return true;
}
}
- catch( const Exception & ex )
+ catch( const Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return false;
@@ -282,9 +283,9 @@ uno::Reference< chart2::XRegressionCurve >
return aCurves[i];
}
}
- catch( const Exception & ex )
+ catch( const Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -337,9 +338,9 @@ void RegressionCurveHelper::removeMeanValueLine(
}
}
}
- catch( const Exception & ex )
+ catch( const Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -418,9 +419,9 @@ bool RegressionCurveHelper::removeAllExceptMeanValueLine(
bRemovedSomething = true;
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
return bRemovedSomething;
@@ -454,9 +455,9 @@ void RegressionCurveHelper::removeEquations(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
@@ -492,9 +493,9 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getFirstCurveN
}
}
}
- catch( const Exception & ex )
+ catch( const Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return nullptr;
@@ -516,9 +517,9 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getRegressionC
return aCurves[aIndex];
}
}
- catch( const Exception & ex )
+ catch( const Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return nullptr;
@@ -566,9 +567,9 @@ SvxChartRegress RegressionCurveHelper::getRegressionType(
}
}
}
- catch( const Exception & ex )
+ catch( const Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2" );
}
return eResult;
@@ -714,9 +715,9 @@ void RegressionCurveHelper::resetEquationPosition(
if( xEqProp->getPropertyValue( aPosPropertyName ).hasValue())
xEqProp->setPropertyValue( aPosPropertyName, 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/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 8dee11b28e75..2e0b38c15a91 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <rtl/math.hxx>
#include <rtl/ustrbuf.hxx>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
@@ -252,9 +253,9 @@ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< uti
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");
}
}
@@ -265,9 +266,9 @@ void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference<
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/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index 4cdda2b80272..31d75ee73130 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart2/RelativePosition.hpp>
#include <com/sun/star/awt/Size.hpp>
+#include <tools/diagnose_ex.h>
#include <algorithm>
@@ -237,9 +238,9 @@ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util:
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");
}
}
@@ -250,9 +251,9 @@ void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< ut
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/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx
index 1f155cb383df..8a2ae608630d 100644
--- a/chart2/source/tools/RelativeSizeHelper.cxx
+++ b/chart2/source/tools/RelativeSizeHelper.cxx
@@ -18,6 +18,7 @@
*/
#include <RelativeSizeHelper.hxx>
+#include <tools/diagnose_ex.h>
#include <vector>
#include <algorithm>
@@ -75,9 +76,9 @@ void RelativeSizeHelper::adaptFontSizes(
calculate( fFontHeight, rOldReferenceSize, rNewReferenceSize ))));
}
}
- catch( const Exception & ex )
+ catch( const Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 7bffdd7812fd..4adb3865ce7d 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/chart2/data/XNumericalDataSequence.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
#include <com/sun/star/chart/ErrorBarStyle.hpp>
+#include <tools/diagnose_ex.h>
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -150,9 +151,9 @@ void lcl_setXMLRangePropertyAtDataSequence(
if( xInfo.is() && xInfo->hasPropertyByName( aXMLRangePropName ))
xProp->setPropertyValue( aXMLRangePropName, uno::Any( rXMLRange ));
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index 764598c66de3..6fe11c7c684b 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
+#include <tools/diagnose_ex.h>
namespace chart
{
@@ -970,9 +971,9 @@ void ThreeDHelper::switchRightAngledAxes( const Reference< beans::XPropertySet >
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -1025,9 +1026,9 @@ void ThreeDHelper::setRotationAngleToDiagram(
lcl_rotateLights( aNewRotation*aInverseOldRotation, xSceneProperties );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -1102,9 +1103,9 @@ double ThreeDHelper::getCameraDistance(
ensureCameraDistanceRange( fCameraDistance );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return fCameraDistance;
}
@@ -1130,9 +1131,9 @@ void ThreeDHelper::setCameraDistance(
xSceneProperties->setPropertyValue( "D3DCameraGeometry", uno::Any( aCG ));
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -1180,9 +1181,9 @@ ThreeDLookScheme ThreeDHelper::detectScheme( const uno::Reference< XDiagram >& x
if( xDiagramProps.is() )
xDiagramProps->getPropertyValue( "D3DSceneShadeMode" )>>= aShadeMode;
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
if( lcl_isSimpleScheme( aShadeMode, nRoundedEdges, nObjectLines, xDiagram ) )
@@ -1230,9 +1231,9 @@ void ThreeDHelper::setScheme( const uno::Reference< XDiagram >& xDiagram, ThreeD
lcl_setLightsForScheme( xProp, aScheme );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -1287,9 +1288,9 @@ void ThreeDHelper::setDefaultIllumination( const uno::Reference< beans::XPropert
xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_7, uno::Any( false ) );
xSceneProperties->setPropertyValue( UNO_NAME_3D_SCENE_LIGHTON_8, uno::Any( false ) );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
ThreeDLookScheme aScheme = (aShadeMode==drawing::ShadeMode_FLAT) ? ThreeDLookScheme_Simple : ThreeDLookScheme_Realistic;
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index 1c7412ea2f8a..9a597b56c61c 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/chart2/FormattedString.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <rtl/ustrbuf.hxx>
+#include <tools/diagnose_ex.h>
namespace chart
{
@@ -285,9 +286,9 @@ uno::Reference< XTitle > TitleHelper::createTitle(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
@@ -371,9 +372,9 @@ void TitleHelper::setCompleteString( const OUString& rNewText
xFormattedString->setPropertyValue( "CharHeightAsian", aFontSize );
xFormattedString->setPropertyValue( "CharHeightComplex", aFontSize );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 6ace68e005de..f88987a05dd1 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -26,6 +26,7 @@
#include <algorithm>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <rtl/math.hxx>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
@@ -297,9 +298,9 @@ void SAL_CALL UncachedDataSequence::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");
}
}
@@ -310,9 +311,9 @@ void SAL_CALL UncachedDataSequence::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/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx
index e6d00fdcd837..8c274e5ff76a 100644
--- a/chart2/source/tools/WrappedDefaultProperty.cxx
+++ b/chart2/source/tools/WrappedDefaultProperty.cxx
@@ -18,6 +18,7 @@
*/
#include <WrappedDefaultProperty.hxx>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
@@ -61,9 +62,9 @@ beans::PropertyState WrappedDefaultProperty::getPropertyState(
if( m_aOuterDefaultValue == convertInnerToOuterValue( aValue ))
aState = beans::PropertyState_DEFAULT_VALUE;
}
- catch( const beans::UnknownPropertyException& ex )
+ catch( const beans::UnknownPropertyException& )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return aState;
}
diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx
index b738293c58cc..b7671619acc1 100644
--- a/chart2/source/tools/WrappedProperty.cxx
+++ b/chart2/source/tools/WrappedProperty.cxx
@@ -19,6 +19,7 @@
#include <WrappedProperty.hxx>
#include <com/sun/star/drawing/LineStyle.hpp>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
@@ -110,9 +111,9 @@ beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans::
aState = beans::PropertyState_DEFAULT_VALUE;
}
}
- catch( const beans::UnknownPropertyException& ex )
+ catch( const beans::UnknownPropertyException& )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
return aState;
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index a3a52817070c..b63d25dfeea7 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -20,6 +20,7 @@
#include <WrappedPropertySet.hxx>
#include <tools/solar.h>
+#include <tools/diagnose_ex.h>
namespace chart
{
@@ -234,9 +235,9 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const 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");
bUnknownProperty = true;
}
}
@@ -258,13 +259,13 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence<
OUString aPropertyName( rNameSeq[nN] );
aRetSeq[nN] = getPropertyValue( aPropertyName );
}
- catch( const beans::UnknownPropertyException& ex )
+ catch( const beans::UnknownPropertyException& )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
- catch( const lang::WrappedTargetException& ex )
+ catch( const lang::WrappedTargetException& )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
}
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index a4a690450c65..f9c3ad0e94c6 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -82,6 +82,7 @@
#include <comphelper/sequence.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <tools/diagnose_ex.h>
#include <functional>
#include <map>
@@ -2563,9 +2564,9 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries(
}
}
}
- 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/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 897bbe390ea4..3baf5373e593 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -38,6 +38,7 @@
#include <svx/unoshape.hxx>
#include <svx/scene3d.hxx>
#include <svx/e3dsceneupdater.hxx>
+#include <tools/diagnose_ex.h>
namespace chart
{
@@ -605,9 +606,9 @@ void VDiagram::createShapes_3d()
uno::Any( BaseGFXHelper::B3DHomMatrixToHomogenMatrix( aEffectiveTranformation ) ) );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2" );
}
//add floor plate
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 23dd1ce0f668..22f268b19a4a 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -122,6 +122,7 @@
#include <osl/conditn.hxx>
#include <o3tl/make_unique.hxx>
+#include <tools/diagnose_ex.h>
#include <memory>
@@ -479,9 +480,9 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
xDiaProp->getPropertyValue( "3DRelativeHeight" ) >>= n3DRelativeHeight;
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2" );
}
//prepare for autoscaling and shape creation
@@ -1528,9 +1529,9 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw
pDrawModelWrapper->GetItemPool().SetPoolDefaultItem(SvxFrameDirectionItem(static_cast<SvxFrameDirection>(nWritingMode), EE_PARA_WRITINGDIR) );
}
}
- catch( const uno::Exception& ex )
+ catch( const uno::Exception& )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2" );
}
}
}
@@ -2513,9 +2514,9 @@ void formatPage(
pShapeFactory->createRectangle(
xTarget, rPageSize, awt::Point(0, 0), aNames, aValues);
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2" );
}
}
@@ -2744,12 +2745,12 @@ void ChartView::impl_updateView( bool bCheckLockedCtrler )
m_bViewUpdatePending = false;
m_bInViewUpdate = false;
}
- catch( const uno::Exception& ex)
+ catch( const uno::Exception& )
{
+ DBG_UNHANDLED_EXCEPTION("chart2" );
m_bViewDirty = m_bViewUpdatePending;
m_bViewUpdatePending = false;
m_bInViewUpdate = false;
- SAL_WARN("chart2", "Exception caught. " << ex );
}
{
@@ -2853,9 +2854,9 @@ void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode )
}
}
}
- catch( const uno::Exception& ex)
+ catch( const uno::Exception& )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 4ba77826d912..73948f12f343 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -52,6 +52,7 @@
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/matrix/b3dhommatrix.hxx>
+#include <tools/diagnose_ex.h>
#include <algorithm>
@@ -2068,9 +2069,9 @@ uno::Reference< drawing::XShape > ShapeFactory::createInvisibleRectangle(
}
return xShape;
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return nullptr;
}
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 601e143edaa2..15494a12f27c 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -40,7 +40,7 @@
#include <com/sun/star/chart2/data/PivotTableFieldEntry.hpp>
#include <rtl/ustrbuf.hxx>
#include <svl/languageoptions.hxx>
-
+#include <tools/diagnose_ex.h>
#include <vector>
#include <algorithm>
@@ -78,9 +78,9 @@ double lcl_CalcViewFontSize(
fResult = ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -184,9 +184,9 @@ awt::Size lcl_createTextShapes(
rOutTextShapes.push_back( xEntry );
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
}
@@ -766,9 +766,9 @@ bool lcl_shouldSymbolsBePlacedOnTheLeftSide( const Reference< beans::XPropertySe
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return bSymbolsLeftSide;
}
@@ -857,9 +857,9 @@ bool VLegend::isVisible( const Reference< XLegend > & xLegend )
Reference< beans::XPropertySet > xLegendProp( xLegend, uno::UNO_QUERY_THROW );
xLegendProp->getPropertyValue( "Show") >>= bShow;
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return bShow;
@@ -1002,9 +1002,9 @@ void VLegend::createShapes(
AbstractShapeFactory::setShapeName( xBorder, "MarkHandles" );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2" );
}
}
@@ -1054,9 +1054,9 @@ void VLegend::changePosition(
}
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2" );
}
}
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx
index e72757e378c8..f2f49f22e6d6 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -23,6 +23,7 @@
#include <ObjectIdentifier.hxx>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/chart2/Symbol.hpp>
+#include <tools/diagnose_ex.h>
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
@@ -185,9 +186,9 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol(
aPropNames, aPropValues );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN("chart2", "Exception caught. " << ex );
+ DBG_UNHANDLED_EXCEPTION("chart2");
}
return xResult;