summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2019-12-26 09:22:30 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-12-26 19:08:42 +0100
commitdf773dc769f6a0d676673ac9b5fc0e8132e435e6 (patch)
treefe744b9d76e5f26282409fbe3b117e24659de7c0 /reportdesign
parent32b9d07baa0cf6907f14ccb9aa068b51d95eefaa (diff)
use more TOOLS_WARN_EXCEPTION
so we get more useful log messages when stuff goes wrong Change-Id: Ia55db7ab1a4d79b0f281673fbbb06c61745fa89e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85829 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx2
-rw-r--r--reportdesign/source/core/sdr/UndoActions.cxx6
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx4
-rw-r--r--reportdesign/source/ui/misc/RptUndo.cxx5
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx2
5 files changed, 10 insertions, 9 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 8fcf9e1b9e3e..8daff443c111 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -224,7 +224,7 @@ static void lcl_extractAndStartStatusIndicator( const utl::MediaDescriptor& _rDe
}
catch (const uno::Exception&)
{
- OSL_FAIL( "lcl_extractAndStartStatusIndicator: caught an exception!" );
+ TOOLS_WARN_EXCEPTION( "reportdesign", "lcl_extractAndStartStatusIndicator" );
}
}
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index 86f617b239a7..836e8ed0a3d1 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -208,7 +208,7 @@ void OUndoContainerAction::Undo()
}
catch( const Exception& )
{
- OSL_FAIL( "OUndoContainerAction::Undo: caught an exception!" );
+ TOOLS_WARN_EXCEPTION( "reportdesign", "OUndoContainerAction::Undo" );
}
}
}
@@ -236,7 +236,7 @@ void OUndoContainerAction::Redo()
}
catch( const Exception& )
{
- OSL_FAIL( "OUndoContainerAction::Redo: caught an exception!" );
+ TOOLS_WARN_EXCEPTION( "reportdesign", "OUndoContainerAction::Redo" );
}
}
}
@@ -371,7 +371,7 @@ void ORptUndoPropertyAction::setProperty(bool _bOld)
}
catch( const Exception& )
{
- OSL_FAIL( "ORptUndoPropertyAction::Redo: caught an exception!" );
+ TOOLS_WARN_EXCEPTION( "reportdesign", "ORptUndoPropertyAction::Redo" );
}
}
}
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index db98aa57bdec..fb7bdb9e503c 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1621,7 +1621,7 @@ bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause,
catch (const sdbc::SQLException& e) { aErrorInfo = e; }
catch( const uno::Exception& )
{
- OSL_FAIL( "GeometryHandler::impl_dialogFilter_nothrow: caught an exception!" );
+ TOOLS_WARN_EXCEPTION( "reportdesign", "GeometryHandler::impl_dialogFilter_nothrow" );
}
if ( aErrorInfo.isValid() )
@@ -2079,7 +2079,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF
}
catch (uno::Exception&)
{
- OSL_FAIL( "GeometryHandler::impl_initFieldList_nothrow: caught an exception!" );
+ TOOLS_WARN_EXCEPTION( "reportdesign", "GeometryHandler::impl_initFieldList_nothrow" );
}
}
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx
index 3320dc18b92a..43ff9cc1d1ac 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -32,6 +32,7 @@
#include <comphelper/types.hxx>
#include <svx/unoshape.hxx>
#include <utility>
+#include <tools/diagnose_ex.h>
#include <vcl/settings.hxx>
#include <functional>
@@ -185,7 +186,7 @@ void OSectionUndo::Undo()
}
catch( const Exception& )
{
- OSL_FAIL( "OSectionUndo::Undo: caught an exception!" );
+ TOOLS_WARN_EXCEPTION( "reportdesign", "OSectionUndo::Undo" );
}
}
@@ -206,7 +207,7 @@ void OSectionUndo::Redo()
}
catch( const Exception& )
{
- OSL_FAIL( "OSectionUndo::Redo: caught an exception!" );
+ TOOLS_WARN_EXCEPTION( "reportdesign", "OSectionUndo::Redo" );
}
}
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 5f2ea6b38cfc..dd938af56233 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -1104,7 +1104,7 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula
catch (const sdbc::SQLException& e) { aErrorInfo = e; }
catch( const uno::Exception& )
{
- OSL_FAIL( "GeometryHandler::impl_dialogFilter_nothrow: caught an exception!" );
+ TOOLS_WARN_EXCEPTION( "reportdesign", "GeometryHandler::impl_dialogFilter_nothrow" );
}
if ( aErrorInfo.isValid() )