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>

24 files changed, 109 insertions, 104 deletions

diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index d2aa6e699168..d4cbc5842d37 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -213,7 +213,7 @@ namespace abp
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "ODataSourceContext::ODataSourceContext: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.abpilot", "ODataSourceContext::ODataSourceContext" );
         }
     }
     ODataSourceContext::~ODataSourceContext()
diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index 4a9c23d0c97d..29bd584bd662 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -20,6 +20,7 @@
 #include "formcontrolcontainer.hxx"
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 
@@ -104,7 +105,7 @@ namespace bib
         }
         catch( const Exception&)
         {
-            OSL_FAIL( "FormControlContainer::implSetDesignMode: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.biblio", "FormControlContainer::implSetDesignMode" );
         }
     }
 
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 80d2ae7b8f52..fc963e1f149c 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -47,6 +47,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
+#include <tools/diagnose_ex.h>
 #include <vcl/edit.hxx>
 #include <vcl/weld.hxx>
 #include <osl/mutex.hxx>
@@ -455,7 +456,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
             }
             catch( const uno::Exception& )
             {
-                OSL_FAIL( "BibFrameController_Impl::dispatch: caught an exception!" );
+                TOOLS_WARN_EXCEPTION( "extensions.biblio", "BibFrameController_Impl::dispatch" );
             }
 
             sal_uInt16 nCount = aStatusListeners.size();
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 30e76024218b..cf45bd1d1921 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 #include <comphelper/interaction.hxx>
 #include <connectivity/dbtools.hxx>
 #include <vcl/stdtext.hxx>
@@ -144,7 +145,7 @@ namespace dbp
         }
         catch(const Exception&)
         {
-            OSL_FAIL("OTableSelectionPage::initializePage: caught an exception!");
+            TOOLS_WARN_EXCEPTION("extensions.abpilot", "OTableSelectionPage::initializePage");
         }
     }
 
@@ -178,7 +179,7 @@ namespace dbp
         }
         catch(const Exception&)
         {
-            OSL_FAIL("OTableSelectionPage::commitPage: caught an exception!");
+            TOOLS_WARN_EXCEPTION("extensions.dbpilots", "OTableSelectionPage::commitPage");
         }
 
         return true;
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 59ce90acbe7d..045f2924c8f7 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -19,6 +19,7 @@
 
 #include "controlwizard.hxx"
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
@@ -176,7 +177,7 @@ namespace dbp
             }
             catch(const Exception&)
             {
-                OSL_FAIL("OControlWizardPage::initializePage: caught an exception!");
+                TOOLS_WARN_EXCEPTION("extensions.dbpilots", "OControlWizardPage::initializePage");
             }
 
             INetURLObject aURL( sDataSource );
@@ -351,7 +352,7 @@ namespace dbp
         }
         catch(const Exception&)
         {
-            OSL_FAIL("OControlWizard::implDeterminePage: caught an exception!");
+            TOOLS_WARN_EXCEPTION("extensions.dbpilots", "OControlWizard::implDeterminePage");
         }
     }
 
@@ -386,7 +387,7 @@ namespace dbp
         }
         catch(const Exception&)
         {
-            OSL_FAIL("OControlWizard::getFormConnection: caught an exception!");
+            TOOLS_WARN_EXCEPTION("extensions.dbpilots", "OControlWizard::getFormConnection");
         }
         return xConn;
     }
@@ -416,7 +417,7 @@ namespace dbp
         }
         catch(const Exception&)
         {
-            OSL_FAIL("OControlWizard::setFormConnection: caught an exception!");
+            TOOLS_WARN_EXCEPTION( "extensions.dbpilots", "OControlWizard::setFormConnection");
         }
     }
 
@@ -566,7 +567,7 @@ namespace dbp
         catch(const SQLException& e) { aSQLException <<= e; }
         catch(const Exception&)
         {
-            OSL_FAIL("OControlWizard::initContext: could not retrieve the control context (caught an exception)!");
+            TOOLS_WARN_EXCEPTION( "extensions.dbpilots", "OControlWizard::initContext: could not retrieve the control context");
         }
 
         ::comphelper::disposeComponent(xStatement);
@@ -618,7 +619,7 @@ namespace dbp
         }
         catch(const Exception&)
         {
-            OSL_FAIL("OControlWizard::commitControlSettings: could not commit the basic control settings!");
+            TOOLS_WARN_EXCEPTION( "extensions.dbpilots", "OControlWizard::commitControlSettings: could not commit the basic control settings!");
         }
     }
 
@@ -643,7 +644,7 @@ namespace dbp
         }
         catch(const Exception&)
         {
-            OSL_FAIL("OControlWizard::initControlSettings: could not retrieve the basic control settings!");
+            TOOLS_WARN_EXCEPTION( "extensions.dbpilots", "OControlWizard::initControlSettings: could not retrieve the basic control settings!");
         }
     }
 
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index 5db199db94ef..55ad72b82d3a 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/table/CellAddress.hpp>
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 
 
 extern "C" void createRegistryInfo_CellBindingPropertyHandler()
@@ -220,7 +221,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "CellBindingPropertyHandler::impl_updateDependentProperty_nothrow: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "CellBindingPropertyHandler::impl_updateDependentProperty_nothrow" );
         }
     }
 
@@ -338,7 +339,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "CellBindingPropertyHandler::setPropertyValue: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "CellBindingPropertyHandler::setPropertyValue" );
         }
     }
 
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx
index 7942a4200563..77e83b969c31 100644
--- a/extensions/source/propctrlr/cellbindinghelper.cxx
+++ b/extensions/source/propctrlr/cellbindinghelper.cxx
@@ -183,7 +183,7 @@ namespace pcr
             }
             catch( const Exception& )
             {
-                OSL_FAIL( "CellBindingHelper::doConvertAddressRepresentations: caught an exception!" );
+                TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "CellBindingHelper::doConvertAddressRepresentations" );
             }
         }
 
@@ -310,7 +310,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "CellBindingHelper::getAddressFromCellBinding: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "CellBindingHelper::getAddressFromCellBinding" );
         }
 
         return bReturn;
@@ -360,7 +360,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "CellBindingHelper::getStringAddressFromCellListSource: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "CellBindingHelper::getStringAddressFromCellListSource" );
         }
 
         return sAddress;
@@ -432,7 +432,7 @@ namespace pcr
             }
             catch( const Exception& )
             {
-                OSL_FAIL( "CellBindingHelper::isCellIntegerBindingAllowed: caught an exception!" );
+                TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "CellBindingHelper::isCellIntegerBindingAllowed" );
                     // are there really control models which survive isCellBindingAllowed, but don't have a ClassId
                     // property?
                 bAllow = false;
@@ -469,7 +469,7 @@ namespace pcr
             }
             catch( const Exception& )
             {
-                OSL_FAIL( "CellBindingHelper::isCellBindingAllowed: caught an exception!" );
+                TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "CellBindingHelper::isCellBindingAllowed" );
                 bAllow = false;
             }
         }
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index f60edd92e0af..fc088d95a39e 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -24,6 +24,7 @@
 
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
+#include <tools/diagnose_ex.h>
 
 #define TEXTTYPE_SINGLELINE     0
 #define TEXTTYPE_MULTILINE      1
@@ -124,7 +125,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EditPropertyHandler::getPropertyValue: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EditPropertyHandler::getPropertyValue" );
         }
 
         return aReturn;
@@ -179,7 +180,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EditPropertyHandler::setPropertyValue: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EditPropertyHandler::setPropertyValue" );
         }
     }
 
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index e3bf4bf07a53..62f16f437728 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -93,7 +93,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::isEForm: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::isEForm" );
         }
         return false;
     }
@@ -186,7 +186,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::canBindToDataType: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::canBindToDataType" );
         }
 
         return bCan;
@@ -203,7 +203,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::isListEntrySink: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::isListEntrySink" );
         }
         return bIs;
     }
@@ -310,7 +310,7 @@ namespace pcr
             }
             catch( const Exception& )
             {
-                OSL_FAIL( "EFormsHelper::getFormModelNames: caught an exception!" );
+                TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::getFormModelNames" );
             }
         }
     }
@@ -336,7 +336,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::getBindingNames: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::getBindingNames" );
         }
     }
 
@@ -353,7 +353,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::getFormModelByName: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::getFormModelByName" );
         }
         return xReturn;
     }
@@ -372,7 +372,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::getCurrentFormModel: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::getCurrentFormModel" );
         }
         return xModel;
     }
@@ -389,7 +389,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::getCurrentFormModel: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::getCurrentFormModel" );
         }
         return sModelName;
     }
@@ -406,7 +406,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::getCurrentBinding: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::getCurrentBinding" );
         }
 
         return xBinding;
@@ -424,7 +424,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::getCurrentBindingName: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::getCurrentBindingName" );
         }
         return sBindingName;
     }
@@ -442,7 +442,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::getCurrentListSourceBinding: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::getCurrentListSourceBinding" );
         }
         return xReturn;
     }
@@ -459,7 +459,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::setListSourceBinding: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::setListSourceBinding" );
         }
     }
 
@@ -485,7 +485,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::setBinding: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::setBinding" );
         }
     }
 
@@ -618,7 +618,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::getModelElementUIName: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::getModelElementUIName" );
         }
 
         return sUIName;
@@ -690,7 +690,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::getAllElementUINames: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::getAllElementUINames" );
         }
 
         _rElementNames.resize( rMapUINameToElement.size() );
@@ -720,7 +720,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::firePropertyChange: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::firePropertyChange" );
         }
     }
 
@@ -754,7 +754,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsHelper::firePropertyChanges: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsHelper::firePropertyChanges" );
         }
     }
 
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index c177095641ef..d26b6fa57a1f 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -148,7 +148,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsPropertyHandler::getPropertyValue: caught an exception!"
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsPropertyHandler::getPropertyValue: caught exception!"
                 "(have been asked for the \"" <<_rPropertyName << "\" property.)");
         }
         return aReturn;
@@ -266,7 +266,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsPropertyHandler::setPropertyValue: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsPropertyHandler::setPropertyValue" );
         }
     }
 
@@ -523,7 +523,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EFormsPropertyHandler::onInteractivePropertySelection: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EFormsPropertyHandler::onInteractivePropertySelection" );
         }
 
         // something went wrong here ...(but has been asserted already)
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 1afb4c8e861c..093b466dc6bd 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -270,7 +270,7 @@ namespace pcr
         }
         catch (const Exception&)
         {
-            OSL_FAIL("ControlCharacterDialog::translatePropertiesToItems: caught an exception!");
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "ControlCharacterDialog::translatePropertiesToItems");
         }
 
         _pSet->DisableItem(SID_ATTR_CHAR_CJK_FONT);
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 38236bccc319..9b66c241c6af 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2001,8 +2001,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            DBG_UNHANDLED_EXCEPTION("extensions.propctrlr");
-            OSL_FAIL( "FormComponentPropertyHandler::impl_updateDependentProperty_nothrow: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormComponentPropertyHandler::impl_updateDependentProperty_nothrow" );
         }
     }
 
@@ -2078,8 +2077,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            DBG_UNHANDLED_EXCEPTION("extensions.propctrlr");
-            OSL_FAIL( "FormComponentPropertyHandler::onNewComponent: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormComponentPropertyHandler::onNewComponent" );
         }
     }
 
@@ -2333,8 +2331,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            DBG_UNHANDLED_EXCEPTION("extensions.propctrlr");
-            OSL_FAIL( "FormComponentPropertyHandler::impl_getRowSet_nothrow: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormComponentPropertyHandler::impl_getRowSet_nothrow" );
         }
         return xReturn;
     }
@@ -2372,8 +2369,7 @@ namespace pcr
         }
         catch (const Exception&)
         {
-            DBG_UNHANDLED_EXCEPTION("extensions.propctrlr");
-            OSL_FAIL( "FormComponentPropertyHandler::impl_initFieldList_nothrow: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormComponentPropertyHandler::impl_initFieldList_nothrow" );
         }
     }
 
@@ -2422,8 +2418,7 @@ namespace pcr
             }
             catch( const Exception& )
             {
-                DBG_UNHANDLED_EXCEPTION("extensions.propctrlr");
-                OSL_FAIL( "FormComponentPropertyHandler::impl_ensureRowsetConnection_nothrow: caught an exception during error handling!" );
+                TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormComponentPropertyHandler::impl_ensureRowsetConnection_nothrow: caught an exception during error handling!" );
             }
             // additional info about what happened
             INetURLObject aParser( sDataSourceName );
@@ -2481,8 +2476,7 @@ namespace pcr
         }
         catch (const Exception&)
         {
-            DBG_UNHANDLED_EXCEPTION("extensions.propctrlr");
-            OSL_FAIL("FormComponentPropertyHandler::impl_describeCursorSource_nothrow: caught an exception !");
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormComponentPropertyHandler::impl_describeCursorSource_nothrow");
         }
     }
 
@@ -2656,8 +2650,7 @@ namespace pcr
         catch (const SQLException& e) { aErrorInfo = e; }
         catch( const Exception& )
         {
-            DBG_UNHANDLED_EXCEPTION("extensions.propctrlr");
-            OSL_FAIL( "FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow" );
         }
 
         if ( aErrorInfo.isValid() )
@@ -2745,8 +2738,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            DBG_UNHANDLED_EXCEPTION("extensions.propctrlr");
-            OSL_FAIL( "FormComponentPropertyHandler::impl_dialogFormatting_nothrow: : caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormComponentPropertyHandler::impl_dialogFormatting_nothrow" );
         }
         return bChanged;
     }
@@ -3264,8 +3256,7 @@ namespace pcr
             }
             catch( const Exception& )
             {
-                DBG_UNHANDLED_EXCEPTION("extensions.propctrlr");
-                OSL_FAIL( "FormComponentPropertyHandler::impl_hasValidDataSourceSignature_nothrow: caught an exception!" );
+                TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormComponentPropertyHandler::impl_hasValidDataSourceSignature_nothrow" );
             }
         }
         return bHas;
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 746b7e50a139..005c80d25853 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -24,6 +24,7 @@
 #include <strings.hrc>
 #include "formstrings.hxx"
 #include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
@@ -314,7 +315,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "FormLinkDialog::initializeLinks: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormLinkDialog::initializeLinks" );
         }
     }
 
@@ -363,7 +364,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "FormLinkDialog::getFormDataSourceType: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormLinkDialog::getFormDataSourceType" );
         }
         return sReturn;
     }
@@ -400,7 +401,7 @@ namespace pcr
         catch (const SQLException& e ) { aErrorInfo = e; }
         catch( const Exception& )
         {
-            OSL_FAIL( "FormLinkDialog::getFormFields: caught a non-SQL exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormLinkDialog::getFormFields: caught a non-SQL exception!" );
         }
 
         if ( aErrorInfo.isValid() )
@@ -465,7 +466,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "FormLinkDialog::getCanonicUnderlyingTable: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormLinkDialog::getCanonicUnderlyingTable" );
         }
         return xTable;
     }
@@ -530,7 +531,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "FormLinkDialog::getExistingRelation: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormLinkDialog::getExistingRelation" );
         }
 
         return ( !_rLeftFields.empty() ) && ( !_rLeftFields[ 0 ].isEmpty() );
@@ -601,7 +602,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "FormLinkDialog::initializeSuggest: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "FormLinkDialog::initializeSuggest" );
         }
     }
 
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index d30d80918077..2b04b7567bd2 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -39,6 +39,7 @@
 #include <comphelper/extract.hxx>
 #include <comphelper/types.hxx>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <algorithm>
 #include <o3tl/functional.hxx>
@@ -104,7 +105,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EnumRepresentation::EnumRepresentation: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EnumRepresentation::EnumRepresentation" );
         }
     }
 
@@ -118,7 +119,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EnumRepresentation::getDescriptions: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EnumRepresentation::getDescriptions" );
         }
 
         return std::vector< OUString >( aNames.begin(), aNames.end() );
@@ -134,7 +135,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "EnumRepresentation::impl_getValues: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "EnumRepresentation::impl_getValues" );
         }
     }
 
@@ -522,7 +523,7 @@ namespace pcr
             }
             catch( const Exception& )
             {
-                OSL_FAIL( "GenericPropertyHandler::impl_ensurePropertyMap: caught an exception!" );
+                TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "GenericPropertyHandler::impl_ensurePropertyMap" );
             }
         }
     }
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index 18a575d6dbad..148ac41e8a52 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -266,7 +266,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "PropertyHandler::getContextValueByName: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "PropertyHandler::getContextValueByName" );
         }
         return xI;
     }
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index 29b3b19e3a58..4cd7d610fafb 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -23,6 +23,7 @@
 #include <strings.hrc>
 #include "formstrings.hxx"
 #include <comphelper/sequence.hxx>
+#include <tools/diagnose_ex.h>
 
 namespace pcr
 {
@@ -86,7 +87,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "ListSelectionDialog::initialize: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "ListSelectionDialog::initialize" );
         }
     }
 
@@ -104,7 +105,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "ListSelectionDialog::commitSelection: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "ListSelectionDialog::commitSelection" );
         }
     }
 
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 88b38e22c554..1b9e3f0f7851 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -426,7 +426,7 @@ namespace pcr
             }
             catch( const Exception& )
             {
-                OSL_FAIL( "OPropertyBrowserController::suspendPropertyHandlers_nothrow: caught an exception!" );
+                TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "OPropertyBrowserController::suspendPropertyHandlers_nothrow" );
             }
         }
         return true;
@@ -1145,7 +1145,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "OPropertyBrowserController::describePropertyLine: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "OPropertyBrowserController::describePropertyLine" );
         }
     }
 
@@ -1492,7 +1492,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "OPropertyBrowserController::rebuildPropertyUI: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "OPropertyBrowserController::rebuildPropertyUI" );
         }
 
         getPropertyBox().ChangeEntry( aDescriptor );
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx
index 68e72ab9637e..9d6d63495ee0 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.cxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx
@@ -91,7 +91,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "PushButtonNavigation::PushButtonNavigation: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "PushButtonNavigation::PushButtonNavigation" );
         }
     }
 
@@ -130,7 +130,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "PushButtonNavigation::getCurrentButtonType: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "PushButtonNavigation::getCurrentButtonType" );
         }
         return aReturn;
     }
@@ -162,7 +162,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "PushButtonNavigation::setCurrentButtonType: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "PushButtonNavigation::setCurrentButtonType" );
         }
     }
 
@@ -194,7 +194,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "PushButtonNavigation::getCurrentButtonTypeState: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "PushButtonNavigation::getCurrentButtonTypeState" );
         }
 
         return eState;
@@ -225,7 +225,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "PushButtonNavigation::getCurrentTargetURL: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "PushButtonNavigation::getCurrentTargetURL" );
         }
         return aReturn;
     }
@@ -242,7 +242,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "PushButtonNavigation::setCurrentTargetURL: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "PushButtonNavigation::setCurrentTargetURL" );
         }
     }
 
@@ -261,7 +261,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "PushButtonNavigation::setCurrentTargetURL: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "PushButtonNavigation::setCurrentTargetURL" );
         }
 
         return eState;
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index 921008c42091..03452bd0638d 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
 #include <com/sun/star/lang/NullPointerException.hpp>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 #include <rtl/ustrbuf.hxx>
 
 
@@ -82,7 +83,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "SubmissionHelper::canTriggerSubmissions: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "SubmissionHelper::canTriggerSubmissions" );
         }
         return false;
     }
@@ -159,7 +160,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "SubmissionPropertyHandler::getPropertyValue: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "SubmissionPropertyHandler::getPropertyValue" );
         }
 
         return aReturn;
@@ -204,7 +205,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "SubmissionPropertyHandler::setPropertyValue: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "SubmissionPropertyHandler::setPropertyValue" );
         }
     }
 
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 90d28f8794bc..960686e20323 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/form/runtime/FormController.hpp>
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 
 namespace pcr
 {
@@ -195,7 +196,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "TabOrderDialog::FillList: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "TabOrderDialog::FillList" );
         }
 
         // select first entry
@@ -230,7 +231,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "TabOrderDialog::AutoOrderClickHdl: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "TabOrderDialog::AutoOrderClickHdl" );
         }
     }
 
diff --git a/extensions/source/propctrlr/unourl.cxx b/extensions/source/propctrlr/unourl.cxx
index 4af3d3146692..88c9630129e4 100644
--- a/extensions/source/propctrlr/unourl.cxx
+++ b/extensions/source/propctrlr/unourl.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <comphelper/processfactory.hxx>
 #include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 
 
 namespace pcr
@@ -53,7 +54,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "UnoURL::UnoURL: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "UnoURL::UnoURL" );
         }
     }
 
diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx
index 7a0fb3ac718a..27a101d9999b 100644
--- a/extensions/source/propctrlr/xsddatatypes.cxx
+++ b/extensions/source/propctrlr/xsddatatypes.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <tools/debug.hxx>
 #include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
 
 
 namespace pcr
@@ -45,7 +46,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDDataType: getSave: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDDataType: getSave" );
         }
         return aReturn;
     }
@@ -74,7 +75,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDDataType::classify: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDDataType::classify" );
         }
         return nTypeClass;
     }
@@ -100,7 +101,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDDataType::setFacet: caught an exception - sure this is the right data type class for this property?" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDDataType::setFacet: caught an exception - sure this is the right data type class for this property?" );
         }
     }
 
@@ -114,7 +115,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDDataType::hasFacet: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDDataType::hasFacet" );
         }
         return bReturn;
     }
@@ -128,7 +129,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDDataType::getFacet: caught an exception - sure this is the right data type class for this property?" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDDataType::getFacet: caught an exception - sure this is the right data type class for this property?" );
         }
         return aReturn;
     }
@@ -174,7 +175,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDDataType::copyFacetsFrom: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDDataType::copyFacetsFrom" );
         }
     }
 
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
index 5f34cad5415b..bf52801662d2 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
@@ -91,7 +91,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDValidationHelper::getAvailableDataTypeNames: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDValidationHelper::getAvailableDataTypeNames" );
         }
     }
 
@@ -148,7 +148,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDValidationHelper::getValidatingDataTypeName: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDValidationHelper::getValidatingDataTypeName" );
         }
         return sDataTypeName;
     }
@@ -170,7 +170,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDValidationHelper::getDataTypeByName: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDValidationHelper::getDataTypeByName" );
         }
 
         return pReturn;
@@ -205,7 +205,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDValidationHelper::cloneDataType: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDValidationHelper::cloneDataType" );
         }
         return true;
     }
@@ -230,7 +230,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDValidationHelper::removeDataTypeFromRepository: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDValidationHelper::removeDataTypeFromRepository" );
             return false;
         }
         return true;
@@ -312,7 +312,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDValidationHelper::copyDataType: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDValidationHelper::copyDataType" );
         }
     }
 
@@ -364,7 +364,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDValidationHelper::findDefaultFormatForIntrospectee: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDValidationHelper::findDefaultFormatForIntrospectee" );
         }
     }
 
@@ -391,7 +391,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "XSDValidationHelper::getBasicTypeNameForClass: caught an exception!" );
+            TOOLS_WARN_EXCEPTION( "extensions.propctrlr", "XSDValidationHelper::getBasicTypeNameForClass" );
         }
 
         return sReturn;
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 9630a9395218..23b78f30bf55 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -63,6 +63,7 @@
 #include <strings.hrc>
 #include <unotools/resmgr.hxx>
 #include <tools/urlobj.hxx>
+#include <tools/diagnose_ex.h>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
@@ -711,7 +712,7 @@ void UpdateHandler::setControlProperty( const OUString &rCtrlName,
     }
     catch( const beans::UnknownPropertyException& )
     {
-        OSL_FAIL( "UpdateHandler::setControlProperty: caught an exception!" );
+        TOOLS_WARN_EXCEPTION( "extensions.update", "UpdateHandler::setControlProperty" );
     }
 }