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>

6 files changed, 16 insertions, 19 deletions

diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index fc6bc5ebfce7..c20011374243 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -20,6 +20,7 @@
 #include "Date.hxx"
 #include <services.hxx>
 #include <tools/date.hxx>
+#include <tools/diagnose_ex.h>
 #include <connectivity/dbconversion.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 
@@ -93,7 +94,7 @@ ODateModel::ODateModel(const Reference<XComponentContext>& _rxFactory)
     }
     catch( const Exception& )
     {
-        OSL_FAIL( "ODateModel::ODateModel: caught an exception!" );
+        TOOLS_WARN_EXCEPTION( "forms.component", "ODateModel::ODateModel" );
     }
     osl_atomic_decrement( &m_refCount );
 }
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index fb584d478ced..d683be633284 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -521,8 +521,7 @@ OControlModel::OControlModel(
                 }
                 catch( const Exception& )
                 {
-                    DBG_UNHANDLED_EXCEPTION("forms.component");
-                    SAL_WARN("forms.component",  "OControlModel::OControlModel: caught an exception!");
+                    TOOLS_WARN_EXCEPTION("forms.component",  "OControlModel::OControlModel");
                 }
             }
         }
@@ -2148,8 +2147,7 @@ void OBoundControlModel::doSetControlValue( const Any& _rValue )
 
     catch( const Exception& )
     {
-        DBG_UNHANDLED_EXCEPTION("forms.component");
-        SAL_WARN("forms.component",  "OBoundControlModel::doSetControlValue: caught an exception!");
+        TOOLS_WARN_EXCEPTION("forms.component",  "OBoundControlModel::doSetControlValue");
     }
 }
 
@@ -2169,8 +2167,7 @@ void OBoundControlModel::onConnectedValidator( )
 
     catch( const Exception& )
     {
-        DBG_UNHANDLED_EXCEPTION("forms.component");
-        SAL_WARN("forms.component",  "OBoundControlModel::onConnectedValidator: caught an exception!");
+        TOOLS_WARN_EXCEPTION("forms.component",  "OBoundControlModel::onConnectedValidator");
     }
 
     recheckValidity( false );
@@ -2189,8 +2186,7 @@ void OBoundControlModel::onDisconnectedValidator( )
 
     catch( const Exception& )
     {
-        DBG_UNHANDLED_EXCEPTION("forms.component");
-        SAL_WARN("forms.component",  "OBoundControlModel::onDisconnectedValidator: caught an exception!");
+        TOOLS_WARN_EXCEPTION("forms.component",  "OBoundControlModel::onDisconnectedValidator");
     }
 
     recheckValidity( false );
@@ -2463,8 +2459,7 @@ void OBoundControlModel::disconnectExternalValueBinding( )
 
     catch( const Exception& )
     {
-        DBG_UNHANDLED_EXCEPTION("forms.component");
-        SAL_WARN("forms.component",  "OBoundControlModel::disconnectExternalValueBinding: caught an exception!");
+        TOOLS_WARN_EXCEPTION("forms.component",  "OBoundControlModel::disconnectExternalValueBinding");
     }
 
     // if the binding also acts as our validator, disconnect the validator, too
@@ -2792,8 +2787,7 @@ void OBoundControlModel::recheckValidity( bool _bForceNotification )
 
     catch( const Exception& )
     {
-        DBG_UNHANDLED_EXCEPTION("forms.component");
-        SAL_WARN("forms.component",  "OBoundControlModel::recheckValidity: caught an exception!");
+        TOOLS_WARN_EXCEPTION("forms.component",  "OBoundControlModel::recheckValidity");
     }
 }
 
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index 8321db5785cf..a4d8cb6561b2 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -251,7 +251,7 @@ namespace frm
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "OReferenceValueComponent::translateControlValueToExternalValue: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "forms.component", "OReferenceValueComponent::translateControlValueToExternalValue" );
         }
 
         return aExternalValue;
diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx
index ac425532f008..d667790c9756 100644
--- a/forms/source/richtext/featuredispatcher.cxx
+++ b/forms/source/richtext/featuredispatcher.cxx
@@ -19,6 +19,7 @@
 
 #include "featuredispatcher.hxx"
 #include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 
 
 namespace frm
@@ -125,7 +126,7 @@ namespace frm
             }
             catch( const Exception& )
             {
-                OSL_FAIL( "ORichTextFeatureDispatcher::doNotify: caught an exception!" );
+                TOOLS_WARN_EXCEPTION( "forms.richtext", "ORichTextFeatureDispatcher::doNotify" );
             }
         }
     }
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 9ec22b913924..866b62ae9484 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -30,6 +30,7 @@
 #include <svl/itempool.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <tools/diagnose_ex.h>
 #include <editeng/editstat.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
@@ -515,7 +516,7 @@ namespace frm
             }
             catch( const Exception& )
             {
-                OSL_FAIL( "ORichTextModel::getEditEngine: caught an exception!" );
+                TOOLS_WARN_EXCEPTION( "forms.richtext", "ORichTextModel::getEditEngine" );
             }
         }
         return pEngine;
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 7112a46b118f..1d89e1e2958e 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -380,7 +380,7 @@ namespace frm
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "FormOperations::getState: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "forms.runtime", "FormOperations::getState" );
         }
 
         return aState;
@@ -1249,7 +1249,7 @@ namespace frm
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "FormOperations::impl_ensureInitializedParser_nothrow: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "forms.runtime", "FormOperations::impl_ensureInitializedParser_nothrow" );
         }
 
         m_bInitializedParser = true;
@@ -1279,7 +1279,7 @@ namespace frm
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "FormOperations::impl_disposeParser_nothrow: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "forms.runtime", "FormOperations::impl_disposeParser_nothrow" );
         }
     }