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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/config/evntconf.cxx | 5 | ||||
| -rw-r--r-- | sfx2/source/doc/SfxRedactionHelper.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/doc/doctemplates.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index df3803126a94..914c7515d970 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -25,6 +25,7 @@ #include <comphelper/processfactory.hxx> #include <sfx2/evntconf.hxx> #include <svl/macitem.hxx> +#include <tools/diagnose_ex.h> #include <sfx2/objsh.hxx> #include <eventsupplier.hxx> @@ -189,11 +190,11 @@ static void PropagateEvent_Impl( SfxObjectShell const *pDoc, const OUString& aEv } catch( const css::lang::IllegalArgumentException& ) { - SAL_WARN( "sfx.config", "PropagateEvents_Impl: caught IllegalArgumentException" ); + TOOLS_WARN_EXCEPTION( "sfx.config", "PropagateEvents_Impl: caught IllegalArgumentException" ); } catch( const css::container::NoSuchElementException& ) { - SAL_WARN( "sfx.config", "PropagateEvents_Impl: caught NoSuchElementException" ); + TOOLS_WARN_EXCEPTION( "sfx.config", "PropagateEvents_Impl: caught NoSuchElementException" ); } } else { diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx b/sfx2/source/doc/SfxRedactionHelper.cxx index b41f197d09d6..72a096521d17 100644 --- a/sfx2/source/doc/SfxRedactionHelper.cxx +++ b/sfx2/source/doc/SfxRedactionHelper.cxx @@ -45,6 +45,7 @@ #include <tools/gen.hxx> #include <tools/stream.hxx> +#include <tools/diagnose_ex.h> #include <vcl/gdimtf.hxx> #include <vcl/graph.hxx> @@ -294,7 +295,7 @@ void SfxRedactionHelper::showRedactionToolbar(const SfxViewFrame* pViewFrame) } catch (css::uno::Exception&) { - SAL_WARN("sfx.doc", "Exception while trying to show the Redaction Toolbar!"); + TOOLS_WARN_EXCEPTION("sfx.doc", "Exception while trying to show the Redaction Toolbar!"); } } diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index d8b9614af046..1d17dc828f84 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -961,10 +961,10 @@ bool SfxDocTplService_Impl::setProperty( Content& rContent, } catch( PropertyExistException& ) {} catch( IllegalTypeException& ) { - SAL_WARN( "sfx.doc", "IllegalTypeException" ); + TOOLS_WARN_EXCEPTION( "sfx.doc", "" ); } catch( IllegalArgumentException& ) { - SAL_WARN( "sfx.doc", "IllegalArgumentException" ); + TOOLS_WARN_EXCEPTION( "sfx.doc", "" ); } } } @@ -2308,7 +2308,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList, } catch (ContentCreationException&) { - SAL_WARN( "sfx.doc", "addHierGroup: ContentCreationException" ); + TOOLS_WARN_EXCEPTION( "sfx.doc", "" ); } catch (Exception&) {} diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 47c25433ee51..3930e451c916 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1630,9 +1630,9 @@ static bool HasSignatureStream(const uno::Reference<embed::XStorage>& xStorage) || xMetaInf->hasByName("packagesignatures.xml"); } } - catch (const css::io::IOException& rException) + catch (const css::io::IOException&) { - SAL_WARN("sfx.doc", "HasSignatureStream: failed to open META-INF: " << rException.Message); + TOOLS_WARN_EXCEPTION("sfx.doc", "HasSignatureStream: failed to open META-INF"); } } |