OSL_FAIL.*exception -> TOOLS_WARN_EXCEPTION

Change-Id: I6800e23ead2767d245d5da71d2d40e0f8a6d7e1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106859
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 12 insertions, 7 deletions

diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 70f80a6c8c38..42592fa1f76e 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -470,7 +470,7 @@ IMPL_LINK_NOARG(OButtonControl, OnClick, void*, void)
 #endif
                 catch( const Exception& )
                 {
-                    OSL_FAIL( "OButtonControl::OnClick: caught an exception other than RuntimeException!" );
+                    TOOLS_WARN_EXCEPTION( "forms.component", "OButtonControl::OnClick: caught an exception other than RuntimeException!" );
                 }
             }
         }
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 475ca63bec01..f9eaab0b31b5 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -373,7 +373,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>&
     }
     catch( const Exception& )
     {
-        OSL_FAIL( "OComboBoxModel::read: caught an exception while examining the aggregate's string item list!" );
+        TOOLS_WARN_EXCEPTION( "forms.component", "OComboBoxModel::read: caught an exception while examining the aggregate's string item list!" );
     }
 
     // Version
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index 5c682aa6474c..925e23cde6fa 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -23,6 +23,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/syslocale.hxx>
 #include <comphelper/types.hxx>
+#include <tools/diagnose_ex.h>
 #include <com/sun/star/form/FormComponentType.hpp>
 
 
@@ -99,7 +100,7 @@ void OCurrencyModel::implConstruct()
     }
     catch(const Exception&)
     {
-        OSL_FAIL( "OCurrencyModel::implConstruct: caught an exception while initializing the aggregate!" );
+        TOOLS_WARN_EXCEPTION( "forms.component", "OCurrencyModel::implConstruct: caught an exception while initializing the aggregate!" );
     }
 }
 
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 3b1f8f6de5f8..41753cc0a121 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -68,10 +68,12 @@
 #include <tools/inetmsg.hxx>
 #include <tools/inetstrm.hxx>
 #include <tools/urlobj.hxx>
+#include <tools/diagnose_ex.h>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
 #include <osl/mutex.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::dbtools;
 using namespace ::comphelper;
@@ -2933,7 +2935,7 @@ void ODatabaseForm::reload_impl(bool bMoveToFirst, const Reference< XInteraction
     }
     catch(const SQLException&)
     {
-        OSL_FAIL("ODatabaseForm::reload_impl : shouldn't executeRowSet catch this exception?");
+        TOOLS_WARN_EXCEPTION( "forms.component", "ODatabaseForm::reload_impl : shouldn't executeRowSet catch this exception?");
     }
 
     if (bSuccess)
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 40241149738d..10b210b7b1bf 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -31,6 +31,7 @@
 #include <comphelper/types.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/svapp.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star::uno;
 
@@ -155,7 +156,7 @@ void OGridControlModel::cloneColumns( const OGridControlModel* _pOriginalContain
     }
     catch( const Exception& )
     {
-        OSL_FAIL( "OGridControlModel::cloneColumns: caught an exception while cloning the columns!" );
+        TOOLS_WARN_EXCEPTION( "forms.component", "OGridControlModel::cloneColumns: caught an exception while cloning the columns!" );
     }
 }
 
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 49b779e4cf29..857c25a29ba3 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -823,7 +823,7 @@ bool OImageControlControl::implInsertGraphics()
     }
     catch(const Exception&)
     {
-        OSL_FAIL("OImageControlControl::implInsertGraphics: caught an exception while attempting to execute the FilePicker!");
+        TOOLS_WARN_EXCEPTION( "forms.component", "OImageControlControl::implInsertGraphics: caught an exception while attempting to execute the FilePicker!");
     }
     return false;
 }
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 68861e42cf30..e3d19da934db 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/util/VetoException.hpp>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/docfile.hxx>
@@ -425,7 +426,7 @@ namespace frm
         catch( const Exception& )
         {
             css::uno::Any anyEx = cppu::getCaughtException();
-            OSL_FAIL( "OClickableImageBaseControl::implSubmit: caught an unknown exception!" );
+            TOOLS_WARN_EXCEPTION( "forms.component", "OClickableImageBaseControl::implSubmit: caught an unknown exception!" );
             throw WrappedTargetException( OUString(), *this, anyEx );
         }
     }