diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-25 10:42:53 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-07-06 20:29:11 +0100 |
| commit | 5f26c0fb0def153311bb630d1c09cbe38437a8c6 (patch) | |
| tree | eec3624b7c776481e675764a2f0b0cb4fcb280ee /sfx2/source/notify | |
| parent | e70c4a279c2a8f93d917c0a43fc39ac017ecc463 (diff) | |
gridfixes: don't be too generous with exceptions:
avoid where possible (by checking beforehand), and assert when caught
Conflicts:
framework/source/fwe/classes/framelistanalyzer.cxx
framework/source/helper/titlebarupdate.cxx
framework/source/services/frame.cxx
framework/source/uifactory/windowcontentfactorymanager.cxx
sfx2/source/notify/eventsupplier.cxx
Diffstat (limited to 'sfx2/source/notify')
| -rw-r--r-- | sfx2/source/notify/eventsupplier.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 9a4f534a9fdd..9fabe86a2b71 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <tools/urlobj.hxx> +#include <tools/diagnose_ex.h> #include <svl/macitem.hxx> #include <sfx2/appuno.hxx> #include <sfx2/objsh.hxx> @@ -821,14 +822,18 @@ void SfxGlobalEvents_Impl::implts_checkAndExecuteEventBindings(const css::docume // <- SAFE css::uno::Any aAny; - if (xEvents.is()) + if ( xEvents.is() && xEvents->hasByName( aEvent.EventName ) ) aAny = xEvents->getByName(aEvent.EventName); Execute(aAny, aEvent, 0); } - catch(const css::uno::RuntimeException&) - { throw; } - catch(const css::uno::Exception&) - {} + catch ( css::uno::RuntimeException const & ) + { + throw; + } + catch ( css::uno::Exception const & ) + { + DBG_UNHANDLED_EXCEPTION(); + } } //----------------------------------------------------------------------------- |