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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/dialogs/showcols.cxx | 6 | ||||
| -rw-r--r-- | cui/source/options/optasian.cxx | 7 | ||||
| -rw-r--r-- | cui/source/options/sdbcdriverenum.cxx | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 6c92d00fc6b2..a567a84010dc 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/types.hxx> #include <tools/debug.hxx> +#include <tools/diagnose_ex.h> #define CUIFM_PROP_HIDDEN "Hidden" #define CUIFM_PROP_LABEL "Label" @@ -60,7 +61,8 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk, weld::Button&, void) } catch (...) { - OSL_FAIL("FmShowColsDialog::OnClickedOk Exception occurred!"); + TOOLS_WARN_EXCEPTION("cui.dialogs", + "FmShowColsDialog::OnClickedOk Exception occurred!"); } } } @@ -96,7 +98,7 @@ void FmShowColsDialog::SetColumns(const css::uno::Reference<css::container::XInd } catch (...) { - OSL_FAIL("FmShowColsDialog::SetColumns Exception occurred!"); + TOOLS_WARN_EXCEPTION("cui.dialogs", "FmShowColsDialog::SetColumns Exception occurred!"); } // if the col is hidden, put it into the list diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 3e09e3779b81..1daf56dbb64b 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -22,6 +22,7 @@ #include <optasian.hxx> #include <osl/diagnose.h> #include <tools/debug.hxx> +#include <tools/diagnose_ex.h> #include <o3tl/any.hxx> #include <i18nlangtag/mslangid.hxx> #include <svl/asiancfg.hxx> @@ -183,7 +184,7 @@ bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* ) } catch (const Exception&) { - OSL_FAIL("exception in XForbiddenCharacters"); + TOOLS_WARN_EXCEPTION( "cui.options", "in XForbiddenCharacters"); } } eLastUsedLanguageTypeForForbiddenCharacters = m_xLanguageLB->get_active_id(); @@ -310,7 +311,7 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl, weld::ComboBox&, void) } catch (const Exception&) { - OSL_FAIL("exception in XForbiddenCharacters"); + TOOLS_WARN_EXCEPTION( "cui.options", "in XForbiddenCharacters"); } } } @@ -368,7 +369,7 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, weld::Entry&, rEdit, void) } catch (const Exception&) { - OSL_FAIL("exception in XForbiddenCharacters"); + TOOLS_WARN_EXCEPTION( "cui.options", "in XForbiddenCharacters"); } } pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : nullptr, bEnable ? &sEnd : nullptr); diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index 1370c93c254f..f6a0cf3ad1ee 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -20,6 +20,7 @@ #include "sdbcdriverenum.hxx" #include <comphelper/processfactory.hxx> #include <osl/diagnose.h> +#include <tools/diagnose_ex.h> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbc/DriverManager.hpp> @@ -66,7 +67,7 @@ namespace offapp } catch(const Exception&) { - OSL_FAIL("ODriverEnumerationImpl::ODriverEnumerationImpl: caught an exception while enumerating the drivers!"); + TOOLS_WARN_EXCEPTION( "cui.options", "ODriverEnumerationImpl::ODriverEnumerationImpl: caught an exception while enumerating the drivers!"); } } |