diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-05-29 10:46:12 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-29 11:02:46 +0100 |
commit | da6df38b4193d03143172d73006adf34b3271f7b (patch) | |
tree | 462f781cab71be36a290478ad4bd4dd3057100d6 | |
parent | c24272c7972e0cbb51e7f104e356973ecb03c352 (diff) |
Related: fdo#79392 std::out_or_range -> terminate
Change-Id: I0aada90e9ea4e9fc92fd9c365aa9c7171cb10a55
-rw-r--r-- | include/sfx2/unoctitm.hxx | 3 | ||||
-rw-r--r-- | sfx2/source/control/unoctitm.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx index 6e8d5729d8c4..97d12dacf9fe 100644 --- a/include/sfx2/unoctitm.hxx +++ b/include/sfx2/unoctitm.hxx @@ -169,7 +169,8 @@ public: void setMasterSlaveCommand( bool bSet ); void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException ); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) + throw (css::uno::RuntimeException, std::exception); void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException ); void UnBindController(); SfxDispatcher* GetDispatcher(); diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index de2dff0f119a..400063f815e6 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -593,7 +593,8 @@ OUString SfxDispatchController_Impl::getSlaveCommand( const ::com::sun::star::ut void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException ) + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( |