diff options
author | Noel Grandin <noel@peralex.com> | 2014-05-27 09:48:15 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-27 10:50:04 +0200 |
commit | 56c4dbe523bd7c0d30f7d7590ac8eaf519e8490d (patch) | |
tree | 952ab67d78779bea619edb6a3096d21d932d5602 | |
parent | 437a1f3925998a56d15f874358cca31552943225 (diff) |
cid#707147 Uncaught exception
Change-Id: Ie49e70c3fa7704727129e613814aaf559d1a7fb6
-rw-r--r-- | sfx2/source/appl/macroloader.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/macroloader.hxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index 3560779e0794..f51b7a0781e1 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -188,7 +188,7 @@ void SAL_CALL SfxMacroLoader::removeStatusListener( } ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::Any& rRetval, SfxObjectShell* pSh ) - throw ( uno::RuntimeException ) + throw ( ucb::ContentCreationException, uno::RuntimeException ) { #ifdef DISABLE_SCRIPTING (void) rURL; diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx index 6c729eeccbc5..2cfa7eded60a 100644 --- a/sfx2/source/inc/macroloader.hxx +++ b/sfx2/source/inc/macroloader.hxx @@ -32,6 +32,7 @@ #include <com/sun/star/frame/XDispatchResultListener.hpp> #include <com/sun/star/frame/XSynchronousDispatch.hpp> #include <com/sun/star/uno/Exception.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/util/URL.hpp> #include <cppuhelper/implbase4.hxx> @@ -62,7 +63,7 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static ErrCode loadMacro( const OUString& aURL, css::uno::Any& rRetval, SfxObjectShell* pDoc=NULL ) throw( css::uno::RuntimeException ); + static ErrCode loadMacro( const OUString& aURL, css::uno::Any& rRetval, SfxObjectShell* pDoc=NULL ) throw( css::uno::RuntimeException, css::ucb::ContentCreationException ); virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName, |