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>

3 files changed, 12 insertions, 9 deletions

diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 9bfa185afb63..6e1e3631dbde 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -31,6 +31,7 @@
 #include <o3tl/any.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/datetime.hxx>
+#include <tools/diagnose_ex.h>
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
 #include <ucbhelper/contentidentifier.hxx>
@@ -69,7 +70,7 @@ bool UCB_DeleteFile( const OUString& rURL )
     catch( css::uno::Exception& )
     {
         bRemoved = false;
-        OSL_FAIL( "Exception from executeCommand( delete )" );
+        TOOLS_WARN_EXCEPTION( "sw", "Exception from executeCommand( delete )" );
     }
     return bRemoved;
 }
@@ -97,7 +98,7 @@ bool UCB_MoveFile( const OUString& rURL, const OUString& rNewURL )
     }
     catch( css::uno::Exception& )
     {
-        OSL_FAIL( "Exception from executeCommand( transfer )" );
+        TOOLS_WARN_EXCEPTION( "sw", "Exception from executeCommand( transfer )" );
         bCopyCompleted = false;
     }
     return bCopyCompleted;
@@ -126,7 +127,7 @@ bool UCB_IsCaseSensitiveFileName( const OUString& rURL )
     catch( css::uno::Exception& )
     {
         bCaseSensitive = false;
-        OSL_FAIL( "Exception from compareContentIds()" );
+        TOOLS_WARN_EXCEPTION( "sw", "compareContentIds()" );
     }
     return bCaseSensitive;
 }
@@ -245,13 +246,13 @@ bool UCB_GetFileListOfFolder( const OUString& rURL,
             }
             catch( css::uno::Exception& )
             {
-                OSL_FAIL( "Exception caught!" );
+                TOOLS_WARN_EXCEPTION( "sw", "" );
             }
         }
     }
     catch( css::uno::Exception& )
     {
-        OSL_FAIL( "Exception caught!" );
+        TOOLS_WARN_EXCEPTION( "sw", "" );
         bOk = false;
     }
     return bOk;
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 4077e90ab831..9b4b0ea77c36 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -23,6 +23,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 
 #include <cmdid.h>
 #include <unomid.h>
@@ -677,7 +678,7 @@ SwXParagraph::setPropertyValuesTolerant(
         catch (beans::UnknownPropertyException &)
         {
             // should not occur because property was searched for before
-            OSL_FAIL( "unexpected exception caught" );
+            TOOLS_WARN_EXCEPTION( "sw", "unexpected exception caught" );
             pFailed[ nFailed++ ].Result =
                 beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY;
         }
@@ -816,7 +817,7 @@ SwXParagraph::Impl::GetPropertyValuesTolerant_Impl(
         catch (beans::UnknownPropertyException &)
         {
             // should not occur because property was searched for before
-            OSL_FAIL( "unexpected exception caught" );
+            TOOLS_WARN_EXCEPTION( "sw", "unexpected exception caught" );
             rResult.Result = beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY;
         }
         catch (lang::IllegalArgumentException &)
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index ea0bca136e13..84cf32fbf0b0 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -23,6 +23,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/itemprop.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <unocrsrhelper.hxx>
 #include <unoparaframeenum.hxx>
@@ -523,7 +524,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPr
         catch (beans::UnknownPropertyException &)
         {
             // should not occur because property was searched for before
-            OSL_FAIL( "unexpected exception caught" );
+            TOOLS_WARN_EXCEPTION( "sw", "" );
             pFailed[ nFailed++ ].Result = beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY;
         }
         catch (lang::IllegalArgumentException &)
@@ -633,7 +634,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SwXTextPortion::GetPrope
             catch (const beans::UnknownPropertyException &)
             {
                 // should not occur because property was searched for before
-                OSL_FAIL( "unexpected exception caught" );
+                TOOLS_WARN_EXCEPTION( "sw", "unexpected exception caught" );
                 aResult.Result = beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY;
             }
             catch (const lang::IllegalArgumentException &)