diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-02 16:27:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-03 08:13:29 +0200 |
| commit | 547b1d054162a73d49a828bed140ab8671da2ff8 (patch) | |
| tree | d1e2f14c39440d678ba27cb5bd52ab91e8e499d0 /cui | |
| parent | 1f40a488fcf95f90fdd18c41ef7041d475cf08a2 (diff) | |
use more TOOLS_WARN_EXCEPTION
Change-Id: I8b5cde993c13e0b7c8c830b1ff698933a6b7cfd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103863
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/dialogs/AdditionsDialog.cxx | 17 | ||||
| -rw-r--r-- | cui/source/dialogs/insdlg.cxx | 3 |
3 files changed, 12 insertions, 10 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 5418c4a9de7e..dd3c5645e7e7 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2030,7 +2030,7 @@ void ToolbarSaveInData::SetSystemStyle( catch ( uno::Exception& ) { // do nothing, a default value is returned - SAL_WARN("cui.customize", "Exception setting toolbar style"); + TOOLS_WARN_EXCEPTION("cui.customize", "Exception setting toolbar style"); } } diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx index c9b70b2bf908..dd33d2c24782 100644 --- a/cui/source/dialogs/AdditionsDialog.cxx +++ b/cui/source/dialogs/AdditionsDialog.cxx @@ -20,6 +20,7 @@ #include <rtl/bootstrap.hxx> #include <tools/urlobj.hxx> #include <tools/stream.hxx> +#include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> @@ -529,15 +530,15 @@ AdditionsDialog::getInstalledExtensions() } catch (const deployment::DeploymentException&) { - SAL_WARN("cui.dialogs", "Deployment Exception"); + TOOLS_WARN_EXCEPTION("cui.dialogs", ""); } catch (const ucb::CommandFailedException&) { - SAL_WARN("cui.dialogs", "Command Failed Exception"); + TOOLS_WARN_EXCEPTION("cui.dialogs", ""); } catch (const ucb::CommandAbortedException&) { - SAL_WARN("cui.dialogs", "Command Aborted Exception"); + TOOLS_WARN_EXCEPTION("cui.dialogs", ""); } catch (const lang::IllegalArgumentException& e) { @@ -783,31 +784,31 @@ IMPL_LINK_NOARG(AdditionsItem, InstallHdl, weld::Button&, void) } catch (const ucb::CommandFailedException) { - SAL_WARN("cui.dialogs", "Additions: addExtension CommandFailedException occurred."); + TOOLS_WARN_EXCEPTION("cui.dialogs", ""); m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON)); m_xButtonInstall->set_sensitive(true); } catch (const ucb::CommandAbortedException) { - SAL_WARN("cui.dialogs", "Additions: addExtension CommandAbortedException occurred."); + TOOLS_WARN_EXCEPTION("cui.dialogs", ""); m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON)); m_xButtonInstall->set_sensitive(true); } catch (const deployment::DeploymentException) { - SAL_WARN("cui.dialogs", "Additions: addExtension DeploymentException occurred."); + TOOLS_WARN_EXCEPTION("cui.dialogs", ""); m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON)); m_xButtonInstall->set_sensitive(true); } catch (const lang::IllegalArgumentException) { - SAL_WARN("cui.dialogs", "Additions: addExtension IllegalArgumentException occurred."); + TOOLS_WARN_EXCEPTION("cui.dialogs", ""); m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON)); m_xButtonInstall->set_sensitive(true); } catch (const css::uno::Exception) { - SAL_WARN("cui.dialogs", "Additions: addExtension Exception occurred."); + TOOLS_WARN_EXCEPTION("cui.dialogs", ""); m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON)); m_xButtonInstall->set_sensitive(true); } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index dd89d0174774..f1752922e066 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -40,6 +40,7 @@ #include <tools/urlobj.hxx> #include <tools/debug.hxx> #include <tools/stream.hxx> +#include <tools/diagnose_ex.h> #include <vcl/image.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> @@ -94,7 +95,7 @@ IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl, weld::Button&, void) } catch( const IllegalArgumentException& ) { - SAL_WARN( "cui.dialogs", "caught IllegalArgumentException when registering filter" ); + TOOLS_WARN_EXCEPTION("cui.dialogs", "caught IllegalArgumentException when registering filter" ); } if( xFilePicker->execute() == ExecutableDialogResults::OK ) |