3 files changed, 6 insertions, 5 deletions
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() )