summaryrefslogtreecommitdiff
path: root/chart2/source/controller/main
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-06-14 09:31:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-06-14 10:49:55 +0200
commitbba7ca803cfcb316882c5f32cd28f0aa0c67591b (patch)
tree4a26499c6571bc24fc4d73782bf4c452a33bce6a /chart2/source/controller/main
parentaf37bb23f63b209af1193e20177c3aacbd777543 (diff)
loplugin:logexceptionnicely in chart2
Change-Id: Ib7933723e5506578bbc85cc431d54d1ed8466376 Reviewed-on: https://gerrit.libreoffice.org/74019 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/controller/main')
-rw-r--r--chart2/source/controller/main/ChartController_Insert.cxx53
-rw-r--r--chart2/source/controller/main/ChartController_Position.cxx5
-rw-r--r--chart2/source/controller/main/ChartController_Properties.cxx5
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx4
-rw-r--r--chart2/source/controller/main/ControllerCommandDispatch.cxx9
5 files changed, 40 insertions, 36 deletions
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index a2f2dcb347ae..50a3a3904219 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -58,6 +58,7 @@
#include <svx/ActionDescriptionProvider.hxx>
#include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
using namespace ::com::sun::star;
@@ -116,9 +117,9 @@ void ChartController::executeDispatch_InsertAxes()
aUndoGuard.commit();
}
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
@@ -150,9 +151,9 @@ void ChartController::executeDispatch_InsertGrid()
aUndoGuard.commit();
}
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
@@ -181,9 +182,9 @@ void ChartController::executeDispatch_InsertTitles()
aUndoGuard.commit();
}
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
@@ -232,9 +233,9 @@ void ChartController::executeDispatch_OpenLegendDialog()
aUndoGuard.commit();
}
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
@@ -294,9 +295,9 @@ void ChartController::executeDispatch_InsertMenu_DataLabels()
aUndoGuard.commit();
}
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
@@ -505,9 +506,9 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError )
aUndoGuard.commit();
}
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
}
@@ -730,9 +731,9 @@ void ChartController::executeDispatch_InsertAxisTitle()
aUndoGuard.commit();
}
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
@@ -752,9 +753,9 @@ void ChartController::executeDispatch_InsertAxis()
aUndoGuard.commit();
}
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
@@ -774,9 +775,9 @@ void ChartController::executeDispatch_DeleteAxis()
aUndoGuard.commit();
}
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
@@ -796,9 +797,9 @@ void ChartController::executeDispatch_InsertMajorGrid()
aUndoGuard.commit();
}
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
@@ -818,9 +819,9 @@ void ChartController::executeDispatch_DeleteMajorGrid()
aUndoGuard.commit();
}
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
@@ -842,9 +843,9 @@ void ChartController::executeDispatch_InsertMinorGrid()
aUndoGuard.commit();
}
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
@@ -866,9 +867,9 @@ void ChartController::executeDispatch_DeleteMinorGrid()
aUndoGuard.commit();
}
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 164b2197ec91..8df27d382153 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -37,6 +37,7 @@
#include <svl/aeitem.hxx>
#include <svl/intitem.hxx>
#include <svx/svxdlg.hxx>
+#include <tools/diagnose_ex.h>
#include <vcl/svapp.hxx>
#include <memory>
@@ -200,9 +201,9 @@ void ChartController::executeDispatch_PositionAndSize(const ::css::uno::Sequence
aUndoGuard.commit();
}
}
- catch(const uno::Exception& e)
+ catch(const uno::Exception&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 69fc84fdda90..32688d35cb95 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -59,6 +59,7 @@
#include <sal/log.hxx>
#include <vcl/svapp.hxx>
#include <svx/ActionDescriptionProvider.hxx>
+#include <tools/diagnose_ex.h>
namespace chart
{
@@ -824,9 +825,9 @@ void ChartController::executeDispatch_View3D()
if (aDlg.run() == RET_OK)
aUndoGuard.commit();
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 819800c00016..963baf15d405 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -977,9 +977,9 @@ void ChartController::executeDispatch_LOKPieSegmentDragging( int nOffset )
xPointProperties->setPropertyValue( "Offset", uno::Any( nOffset / 100.0 ) );
}
}
- catch( const uno::Exception & ex )
+ catch( const uno::Exception & )
{
- SAL_WARN( "chart2", "Exception caught. " << ex );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 031c4e4cf1cf..27a0fe3e5ec0 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -35,6 +35,7 @@
#include <vcl/svapp.hxx>
#include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/frame/XStorable.hpp>
@@ -295,9 +296,9 @@ void ControllerState::update(
if( xEquationProperties.is() )
xEquationProperties->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bHasR2Value;
}
- catch(const uno::RuntimeException& e)
+ catch(const uno::RuntimeException&)
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
bMayAddR2Value = !bHasR2Value;
bMayDeleteR2Value = bHasR2Value;
@@ -541,9 +542,9 @@ void ControllerCommandDispatch::updateCommandAvailability()
{
xProps->getPropertyValue("EnableDataTableDialog") >>= bEnableDataTableDialog;
}
- catch( const uno::Exception& e )
+ catch( const uno::Exception& )
{
- SAL_WARN("chart2", "Exception caught. " << e );
+ TOOLS_WARN_EXCEPTION("chart2", "" );
}
}