diff options
author | Noel <noelgrandin@gmail.com> | 2020-11-30 14:19:29 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-12-01 09:28:52 +0100 |
commit | d6d80c4e1783b4459bd4a8fbcbdfeebe416c1cb5 (patch) | |
tree | 995c41a30f4224233267a8cfb05da41ae8c10275 /forms | |
parent | 102fdc08b86599b9e538d2f38df865d56b3ec63d (diff) |
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>
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/component/Button.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/ComboBox.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/Currency.cxx | 3 | ||||
-rw-r--r-- | forms/source/component/DatabaseForm.cxx | 4 | ||||
-rw-r--r-- | forms/source/component/Grid.cxx | 3 | ||||
-rw-r--r-- | forms/source/component/ImageControl.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/clickableimage.cxx | 3 | ||||
-rw-r--r-- | forms/source/runtime/formoperations.cxx | 7 | ||||
-rw-r--r-- | forms/source/xforms/submission/submission_get.cxx | 3 | ||||
-rw-r--r-- | forms/source/xforms/submission/submission_post.cxx | 3 | ||||
-rw-r--r-- | forms/source/xforms/submission/submission_put.cxx | 3 |
11 files changed, 22 insertions, 13 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 ); } } diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 0e23b5a7ec63..e698d29f4051 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -60,6 +60,7 @@ #include <osl/mutex.hxx> #include <sal/log.hxx> #include <tools/debug.hxx> +#include <tools/diagnose_ex.h> namespace frm @@ -1053,7 +1054,7 @@ namespace frm } catch( const Exception& ) { - OSL_FAIL( "FormOperations::propertyChange: caught an exception while updating the parser!" ); + TOOLS_WARN_EXCEPTION( "forms.runtime", "FormOperations::propertyChange: caught an exception while updating the parser!" ); } impl_invalidateAllSupportedFeatures_nothrow( aGuard ); } @@ -1561,7 +1562,7 @@ namespace frm } catch( const Exception& ) { - OSL_FAIL( "FormOperations::impl_executeAutoSort_throw: caught an exception while setting the parser properties!" ); + TOOLS_WARN_EXCEPTION( "forms.runtime", "FormOperations::impl_executeAutoSort_throw: caught an exception while setting the parser properties!" ); } @@ -1635,7 +1636,7 @@ namespace frm } catch( const Exception& ) { - OSL_FAIL( "FormOperations::impl_executeAutoFilter_throw: caught an exception while setting the parser properties!" ); + TOOLS_WARN_EXCEPTION( "forms.runtime", "FormOperations::impl_executeAutoFilter_throw: caught an exception while setting the parser properties!" ); } diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index 4939497ec7b9..394c8b817486 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -26,6 +26,7 @@ #include <ucbhelper/content.hxx> #include <com/sun/star/io/Pipe.hpp> #include <com/sun/star/task/InteractionHandler.hpp> +#include <tools/diagnose_ex.h> #include <memory> @@ -95,7 +96,7 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const css::uno::Reference< } catch (const Exception&) { // XXX - OSL_FAIL("Exception during UCB operatration."); + TOOLS_WARN_EXCEPTION( "forms.misc", "Exception during UCB operation."); return UNKNOWN_ERROR; } diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx index ab545e7f6799..b945fdd07b63 100644 --- a/forms/source/xforms/submission/submission_post.cxx +++ b/forms/source/xforms/submission/submission_post.cxx @@ -26,6 +26,7 @@ #include <ucbhelper/content.hxx> #include <ucbhelper/activedatasink.hxx> #include <com/sun/star/ucb/PostCommandArgument2.hpp> +#include <tools/diagnose_ex.h> using namespace css::uno; using namespace css::ucb; @@ -68,7 +69,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const css::uno::Reference< } } catch (const Exception&) { - OSL_FAIL("Exception during UCB operatration."); + TOOLS_WARN_EXCEPTION( "forms.misc", "Exception during UCB operation."); return UNKNOWN_ERROR; } diff --git a/forms/source/xforms/submission/submission_put.cxx b/forms/source/xforms/submission/submission_put.cxx index 030eb589caa9..f3f94fafa256 100644 --- a/forms/source/xforms/submission/submission_put.cxx +++ b/forms/source/xforms/submission/submission_put.cxx @@ -25,6 +25,7 @@ #include <comphelper/processfactory.hxx> #include <osl/diagnose.h> #include <ucbhelper/content.hxx> +#include <tools/diagnose_ex.h> using namespace css::uno; using namespace css::ucb; @@ -57,7 +58,7 @@ CSubmission::SubmissionResult CSubmissionPut::submit(const css::uno::Reference< } catch ( const Exception& ) { - OSL_FAIL( "Exception during UCB operation." ); + TOOLS_WARN_EXCEPTION( "forms.misc", "Exception during UCB operation." ); return UNKNOWN_ERROR; } |