Skip to content

C
core
Kaydet (Commit) 56c4dbe5 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

cid#707147 Uncaught exception 

Change-Id: Ie49e70c3fa7704727129e613814aaf559d1a7fb6
üst 437a1f39
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
sfx2/source/appl/macroloader.cxx
Dosyayı görüntüle @ 56c4dbe5
...@@ -188,7 +188,7 @@ void SAL_CALL SfxMacroLoader::removeStatusListener( ...@@ -188,7 +188,7 @@ void SAL_CALL SfxMacroLoader::removeStatusListener(
} }
ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::Any& rRetval, SfxObjectShell* pSh ) 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 #ifdef DISABLE_SCRIPTING
(void) rURL; (void) rURL;
......
sfx2/source/inc/macroloader.hxx
Dosyayı görüntüle @ 56c4dbe5
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <com/sun/star/frame/XDispatchResultListener.hpp> #include <com/sun/star/frame/XDispatchResultListener.hpp>
#include <com/sun/star/frame/XSynchronousDispatch.hpp> #include <com/sun/star/frame/XSynchronousDispatch.hpp>
#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/ucb/ContentCreationException.hpp>
#include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/URL.hpp>
#include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase4.hxx>
...@@ -62,7 +63,7 @@ public: ...@@ -62,7 +63,7 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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( virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch(
const css::util::URL& aURL, const OUString& sTargetFrameName, const css::util::URL& aURL, const OUString& sTargetFrameName,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment