diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
| commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
| tree | d4451246461346a425ad6f796e08bf1514cdd942 /sfx2 | |
| parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) | |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'sfx2')
68 files changed, 1072 insertions, 1072 deletions
diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx index e2615e461603..4c912d7a233d 100644 --- a/sfx2/source/appl/appdispatchprovider.cxx +++ b/sfx2/source/appl/appdispatchprovider.cxx @@ -69,36 +69,36 @@ public: virtual void SAL_CALL initialize( css::uno::Sequence<css::uno::Any> const & aArguments) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName, FrameSearchFlags eSearchFlags ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); virtual css::uno::Sequence< css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescriptor ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); }; void SfxAppDispatchProvider::initialize( css::uno::Sequence<css::uno::Any> const & aArguments) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { css::uno::Reference<css::frame::XFrame> f; if (aArguments.getLength() != 1 || !(aArguments[0] >>= f)) { @@ -109,17 +109,17 @@ void SfxAppDispatchProvider::initialize( m_xFrame = f; } -OUString SAL_CALL SfxAppDispatchProvider::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL SfxAppDispatchProvider::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.sfx2.AppDispatchProvider" ); } -sal_Bool SAL_CALL SfxAppDispatchProvider::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL SfxAppDispatchProvider::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } -css::uno::Sequence< OUString > SAL_CALL SfxAppDispatchProvider::getSupportedServiceNames() throw( css::uno::RuntimeException ) +css::uno::Sequence< OUString > SAL_CALL SfxAppDispatchProvider::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { css::uno::Sequence< OUString > seqServiceNames( 2 ); seqServiceNames.getArray()[0] = "com.sun.star.frame.DispatchProvider"; @@ -130,7 +130,7 @@ css::uno::Sequence< OUString > SAL_CALL SfxAppDispatchProvider::getSupportedServ Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch( const util::URL& aURL, const OUString& /*sTargetFrameName*/, - FrameSearchFlags /*eSearchFlags*/ ) throw( RuntimeException ) + FrameSearchFlags /*eSearchFlags*/ ) throw( RuntimeException, std::exception ) { sal_uInt16 nId( 0 ); sal_Bool bMasterCommand( sal_False ); @@ -165,7 +165,7 @@ Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch( } Sequence< Reference < XDispatch > > SAL_CALL SfxAppDispatchProvider::queryDispatches( const Sequence < DispatchDescriptor >& seqDescriptor ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { sal_Int32 nCount = seqDescriptor.getLength(); uno::Sequence< uno::Reference < frame::XDispatch > > lDispatcher(nCount); @@ -177,7 +177,7 @@ throw( RuntimeException ) } Sequence< sal_Int16 > SAL_CALL SfxAppDispatchProvider::getSupportedCommandGroups() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -210,7 +210,7 @@ throw (uno::RuntimeException) } Sequence< frame::DispatchInformation > SAL_CALL SfxAppDispatchProvider::getConfigurableDispatchInformation( sal_Int16 nCmdGroup ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { std::list< frame::DispatchInformation > aCmdList; diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 48b55e60cb8a..3d9a8c3036c5 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -76,28 +76,28 @@ class SfxTerminateListener_Impl : public ::cppu::WeakImplHelper2< XTerminateList public: // XTerminateListener - virtual void SAL_CALL queryTermination( const EventObject& aEvent ) throw( TerminationVetoException, RuntimeException ); - virtual void SAL_CALL notifyTermination( const EventObject& aEvent ) throw( RuntimeException ); - virtual void SAL_CALL disposing( const EventObject& Source ) throw( RuntimeException ); + virtual void SAL_CALL queryTermination( const EventObject& aEvent ) throw( TerminationVetoException, RuntimeException, std::exception ); + virtual void SAL_CALL notifyTermination( const EventObject& aEvent ) throw( RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const EventObject& Source ) throw( RuntimeException, std::exception ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception); }; -void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& ) throw( RuntimeException ) +void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } -void SAL_CALL SfxTerminateListener_Impl::queryTermination( const EventObject& ) throw(TerminationVetoException, RuntimeException ) +void SAL_CALL SfxTerminateListener_Impl::queryTermination( const EventObject& ) throw(TerminationVetoException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; if ( !SFX_APP()->QueryExit_Impl() ) throw TerminationVetoException(); } -void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& aEvent ) throw(RuntimeException ) +void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& aEvent ) throw(RuntimeException, std::exception ) { Reference< XDesktop > xDesktop( aEvent.Source, UNO_QUERY ); if( xDesktop.is() ) @@ -122,17 +122,17 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a Application::Quit(); } -OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName() throw (RuntimeException) +OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName() throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.sfx2.SfxTerminateListener"); } -::sal_Bool SAL_CALL SfxTerminateListener_Impl::supportsService( const OUString& sServiceName ) throw (RuntimeException) +::sal_Bool SAL_CALL SfxTerminateListener_Impl::supportsService( const OUString& sServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceNames() throw (RuntimeException, std::exception) { // Note: That service does not really exists .-) // But this implementation is not thought to be registered really within our service.rdb. diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index acc08d8a0f8e..33f0aec31456 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -120,21 +120,21 @@ class SfxOpenDocStatusListener_Impl : public WeakImplHelper1< XDispatchResultLis public: sal_Bool bFinished; sal_Bool bSuccess; - virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& Event ) throw(RuntimeException); - virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException); + virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& Event ) throw(RuntimeException, std::exception); + virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException, std::exception); SfxOpenDocStatusListener_Impl() : bFinished( sal_False ) , bSuccess( sal_False ) {} }; -void SAL_CALL SfxOpenDocStatusListener_Impl::dispatchFinished( const DispatchResultEvent& aEvent ) throw(RuntimeException) +void SAL_CALL SfxOpenDocStatusListener_Impl::dispatchFinished( const DispatchResultEvent& aEvent ) throw(RuntimeException, std::exception) { bSuccess = ( aEvent.State == DispatchResultState::SUCCESS ); bFinished = sal_True; } -void SAL_CALL SfxOpenDocStatusListener_Impl::disposing( const EventObject& ) throw(RuntimeException) +void SAL_CALL SfxOpenDocStatusListener_Impl::disposing( const EventObject& ) throw(RuntimeException, std::exception) { } diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 59a4a354698a..fe6a1ca0d5df 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -1664,14 +1664,14 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b void SAL_CALL FilterOptionsContinuation::setFilterOptions( const uno::Sequence<beans::PropertyValue>& rProps ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { rProperties = rProps; } uno::Sequence< beans::PropertyValue > SAL_CALL FilterOptionsContinuation::getFilterOptions() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return rProperties; } @@ -1699,14 +1699,14 @@ RequestFilterOptions::RequestFilterOptions( uno::Reference< frame::XModel > rMod } uno::Any SAL_CALL RequestFilterOptions::getRequest() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aRequest; } uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL RequestFilterOptions::getContinuations() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_lContinuations; } @@ -1722,9 +1722,9 @@ class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper1< task::XInt public: RequestPackageReparation_Impl( OUString aName ); sal_Bool isApproved(); - virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException ); + virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ); virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() - throw( uno::RuntimeException ); + throw( uno::RuntimeException, std::exception ); }; RequestPackageReparation_Impl::RequestPackageReparation_Impl( OUString aName ) @@ -1748,14 +1748,14 @@ sal_Bool RequestPackageReparation_Impl::isApproved() } uno::Any SAL_CALL RequestPackageReparation_Impl::getRequest() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aRequest; } uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL RequestPackageReparation_Impl::getContinuations() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_lContinuations; } @@ -1790,9 +1790,9 @@ class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper1< task::XInteract public: NotifyBrokenPackage_Impl( OUString aName ); - virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException ); + virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ); virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() - throw( uno::RuntimeException ); + throw( uno::RuntimeException, std::exception ); }; NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( OUString aName ) @@ -1809,14 +1809,14 @@ NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( OUString aName ) } uno::Any SAL_CALL NotifyBrokenPackage_Impl::getRequest() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aRequest; } uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL NotifyBrokenPackage_Impl::getContinuations() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_lContinuations; } diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index b4f01aa40891..74c753476ad8 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -67,7 +67,7 @@ class DisposeListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang:: , m_pData ( pData ) {} - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aSource ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xSelfHold( this ); diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx index e837e7864a60..f9fd4f7bd565 100644 --- a/sfx2/source/appl/helpdispatch.cxx +++ b/sfx2/source/appl/helpdispatch.cxx @@ -52,7 +52,7 @@ HelpDispatch_Impl::~HelpDispatch_Impl() void SAL_CALL HelpDispatch_Impl::dispatch( - const URL& aURL, const Sequence< PropertyValue >& aArgs ) throw( RuntimeException ) + const URL& aURL, const Sequence< PropertyValue >& aArgs ) throw( RuntimeException, std::exception ) { DBG_ASSERT( m_xRealDispatch.is(), "invalid dispatch" ); @@ -92,7 +92,7 @@ void SAL_CALL HelpDispatch_Impl::dispatch( void SAL_CALL HelpDispatch_Impl::addStatusListener( - const Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException ) + const Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException, std::exception ) { DBG_ASSERT( m_xRealDispatch.is(), "invalid dispatch" ); @@ -103,7 +103,7 @@ void SAL_CALL HelpDispatch_Impl::addStatusListener( void SAL_CALL HelpDispatch_Impl::removeStatusListener( - const Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException ) + const Reference< XStatusListener >& xControl, const URL& aURL ) throw( RuntimeException, std::exception ) { DBG_ASSERT( m_xRealDispatch.is(), "invalid dispatch" ); diff --git a/sfx2/source/appl/helpdispatch.hxx b/sfx2/source/appl/helpdispatch.hxx index f7c13215f970..40904593853b 100644 --- a/sfx2/source/appl/helpdispatch.hxx +++ b/sfx2/source/appl/helpdispatch.hxx @@ -37,9 +37,9 @@ public: ~HelpDispatch_Impl(); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException); - virtual 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); - virtual void SAL_CALL removeStatusListener( 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); + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual 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, std::exception); + virtual void SAL_CALL removeStatusListener( 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, std::exception); }; #endif // #ifndef SFX_HELPDISPATCHER_HXX diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index 9316482c044e..44aef3bd99c7 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -136,7 +136,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference< XDispatch > xResult; @@ -161,7 +161,7 @@ Sequence < Reference < XDispatch > > SAL_CALL HelpInterceptor_Impl::queryDispatc const Sequence< DispatchDescriptor >& aDescripts ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Sequence< Reference< XDispatch > > aReturn( aDescripts.getLength() ); @@ -179,7 +179,7 @@ Sequence < Reference < XDispatch > > SAL_CALL HelpInterceptor_Impl::queryDispatc Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getSlaveDispatchProvider() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return m_xSlaveDispatcher; @@ -189,7 +189,7 @@ Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getSlaveDispatchPr void SAL_CALL HelpInterceptor_Impl::setSlaveDispatchProvider( const Reference< XDispatchProvider >& xNewSlave ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { m_xSlaveDispatcher = xNewSlave; @@ -199,7 +199,7 @@ void SAL_CALL HelpInterceptor_Impl::setSlaveDispatchProvider( const Reference< X Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getMasterDispatchProvider() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return m_xMasterDispatcher; @@ -209,7 +209,7 @@ Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getMasterDispatchP void SAL_CALL HelpInterceptor_Impl::setMasterDispatchProvider( const Reference< XDispatchProvider >& xNewMaster ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { m_xMasterDispatcher = xNewMaster; @@ -220,7 +220,7 @@ void SAL_CALL HelpInterceptor_Impl::setMasterDispatchProvider( const Reference< Sequence< OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Sequence< OUString > aURLList( 1 ); @@ -232,7 +232,7 @@ Sequence< OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs() // XDispatch void SAL_CALL HelpInterceptor_Impl::dispatch( - const URL& aURL, const Sequence< ::com::sun::star::beans::PropertyValue >& ) throw( RuntimeException ) + const URL& aURL, const Sequence< ::com::sun::star::beans::PropertyValue >& ) throw( RuntimeException, std::exception ) { sal_Bool bBack = ( OUString( ".uno:Backward" ) == aURL.Complete ); if ( bBack || OUString( ".uno:Forward" ) == aURL.Complete ) @@ -271,7 +271,7 @@ void SAL_CALL HelpInterceptor_Impl::dispatch( void SAL_CALL HelpInterceptor_Impl::addStatusListener( - const Reference< XStatusListener >& xControl, const URL& ) throw( RuntimeException ) + const Reference< XStatusListener >& xControl, const URL& ) throw( RuntimeException, std::exception ) { DBG_ASSERT( !m_xListener.is(), "listener already exists" ); m_xListener = xControl; @@ -280,7 +280,7 @@ void SAL_CALL HelpInterceptor_Impl::addStatusListener( void SAL_CALL HelpInterceptor_Impl::removeStatusListener( - const Reference< XStatusListener >&, const URL&) throw( RuntimeException ) + const Reference< XStatusListener >&, const URL&) throw( RuntimeException, std::exception ) { m_xListener = 0; } @@ -297,7 +297,7 @@ HelpListener_Impl::HelpListener_Impl( HelpInterceptor_Impl* pInter ) void SAL_CALL HelpListener_Impl::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { INetURLObject aObj( Event.FeatureURL.Complete ); @@ -309,7 +309,7 @@ void SAL_CALL HelpListener_Impl::statusChanged( const ::com::sun::star::frame::F void SAL_CALL HelpListener_Impl::disposing( const ::com::sun::star::lang::EventObject& ) - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { pInterceptor->removeStatusListener( this, ::com::sun::star::util::URL() ); @@ -329,12 +329,12 @@ HelpStatusListener_Impl::~HelpStatusListener_Impl() } void HelpStatusListener_Impl::statusChanged( - const FeatureStateEvent& rEvent ) throw( RuntimeException ) + const FeatureStateEvent& rEvent ) throw( RuntimeException, std::exception ) { aStateEvent = rEvent; } -void HelpStatusListener_Impl::disposing( const EventObject& ) throw( RuntimeException ) +void HelpStatusListener_Impl::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { xDispatch->removeStatusListener(this, com::sun::star::util::URL()); xDispatch = 0; diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx index 7b0ec31bb37b..7cdefe3d146e 100644 --- a/sfx2/source/appl/helpinterceptor.hxx +++ b/sfx2/source/appl/helpinterceptor.hxx @@ -86,26 +86,26 @@ public: // XDispatchProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL - queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); + queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL - queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException); + queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XDispatchProviderInterceptor virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL - getSlaveDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSlave ) throw(::com::sun::star::uno::RuntimeException); + getSlaveDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSlave ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL - getMasterDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMaster ) throw(::com::sun::star::uno::RuntimeException); + getMasterDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMaster ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XInterceptorInfo virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getInterceptedURLs( ) throw(::com::sun::star::uno::RuntimeException); + getInterceptedURLs( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException); - virtual 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); - virtual void SAL_CALL removeStatusListener( 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); + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual 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, std::exception); + virtual void SAL_CALL removeStatusListener( 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, std::exception); // extras void InitWaiter( SfxHelpWindow_Impl* pWindow ) @@ -126,9 +126,9 @@ public: HelpListener_Impl( HelpInterceptor_Impl* pInter ); virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& obj ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); void SetChangeHdl( const Link& rLink ) { aChangeLink = rLink; } OUString GetFactory() const { return aFactory; } @@ -149,9 +149,9 @@ public: ~HelpStatusListener_Impl(); virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& obj ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); const ::com::sun::star::frame::FeatureStateEvent& GetStateEvent() const {return aStateEvent;} }; diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index 453a3d1cf5d0..d940fedc9659 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -59,7 +59,7 @@ class WeakPropertyChangeListener : public ::cppu::WeakImplHelper1<com::sun::star } virtual void SAL_CALL propertyChange(const com::sun::star::beans::PropertyChangeEvent &rEvent ) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> xOwner(mxOwner.get(), com::sun::star::uno::UNO_QUERY); @@ -70,7 +70,7 @@ class WeakPropertyChangeListener : public ::cppu::WeakImplHelper1<com::sun::star // lang.XEventListener virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> xOwner(mxOwner.get(), com::sun::star::uno::UNO_QUERY); @@ -172,7 +172,7 @@ ImeStatusWindow::~ImeStatusWindow() } void SAL_CALL ImeStatusWindow::disposing(css::lang::EventObject const & ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(m_aMutex); m_xConfig = 0; @@ -181,7 +181,7 @@ void SAL_CALL ImeStatusWindow::disposing(css::lang::EventObject const & ) void SAL_CALL ImeStatusWindow::propertyChange(css::beans::PropertyChangeEvent const & ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SfxApplication* pApp = SfxApplication::Get(); diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx index 70b21897735f..acc03718ff51 100644 --- a/sfx2/source/appl/imestatuswindow.hxx +++ b/sfx2/source/appl/imestatuswindow.hxx @@ -95,11 +95,11 @@ private: virtual void SAL_CALL disposing(com::sun::star::lang::EventObject const & rSource) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL propertyChange(com::sun::star::beans::PropertyChangeEvent const & rEvent) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > getConfig(); diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx index cdef54c4de66..4f9779c232b4 100644 --- a/sfx2/source/appl/macroloader.cxx +++ b/sfx2/source/appl/macroloader.cxx @@ -58,19 +58,19 @@ SfxMacroLoader::SfxMacroLoader(const css::uno::Sequence< css::uno::Any >& aArgum } OUString SAL_CALL SfxMacroLoader::getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.sfx2.SfxMacroLoader"); } sal_Bool SAL_CALL SfxMacroLoader::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> SAL_CALL SfxMacroLoader::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.ProtocolHandler"); @@ -101,7 +101,7 @@ SfxObjectShell* SfxMacroLoader::GetObjectShell_Impl() uno::Reference<frame::XDispatch> SAL_CALL SfxMacroLoader::queryDispatch( const util::URL& aURL , const OUString& /*sTargetFrameName*/, - sal_Int32 /*nSearchFlags*/ ) throw( uno::RuntimeException ) + sal_Int32 /*nSearchFlags*/ ) throw( uno::RuntimeException, std::exception ) { uno::Reference<frame::XDispatch> xDispatcher; if(aURL.Complete.startsWith("macro:")) @@ -112,7 +112,7 @@ uno::Reference<frame::XDispatch> SAL_CALL SfxMacroLoader::queryDispatch( uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL SfxMacroLoader::queryDispatches( const uno::Sequence < frame::DispatchDescriptor >& seqDescriptor ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { sal_Int32 nCount = seqDescriptor.getLength(); uno::Sequence< uno::Reference<frame::XDispatch> > lDispatcher(nCount); @@ -127,7 +127,7 @@ uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL void SAL_CALL SfxMacroLoader::dispatchWithNotification( const util::URL& aURL, const uno::Sequence<beans::PropertyValue>& /*lArgs*/, const uno::Reference<frame::XDispatchResultListener>& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -151,7 +151,7 @@ void SAL_CALL SfxMacroLoader::dispatchWithNotification( uno::Any SAL_CALL SfxMacroLoader::dispatchWithReturnValue( const util::URL& aURL, const uno::Sequence<beans::PropertyValue>& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Any aRet; loadMacro( aURL.Complete, aRet, GetObjectShell_Impl() ); @@ -160,7 +160,7 @@ uno::Any SAL_CALL SfxMacroLoader::dispatchWithReturnValue( void SAL_CALL SfxMacroLoader::dispatch( const util::URL& aURL, const uno::Sequence<beans::PropertyValue>& /*lArgs*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -171,7 +171,7 @@ void SAL_CALL SfxMacroLoader::dispatch( void SAL_CALL SfxMacroLoader::addStatusListener( const uno::Reference< frame::XStatusListener >& , const util::URL& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { /* TODO How we can handle different listener for further coming or currently running dispatch() jobs @@ -183,7 +183,7 @@ void SAL_CALL SfxMacroLoader::addStatusListener( void SAL_CALL SfxMacroLoader::removeStatusListener( const uno::Reference< frame::XStatusListener >&, const util::URL& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index fa751c63f82f..aeb695914306 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -68,7 +68,7 @@ class StringLength : public ::cppu::WeakImplHelper1< XStringWidth > // XStringWidth sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return aString.getLength(); } diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index f72f6a637a4f..524fdd209b24 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -87,33 +87,33 @@ extern "C" { static void SAL_CALL thisModule() {} } class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener > { public: - virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& aEvent ) throw( RuntimeException ); - virtual void SAL_CALL disposing( const EventObject& aEvent ) throw( RuntimeException ); + virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& aEvent ) throw( RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const EventObject& aEvent ) throw( RuntimeException, std::exception ); }; -void SAL_CALL SfxNotificationListener_Impl::dispatchFinished( const DispatchResultEvent& ) throw( RuntimeException ) +void SAL_CALL SfxNotificationListener_Impl::dispatchFinished( const DispatchResultEvent& ) throw( RuntimeException, std::exception ) { ShutdownIcon::LeaveModalMode(); } -void SAL_CALL SfxNotificationListener_Impl::disposing( const EventObject& ) throw( RuntimeException ) +void SAL_CALL SfxNotificationListener_Impl::disposing( const EventObject& ) throw( RuntimeException, std::exception ) { } OUString SAL_CALL ShutdownIcon::getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.desktop.QuickstartWrapper"); } sal_Bool SAL_CALL ShutdownIcon::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence<OUString> SAL_CALL ShutdownIcon::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.office.Quickstart"); @@ -671,7 +671,7 @@ void SAL_CALL ShutdownIcon::disposing() // XEventListener void SAL_CALL ShutdownIcon::disposing( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { } @@ -679,7 +679,7 @@ void SAL_CALL ShutdownIcon::disposing( const ::com::sun::star::lang::EventObject // XTerminateListener void SAL_CALL ShutdownIcon::queryTermination( const ::com::sun::star::lang::EventObject& ) -throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException) +throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO("sfx.appl", "ShutdownIcon::queryTermination: veto is " << m_bVeto); ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -692,7 +692,7 @@ throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno:: void SAL_CALL ShutdownIcon::notifyTermination( const ::com::sun::star::lang::EventObject& ) -throw(::com::sun::star::uno::RuntimeException) +throw(::com::sun::star::uno::RuntimeException, std::exception) { } @@ -700,7 +700,7 @@ throw(::com::sun::star::uno::RuntimeException) void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments ) - throw( ::com::sun::star::uno::Exception ) + throw( ::com::sun::star::uno::Exception, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -926,7 +926,7 @@ void SAL_CALL ShutdownIcon::setFastPropertyValue( ::sal_Int32 ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { switch(nHandle) { @@ -952,7 +952,7 @@ void SAL_CALL ShutdownIcon::setFastPropertyValue( ::sal_Int32 ::com::sun::star::uno::Any SAL_CALL ShutdownIcon::getFastPropertyValue( ::sal_Int32 nHandle ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Any aValue; switch(nHandle) diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index 43a746ccbeac..ed0bef28411c 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -92,13 +92,13 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase virtual ~ShutdownIcon(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); static ShutdownIcon* getInstance(); static ShutdownIcon* createInstance(); @@ -134,17 +134,17 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XTerminateListener virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception, std::exception ); // XFastPropertySet virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, @@ -153,11 +153,11 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop2 > m_xDesktop; diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index fac78faacc5f..fbba20c3066c 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -218,20 +218,20 @@ void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFr void SAL_CALL LayoutManagerListener::addEventListener( const css::uno::Reference< css::lang::XEventListener >& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // do nothing, only internal class } void SAL_CALL LayoutManagerListener::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // do nothing, only internal class } void SAL_CALL LayoutManagerListener::dispose() -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -278,7 +278,7 @@ throw( css::uno::RuntimeException ) void SAL_CALL LayoutManagerListener::disposing( const css::lang::EventObject& ) -throw( css::uno::RuntimeException ) +throw( css::uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; m_pWrkWin = 0; @@ -293,7 +293,7 @@ void SAL_CALL LayoutManagerListener::layoutEvent( const css::lang::EventObject&, ::sal_Int16 eLayoutEvent, const css::uno::Any& ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pWrkWin ) diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx index e86479517237..7cd316dded9c 100644 --- a/sfx2/source/appl/xpackcreator.cxx +++ b/sfx2/source/appl/xpackcreator.cxx @@ -45,19 +45,19 @@ public: OPackageStructureCreator() {} // XPackageStructureCreator - virtual void SAL_CALL convertToPackage( const OUString& aFolderUrl, const uno::Reference< io::XOutputStream >& xTargetStream ) throw (io::IOException, uno::RuntimeException); + virtual void SAL_CALL convertToPackage( const OUString& aFolderUrl, const uno::Reference< io::XOutputStream >& xTargetStream ) throw (io::IOException, uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (uno::RuntimeException); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception); }; void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolderUrl, const uno::Reference< io::XOutputStream >& xTargetStream ) throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< ucb::XCommandEnvironment > xComEnv; @@ -151,19 +151,19 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde } OUString SAL_CALL OPackageStructureCreator::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.embed.PackageStructureCreator"); } sal_Bool SAL_CALL OPackageStructureCreator::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL OPackageStructureCreator::getSupportedServiceNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.embed.PackageStructureCreator"; diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx index acadc3f0e82c..5792dba34857 100644 --- a/sfx2/source/bastyp/fltlst.cxx +++ b/sfx2/source/bastyp/fltlst.cxx @@ -54,14 +54,14 @@ class SfxRefreshListener : public ::cppu::WeakImplHelper1<com::sun::star::util:: // util.XRefreshListener virtual void SAL_CALL refreshed( const ::com::sun::star::lang::EventObject& rEvent ) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { m_pOwner->refreshed(rEvent); } // lang.XEventListener virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { m_pOwner->disposing(rEvent); } diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index 7b1dc9b3da99..cc53a29610bc 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -53,10 +53,10 @@ class SfxQueryStatus_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusL SfxItemState QueryState( SfxPoolItem*& pPoolItem ); // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XStatusListener - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ); private: SfxQueryStatus_Impl( const SfxQueryStatus& ); @@ -91,14 +91,14 @@ SfxQueryStatus_Impl::~SfxQueryStatus_Impl() } void SAL_CALL SfxQueryStatus_Impl::disposing( const EventObject& ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; m_xDispatch.clear(); } void SAL_CALL SfxQueryStatus_Impl::statusChanged( const FeatureStateEvent& rEvent) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index bfa918017689..eab1359a23d3 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -99,7 +99,7 @@ void SfxStatusListener::ReBind() } // new UNO API -void SAL_CALL SfxStatusListener::dispose() throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL SfxStatusListener::dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { if ( m_xDispatch.is() && !m_aCommand.Complete.isEmpty() ) { @@ -118,19 +118,19 @@ void SAL_CALL SfxStatusListener::dispose() throw( ::com::sun::star::uno::Runtime } void SAL_CALL SfxStatusListener::addEventListener( const Reference< XEventListener >& ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // do nothing - this is a wrapper class which does not support listeners } void SAL_CALL SfxStatusListener::removeEventListener( const Reference< XEventListener >& ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // do nothing - this is a wrapper class which does not support listeners } void SAL_CALL SfxStatusListener::disposing( const EventObject& Source ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -141,7 +141,7 @@ throw( RuntimeException ) } void SAL_CALL SfxStatusListener::statusChanged( const FeatureStateEvent& rEvent) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 43589bb5e7d6..10247d78a64c 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -69,7 +69,7 @@ BindDispatch_Impl::BindDispatch_Impl( const ::com::sun::star::uno::Reference< :: aStatus.IsEnabled = sal_True; } -void SAL_CALL BindDispatch_Impl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL BindDispatch_Impl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { if ( xDisp.is() ) { @@ -78,7 +78,7 @@ void SAL_CALL BindDispatch_Impl::disposing( const ::com::sun::star::lang::EventO } } -void SAL_CALL BindDispatch_Impl::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& rEvent ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL BindDispatch_Impl::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& rEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { aStatus = rEvent; if ( !pCache ) diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 26f3eacee864..dfc274ba8a25 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -119,14 +119,14 @@ void ThumbnailViewAcc::LoseFocus (void) } uno::Reference< accessibility::XAccessibleContext > SAL_CALL ThumbnailViewAcc::getAccessibleContext() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return this; } sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleChildCount() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); @@ -136,7 +136,7 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleChildCount() } uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -152,7 +152,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces } uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAccessibleParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -166,7 +166,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces } sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleIndexInParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -191,7 +191,7 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleIndexInParent() } sal_Int16 SAL_CALL ThumbnailViewAcc::getAccessibleRole() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); // #i73746# As the Java Access Bridge (v 2.0.1) uses "managesDescendants" @@ -202,7 +202,7 @@ sal_Int16 SAL_CALL ThumbnailViewAcc::getAccessibleRole() } OUString SAL_CALL ThumbnailViewAcc::getAccessibleDescription() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -210,7 +210,7 @@ OUString SAL_CALL ThumbnailViewAcc::getAccessibleDescription() } OUString SAL_CALL ThumbnailViewAcc::getAccessibleName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -230,14 +230,14 @@ OUString SAL_CALL ThumbnailViewAcc::getAccessibleName() } uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ThumbnailViewAcc::getAccessibleRelationSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return uno::Reference< accessibility::XAccessibleRelationSet >(); } uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ThumbnailViewAcc::getAccessibleStateSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper(); @@ -257,7 +257,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ThumbnailViewAcc:: } lang::Locale SAL_CALL ThumbnailViewAcc::getLocale() - throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException) + throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -277,7 +277,7 @@ lang::Locale SAL_CALL ThumbnailViewAcc::getLocale() } void SAL_CALL ThumbnailViewAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (m_aMutex); @@ -301,7 +301,7 @@ void SAL_CALL ThumbnailViewAcc::addAccessibleEventListener( const uno::Reference } void SAL_CALL ThumbnailViewAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (m_aMutex); @@ -317,7 +317,7 @@ void SAL_CALL ThumbnailViewAcc::removeAccessibleEventListener( const uno::Refere } sal_Bool SAL_CALL ThumbnailViewAcc::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const awt::Rectangle aRect( getBounds() ); @@ -328,7 +328,7 @@ sal_Bool SAL_CALL ThumbnailViewAcc::containsPoint( const awt::Point& aPoint ) } uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -350,7 +350,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces } awt::Rectangle SAL_CALL ThumbnailViewAcc::getBounds() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -367,7 +367,7 @@ awt::Rectangle SAL_CALL ThumbnailViewAcc::getBounds() } awt::Point SAL_CALL ThumbnailViewAcc::getLocation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const awt::Rectangle aRect( getBounds() ); @@ -380,7 +380,7 @@ awt::Point SAL_CALL ThumbnailViewAcc::getLocation() } awt::Point SAL_CALL ThumbnailViewAcc::getLocationOnScreen() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -394,7 +394,7 @@ awt::Point SAL_CALL ThumbnailViewAcc::getLocationOnScreen() } awt::Size SAL_CALL ThumbnailViewAcc::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const awt::Rectangle aRect( getBounds() ); @@ -407,7 +407,7 @@ awt::Size SAL_CALL ThumbnailViewAcc::getSize() } void SAL_CALL ThumbnailViewAcc::grabFocus() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -422,7 +422,7 @@ uno::Any SAL_CALL ThumbnailViewAcc::getAccessibleKeyBinding() } sal_Int32 SAL_CALL ThumbnailViewAcc::getForeground( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor(); @@ -430,7 +430,7 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getForeground( ) } sal_Int32 SAL_CALL ThumbnailViewAcc::getBackground( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); @@ -438,7 +438,7 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getBackground( ) } void SAL_CALL ThumbnailViewAcc::selectAccessibleChild( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -453,7 +453,7 @@ void SAL_CALL ThumbnailViewAcc::selectAccessibleChild( sal_Int32 nChildIndex ) } sal_Bool SAL_CALL ThumbnailViewAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -469,21 +469,21 @@ sal_Bool SAL_CALL ThumbnailViewAcc::isAccessibleChildSelected( sal_Int32 nChildI } void SAL_CALL ThumbnailViewAcc::clearAccessibleSelection() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; } void SAL_CALL ThumbnailViewAcc::selectAllAccessibleChildren() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); // unsupported due to single selection only } sal_Int32 SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChildCount() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -501,7 +501,7 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChildCount() } uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -519,7 +519,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getSelec } void SAL_CALL ThumbnailViewAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -530,7 +530,7 @@ void SAL_CALL ThumbnailViewAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) (void) nChildIndex; } -sal_Int64 SAL_CALL ThumbnailViewAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException ) +sal_Int64 SAL_CALL ThumbnailViewAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException, std::exception ) { sal_Int64 nRet; @@ -673,25 +673,25 @@ ThumbnailViewItemAcc* ThumbnailViewItemAcc::getImplementation( const uno::Refere } uno::Reference< accessibility::XAccessibleContext > SAL_CALL ThumbnailViewItemAcc::getAccessibleContext() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return this; } sal_Int32 SAL_CALL ThumbnailViewItemAcc::getAccessibleChildCount() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return 0; } uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getAccessibleChild( sal_Int32 ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getAccessibleParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; uno::Reference< accessibility::XAccessible > xRet; @@ -703,7 +703,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getA } sal_Int32 SAL_CALL ThumbnailViewItemAcc::getAccessibleIndexInParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; // The index defaults to -1 to indicate the child does not belong to its @@ -743,19 +743,19 @@ sal_Int32 SAL_CALL ThumbnailViewItemAcc::getAccessibleIndexInParent() } sal_Int16 SAL_CALL ThumbnailViewItemAcc::getAccessibleRole() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return accessibility::AccessibleRole::LIST_ITEM; } OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleDescription() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString(); } OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; OUString aRet; @@ -776,13 +776,13 @@ OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleName() } uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ThumbnailViewItemAcc::getAccessibleRelationSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< accessibility::XAccessibleRelationSet >(); } uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ThumbnailViewItemAcc::getAccessibleStateSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; ::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper; @@ -812,7 +812,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ThumbnailViewItemA } lang::Locale SAL_CALL ThumbnailViewItemAcc::getLocale() - throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException) + throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; const OUString aEmptyStr; @@ -831,7 +831,7 @@ lang::Locale SAL_CALL ThumbnailViewItemAcc::getLocale() } void SAL_CALL ThumbnailViewItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); @@ -854,7 +854,7 @@ void SAL_CALL ThumbnailViewItemAcc::addAccessibleEventListener( const uno::Refer } void SAL_CALL ThumbnailViewItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); @@ -869,7 +869,7 @@ void SAL_CALL ThumbnailViewItemAcc::removeAccessibleEventListener( const uno::Re } sal_Bool SAL_CALL ThumbnailViewItemAcc::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const awt::Rectangle aRect( getBounds() ); const Point aSize( aRect.Width, aRect.Height ); @@ -879,14 +879,14 @@ sal_Bool SAL_CALL ThumbnailViewItemAcc::containsPoint( const awt::Point& aPoint } uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getAccessibleAtPoint( const awt::Point& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< accessibility::XAccessible > xRet; return xRet; } awt::Rectangle SAL_CALL ThumbnailViewItemAcc::getBounds() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; awt::Rectangle aRet; @@ -909,7 +909,7 @@ awt::Rectangle SAL_CALL ThumbnailViewItemAcc::getBounds() } awt::Point SAL_CALL ThumbnailViewItemAcc::getLocation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const awt::Rectangle aRect( getBounds() ); awt::Point aRet; @@ -921,7 +921,7 @@ awt::Point SAL_CALL ThumbnailViewItemAcc::getLocation() } awt::Point SAL_CALL ThumbnailViewItemAcc::getLocationOnScreen() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; awt::Point aRet; @@ -939,7 +939,7 @@ awt::Point SAL_CALL ThumbnailViewItemAcc::getLocationOnScreen() } awt::Size SAL_CALL ThumbnailViewItemAcc::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const awt::Rectangle aRect( getBounds() ); awt::Size aRet; @@ -951,7 +951,7 @@ awt::Size SAL_CALL ThumbnailViewItemAcc::getSize() } void SAL_CALL ThumbnailViewItemAcc::grabFocus() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing to do } @@ -963,19 +963,19 @@ uno::Any SAL_CALL ThumbnailViewItemAcc::getAccessibleKeyBinding() } sal_Int32 SAL_CALL ThumbnailViewItemAcc::getForeground( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowTextColor().GetColor(); return static_cast<sal_Int32>(nColor); } sal_Int32 SAL_CALL ThumbnailViewItemAcc::getBackground( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return static_cast<sal_Int32>(Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor()); } -sal_Int64 SAL_CALL ThumbnailViewItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException ) +sal_Int64 SAL_CALL ThumbnailViewItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException, std::exception ) { sal_Int64 nRet; diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 74f9f1401f67..3034889cac45 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -77,55 +77,55 @@ public: void LoseFocus (void); // XComponent - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::removeEventListener(xListener); } // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); private: ::std::vector< ::com::sun::star::uno::Reference< @@ -200,38 +200,38 @@ public: public: // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); }; #endif // INCLUDED_SFX2_SOURCE_CONTROL_THUMBNAILVIEWACC_HXX diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index da8115692b92..afd5cafa51f0 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -117,7 +117,7 @@ void SfxUnoControllerItem::UnBind() ReleaseDispatch(); } -void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& rEvent) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& rEvent) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; DBG_ASSERT( pCtrlItem, "dispatch implementation didn't respect our previous removeStatusListener call!" ); @@ -174,7 +174,7 @@ void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame: } } -void SAL_CALL SfxUnoControllerItem::disposing( const ::com::sun::star::lang::EventObject& ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL SfxUnoControllerItem::disposing( const ::com::sun::star::lang::EventObject& ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > aRef( (::cppu::OWeakObject*)this, ::com::sun::star::uno::UNO_QUERY ); ReleaseDispatch(); @@ -264,14 +264,14 @@ void SfxStatusDispatcher::ReleaseAll() aListeners.disposeAndClear( aObject ); } -void SAL_CALL SfxStatusDispatcher::dispatch( const ::com::sun::star::util::URL&, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL SfxStatusDispatcher::dispatch( const ::com::sun::star::util::URL&, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { } void SAL_CALL SfxStatusDispatcher::dispatchWithNotification( const ::com::sun::star::util::URL&, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >&, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& ) throw( ::com::sun::star::uno::RuntimeException ) + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { } @@ -280,7 +280,7 @@ SfxStatusDispatcher::SfxStatusDispatcher() { } -void SAL_CALL SfxStatusDispatcher::addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL SfxStatusDispatcher::addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { aListeners.addInterface( aURL.Complete, aListener ); if ( aURL.Complete.equalsAscii(".uno:LifeTime") ) @@ -294,14 +294,14 @@ void SAL_CALL SfxStatusDispatcher::addStatusListener(const ::com::sun::star::uno } } -void SAL_CALL SfxStatusDispatcher::removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL SfxStatusDispatcher::removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { aListeners.removeInterface( aURL.Complete, aListener ); } // XUnoTunnel -sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) { if ( aIdentifier == impl_getStaticIdentifier() ) return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this )); @@ -340,7 +340,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& SfxOfficeDispatch::impl_getSt } -void SAL_CALL SfxOfficeDispatch::dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL SfxOfficeDispatch::dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { // ControllerItem is the Impl class if ( pControllerItem ) @@ -362,7 +362,7 @@ void SAL_CALL SfxOfficeDispatch::dispatch( const ::com::sun::star::util::URL& aU void SAL_CALL SfxOfficeDispatch::dispatchWithNotification( 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( ::com::sun::star::uno::RuntimeException, std::exception ) { // ControllerItem is the Impl class if ( pControllerItem ) @@ -377,7 +377,7 @@ void SAL_CALL SfxOfficeDispatch::dispatchWithNotification( const ::com::sun::sta } } -void SAL_CALL SfxOfficeDispatch::addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL SfxOfficeDispatch::addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { GetListeners().addInterface( aURL.Complete, aListener ); if ( pControllerItem ) diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 573fc5e25ef5..8fc7d6533c77 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -101,51 +101,51 @@ public: virtual ~BackingComp( ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire ( ) throw( ); virtual void SAL_CALL release ( ) throw( ); // XTypeProvide - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () throw(css::uno::RuntimeException); - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException); + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName ( ) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw(css::uno::RuntimeException); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName ( ) throw(css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArgs ) throw(css::uno::Exception, css::uno::RuntimeException); + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArgs ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception); // XController - virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw(css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getViewData() throw(css::uno::RuntimeException); - virtual void SAL_CALL restoreViewData( const css::uno::Any& aData ) throw(css::uno::RuntimeException); - virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw(css::uno::RuntimeException); - virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw(css::uno::RuntimeException); + virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw(css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw(css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getViewData() throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL restoreViewData( const css::uno::Any& aData ) throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw(css::uno::RuntimeException, std::exception); // XKeyListener - virtual void SAL_CALL keyPressed ( const css::awt::KeyEvent& aEvent ) throw(css::uno::RuntimeException); - virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& aEvent ) throw(css::uno::RuntimeException); + virtual void SAL_CALL keyPressed ( const css::awt::KeyEvent& aEvent ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& aEvent ) throw(css::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException); + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose ( ) throw(css::uno::RuntimeException); - virtual void SAL_CALL addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException); + virtual void SAL_CALL dispose ( ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception); // XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException ); + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException, std::exception ); // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException ); + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ); }; BackingComp::BackingComp( const css::uno::Reference< css::uno::XComponentContext >& xContext ) @@ -177,7 +177,7 @@ BackingComp::~BackingComp() */ css::uno::Any SAL_CALL BackingComp::queryInterface( /*IN*/ const css::uno::Type& aType ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { css::uno::Any aResult; @@ -249,7 +249,7 @@ void SAL_CALL BackingComp::release() */ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { static ::cppu::OTypeCollection* pTypeCollection = NULL; if (!pTypeCollection) @@ -297,7 +297,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes() */ css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { static ::cppu::OImplementationId* pID = NULL; if (!pID) @@ -316,19 +316,19 @@ css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId() } OUString SAL_CALL BackingComp::getImplementationName() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.sfx2.BackingComp"); } sal_Bool SAL_CALL BackingComp::supportsService( /*IN*/ const OUString& sServiceName ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } css::uno::Sequence< OUString > SAL_CALL BackingComp::getSupportedServiceNames() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > lNames(2); lNames[0] = "com.sun.star.frame.StartModule"; @@ -392,7 +392,7 @@ css::uno::Sequence< OUString > SAL_CALL BackingComp::getSupportedServiceNames() */ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::frame::XFrame >& xFrame ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { /* SAFE */ SolarMutexGuard aGuard; @@ -476,7 +476,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f */ sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const css::uno::Reference< css::frame::XModel >& ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return sal_False; } @@ -492,7 +492,7 @@ sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const css::uno::Reference< cs */ css::uno::Reference< css::frame::XModel > SAL_CALL BackingComp::getModel() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::Reference< css::frame::XModel >(); } @@ -505,7 +505,7 @@ css::uno::Reference< css::frame::XModel > SAL_CALL BackingComp::getModel() */ css::uno::Any SAL_CALL BackingComp::getViewData() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::uno::Any(); } @@ -519,7 +519,7 @@ css::uno::Any SAL_CALL BackingComp::getViewData() */ void SAL_CALL BackingComp::restoreViewData( /*IN*/ const css::uno::Any& ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { } @@ -534,7 +534,7 @@ void SAL_CALL BackingComp::restoreViewData( /*IN*/ const css::uno::Any& ) */ css::uno::Reference< css::frame::XFrame > SAL_CALL BackingComp::getFrame() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { /* SAFE { */ SolarMutexGuard aGuard; @@ -558,7 +558,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL BackingComp::getFrame() */ sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { /* FIXME ... implemented by using default :-( */ return sal_True; @@ -582,7 +582,7 @@ sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool ) */ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEvent ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // Attention: dont free m_pAccExec here! see comments inside dtor and // keyPressed() for further details. @@ -611,7 +611,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven */ void SAL_CALL BackingComp::dispose() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { /* SAFE { */ SolarMutexGuard aGuard; @@ -665,7 +665,7 @@ void SAL_CALL BackingComp::dispose() */ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< css::lang::XEventListener >& ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( OUString("not supported"), @@ -683,7 +683,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c */ void SAL_CALL BackingComp::removeEventListener( /*IN*/ const css::uno::Reference< css::lang::XEventListener >& ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { } @@ -708,7 +708,7 @@ void SAL_CALL BackingComp::removeEventListener( /*IN*/ const css::uno::Reference */ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno::Any >& lArgs ) - throw(css::uno::Exception, css::uno::RuntimeException) + throw(css::uno::Exception, css::uno::RuntimeException, std::exception) { /* SAFE { */ SolarMutexGuard aGuard; @@ -757,7 +757,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno */ void SAL_CALL BackingComp::keyPressed( /*IN*/ const css::awt::KeyEvent& ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { } @@ -767,7 +767,7 @@ void SAL_CALL BackingComp::keyPressed( /*IN*/ const css::awt::KeyEvent& ) */ void SAL_CALL BackingComp::keyReleased( /*IN*/ const css::awt::KeyEvent& ) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { /* Attention Please use keyPressed() instead of this method. Otherwhise it would be possible, that @@ -779,7 +779,7 @@ void SAL_CALL BackingComp::keyReleased( /*IN*/ const css::awt::KeyEvent& ) } // XDispatchProvider -css::uno::Reference< css::frame::XDispatch > SAL_CALL BackingComp::queryDispatch( const css::util::URL& aURL, const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) throw( css::uno::RuntimeException ) +css::uno::Reference< css::frame::XDispatch > SAL_CALL BackingComp::queryDispatch( const css::util::URL& aURL, const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) throw( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::frame::XDispatch > xDispatch; if ( aURL.Protocol == "vnd.org.libreoffice.recentdocs:" ) @@ -788,7 +788,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL BackingComp::queryDispatch return xDispatch; } -css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL BackingComp::queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescripts ) throw( css::uno::RuntimeException ) +css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL BackingComp::queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescripts ) throw( css::uno::RuntimeException, std::exception ) { sal_Int32 nCount = seqDescripts.getLength(); css::uno::Sequence < css::uno::Reference < XDispatch > > lDispatcher( nCount ); @@ -800,7 +800,7 @@ css::uno::Sequence < css::uno::Reference< css::frame::XDispatch > > SAL_CALL Bac } // XDispatch -void SAL_CALL BackingComp::dispatch( const css::util::URL& aURL, const css::uno::Sequence < css::beans::PropertyValue >& /*lArgs*/ ) throw( css::uno::RuntimeException ) +void SAL_CALL BackingComp::dispatch( const css::util::URL& aURL, const css::uno::Sequence < css::beans::PropertyValue >& /*lArgs*/ ) throw( css::uno::RuntimeException, std::exception ) { // vnd.org.libreoffice.recentdocs:ClearRecentFileList - clear recent files if ( aURL.Path == "ClearRecentFileList" ) @@ -824,11 +824,11 @@ void SAL_CALL BackingComp::dispatch( const css::util::URL& aURL, const css::uno: } } -void SAL_CALL BackingComp::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException ) +void SAL_CALL BackingComp::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException, std::exception ) { } -void SAL_CALL BackingComp::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException ) +void SAL_CALL BackingComp::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xControl*/, const css::util::URL& /*aURL*/ ) throw ( css::uno::RuntimeException, std::exception ) { } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 444ef133c8c9..eeccc2184a37 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -156,38 +156,38 @@ OUString DecodeSpaces_Impl( const OUString& rSource ); // FileDialogHelper_Impl // XFilePickerListener Methods -void SAL_CALL FileDialogHelper_Impl::fileSelectionChanged( const FilePickerEvent& aEvent ) throw ( RuntimeException ) +void SAL_CALL FileDialogHelper_Impl::fileSelectionChanged( const FilePickerEvent& aEvent ) throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; mpAntiImpl->FileSelectionChanged( aEvent ); } -void SAL_CALL FileDialogHelper_Impl::directoryChanged( const FilePickerEvent& aEvent ) throw ( RuntimeException ) +void SAL_CALL FileDialogHelper_Impl::directoryChanged( const FilePickerEvent& aEvent ) throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; mpAntiImpl->DirectoryChanged( aEvent ); } -OUString SAL_CALL FileDialogHelper_Impl::helpRequested( const FilePickerEvent& aEvent ) throw ( RuntimeException ) +OUString SAL_CALL FileDialogHelper_Impl::helpRequested( const FilePickerEvent& aEvent ) throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; return mpAntiImpl->HelpRequested( aEvent ); } -void SAL_CALL FileDialogHelper_Impl::controlStateChanged( const FilePickerEvent& aEvent ) throw ( RuntimeException ) +void SAL_CALL FileDialogHelper_Impl::controlStateChanged( const FilePickerEvent& aEvent ) throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; mpAntiImpl->ControlStateChanged( aEvent ); } -void SAL_CALL FileDialogHelper_Impl::dialogSizeChanged() throw ( RuntimeException ) +void SAL_CALL FileDialogHelper_Impl::dialogSizeChanged() throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; mpAntiImpl->DialogSizeChanged(); } // XDialogClosedListener Methods -void SAL_CALL FileDialogHelper_Impl::dialogClosed( const DialogClosedEvent& _rEvent ) throw ( RuntimeException ) +void SAL_CALL FileDialogHelper_Impl::dialogClosed( const DialogClosedEvent& _rEvent ) throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; mpAntiImpl->DialogClosed( _rEvent ); @@ -302,7 +302,7 @@ void FileDialogHelper_Impl::handleDialogSizeChanged() } // XEventListener Methods -void SAL_CALL FileDialogHelper_Impl::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL FileDialogHelper_Impl::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; dispose(); diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 8706124227b3..ba2741eac67a 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -155,17 +155,17 @@ namespace sfx2 public: // XFilePickerListener methods - virtual void SAL_CALL fileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL directoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); - virtual OUString SAL_CALL helpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL controlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL dialogSizeChanged() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL fileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL directoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL helpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL controlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL dialogSizeChanged() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XDialogClosedListener methods - virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener methods - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // handle XFilePickerListener events void handleFileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 587d9a8f0903..982b4eb8ffbe 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -96,11 +96,11 @@ public: // css.frame.XStatusListener virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // css.lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); bool IsSet() const {return m_bState;} }; @@ -114,7 +114,7 @@ PrepareListener_Impl::~PrepareListener_Impl() { } -void PrepareListener_Impl::statusChanged(const css::frame::FeatureStateEvent& rEvent) throw(css::uno::RuntimeException) +void PrepareListener_Impl::statusChanged(const css::frame::FeatureStateEvent& rEvent) throw(css::uno::RuntimeException, std::exception) { if( rEvent.IsEnabled ) rEvent.State >>= m_bState; @@ -122,7 +122,7 @@ void PrepareListener_Impl::statusChanged(const css::frame::FeatureStateEvent& rE m_bState = false; } -void PrepareListener_Impl::disposing(const css::lang::EventObject& /*rEvent*/) throw(css::uno::RuntimeException) +void PrepareListener_Impl::disposing(const css::lang::EventObject& /*rEvent*/) throw(css::uno::RuntimeException, std::exception) { } diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index 37622afc65a0..47da6ce7949b 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -817,7 +817,7 @@ DocumentMetadataAccess::~DocumentMetadataAccess() // ::com::sun::star::rdf::XRepositorySupplier: uno::Reference< rdf::XRepository > SAL_CALL -DocumentMetadataAccess::getRDFRepository() throw (uno::RuntimeException) +DocumentMetadataAccess::getRDFRepository() throw (uno::RuntimeException, std::exception) { OSL_ENSURE(m_pImpl->m_xRepository.is(), "repository not initialized"); return m_pImpl->m_xRepository; @@ -825,20 +825,20 @@ DocumentMetadataAccess::getRDFRepository() throw (uno::RuntimeException) // ::com::sun::star::rdf::XNode: OUString SAL_CALL -DocumentMetadataAccess::getStringValue() throw (uno::RuntimeException) +DocumentMetadataAccess::getStringValue() throw (uno::RuntimeException, std::exception) { return m_pImpl->m_xBaseURI->getStringValue(); } // ::com::sun::star::rdf::XURI: OUString SAL_CALL -DocumentMetadataAccess::getNamespace() throw (uno::RuntimeException) +DocumentMetadataAccess::getNamespace() throw (uno::RuntimeException, std::exception) { return m_pImpl->m_xBaseURI->getNamespace(); } OUString SAL_CALL -DocumentMetadataAccess::getLocalName() throw (uno::RuntimeException) +DocumentMetadataAccess::getLocalName() throw (uno::RuntimeException, std::exception) { return m_pImpl->m_xBaseURI->getLocalName(); } @@ -847,7 +847,7 @@ DocumentMetadataAccess::getLocalName() throw (uno::RuntimeException) uno::Reference< rdf::XMetadatable > SAL_CALL DocumentMetadataAccess::getElementByMetadataReference( const ::com::sun::star::beans::StringPair & i_rReference) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { const IXmlIdRegistry * pReg( m_pImpl->m_rXmlIdRegistrySupplier.GetXmlIdRegistry() ); @@ -861,7 +861,7 @@ throw (uno::RuntimeException) uno::Reference< rdf::XMetadatable > SAL_CALL DocumentMetadataAccess::getElementByURI( const uno::Reference< rdf::XURI > & i_xURI ) -throw (uno::RuntimeException, lang::IllegalArgumentException) +throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) { if (!i_xURI.is()) { throw lang::IllegalArgumentException(OUString( @@ -887,7 +887,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException) uno::Sequence< uno::Reference< rdf::XURI > > SAL_CALL DocumentMetadataAccess::getMetadataGraphsWithType( const uno::Reference<rdf::XURI> & i_xType) -throw (uno::RuntimeException, lang::IllegalArgumentException) +throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) { if (!i_xType.is()) { throw lang::IllegalArgumentException(OUString( @@ -910,7 +910,7 @@ uno::Reference<rdf::XURI> SAL_CALL DocumentMetadataAccess::addMetadataFile(const OUString & i_rFileName, const uno::Sequence < uno::Reference< rdf::XURI > > & i_rTypes) throw (uno::RuntimeException, lang::IllegalArgumentException, - container::ElementExistException) + container::ElementExistException, std::exception) { if (!isFileNameValid(i_rFileName)) { throw lang::IllegalArgumentException(OUString( @@ -956,7 +956,7 @@ DocumentMetadataAccess::importMetadataFile(::sal_Int16 i_Format, const uno::Sequence < uno::Reference< rdf::XURI > > & i_rTypes) throw (uno::RuntimeException, lang::IllegalArgumentException, datatransfer::UnsupportedFlavorException, - container::ElementExistException, rdf::ParseException, io::IOException) + container::ElementExistException, rdf::ParseException, io::IOException, std::exception) { if (!isFileNameValid(i_rFileName)) { throw lang::IllegalArgumentException(OUString( @@ -1000,7 +1000,7 @@ void SAL_CALL DocumentMetadataAccess::removeMetadataFile( const uno::Reference< rdf::XURI > & i_xGraphName) throw (uno::RuntimeException, lang::IllegalArgumentException, - container::NoSuchElementException) + container::NoSuchElementException, std::exception) { try { m_pImpl->m_xRepository->destroyGraph(i_xGraphName); @@ -1020,7 +1020,7 @@ void SAL_CALL DocumentMetadataAccess::addContentOrStylesFile( const OUString & i_rFileName) throw (uno::RuntimeException, lang::IllegalArgumentException, - container::ElementExistException) + container::ElementExistException, std::exception) { if (!isFileNameValid(i_rFileName)) { throw lang::IllegalArgumentException(OUString( @@ -1040,7 +1040,7 @@ void SAL_CALL DocumentMetadataAccess::removeContentOrStylesFile( const OUString & i_rFileName) throw (uno::RuntimeException, lang::IllegalArgumentException, - container::NoSuchElementException) + container::NoSuchElementException, std::exception) { if (!isFileNameValid(i_rFileName)) { throw lang::IllegalArgumentException(OUString( @@ -1082,7 +1082,7 @@ void SAL_CALL DocumentMetadataAccess::loadMetadataFromStorage( const uno::Reference<rdf::XURI> & i_xBaseURI, const uno::Reference<task::XInteractionHandler> & i_xHandler) throw (uno::RuntimeException, lang::IllegalArgumentException, - lang::WrappedTargetException) + lang::WrappedTargetException, std::exception) { if (!i_xStorage.is()) { throw lang::IllegalArgumentException(OUString( @@ -1193,7 +1193,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, void SAL_CALL DocumentMetadataAccess::storeMetadataToStorage( const uno::Reference< embed::XStorage > & i_xStorage) throw (uno::RuntimeException, lang::IllegalArgumentException, - lang::WrappedTargetException) + lang::WrappedTargetException, std::exception) { if (!i_xStorage.is()) { throw lang::IllegalArgumentException(OUString( @@ -1271,7 +1271,7 @@ void SAL_CALL DocumentMetadataAccess::loadMetadataFromMedium( const uno::Sequence< beans::PropertyValue > & i_rMedium) throw (uno::RuntimeException, lang::IllegalArgumentException, - lang::WrappedTargetException) + lang::WrappedTargetException, std::exception) { uno::Reference<io::XInputStream> xIn; utl::MediaDescriptor md(i_rMedium); @@ -1331,7 +1331,7 @@ void SAL_CALL DocumentMetadataAccess::storeMetadataToMedium( const uno::Sequence< beans::PropertyValue > & i_rMedium) throw (uno::RuntimeException, lang::IllegalArgumentException, - lang::WrappedTargetException) + lang::WrappedTargetException, std::exception) { utl::MediaDescriptor md(i_rMedium); OUString URL; diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index 67ac903e573b..3f44618b2d82 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -1579,14 +1579,14 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther, // ::com::sun::star::rdf::XNode: OUString SAL_CALL MetadatableMixin::getStringValue() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return getNamespace() + getLocalName(); } // ::com::sun::star::rdf::XURI: OUString SAL_CALL MetadatableMixin::getLocalName() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; beans::StringPair mdref( getMetadataReference() ); @@ -1603,7 +1603,7 @@ OUString SAL_CALL MetadatableMixin::getLocalName() } OUString SAL_CALL MetadatableMixin::getNamespace() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const uno::Reference< frame::XModel > xModel( GetModel() ); @@ -1614,7 +1614,7 @@ OUString SAL_CALL MetadatableMixin::getNamespace() // ::com::sun::star::rdf::XMetadatable: beans::StringPair SAL_CALL MetadatableMixin::getMetadataReference() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1632,7 +1632,7 @@ throw (uno::RuntimeException) void SAL_CALL MetadatableMixin::setMetadataReference( const beans::StringPair & i_rReference) -throw (uno::RuntimeException, lang::IllegalArgumentException) +throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -1648,7 +1648,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException) } void SAL_CALL MetadatableMixin::ensureMetadataReference() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 12c5d9f1b0a7..9a6c4b8c4317 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -134,156 +134,156 @@ public: // ::com::sun::star::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL supportsService( - const OUString & ServiceName) throw (css::uno::RuntimeException); + const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException); + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XComponent: - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception); // ::com::sun::star::document::XDocumentProperties: virtual OUString SAL_CALL getAuthor() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setAuthor(const OUString & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getGenerator() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setGenerator(const OUString & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::util::DateTime SAL_CALL getCreationDate() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setCreationDate(const css::util::DateTime & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getTitle() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setTitle(const OUString & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getSubject() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setSubject(const OUString & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getDescription() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setDescription(const OUString & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getKeywords() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setKeywords( const css::uno::Sequence< OUString > & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::lang::Locale SAL_CALL getLanguage() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setLanguage(const css::lang::Locale & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getModifiedBy() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setModifiedBy(const OUString & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::util::DateTime SAL_CALL getModificationDate() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setModificationDate( const css::util::DateTime & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getPrintedBy() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setPrintedBy(const OUString & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::util::DateTime SAL_CALL getPrintDate() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setPrintDate(const css::util::DateTime & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getTemplateName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setTemplateName(const OUString & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getTemplateURL() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setTemplateURL(const OUString & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::util::DateTime SAL_CALL getTemplateDate() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setTemplateDate(const css::util::DateTime & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAutoloadURL() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setAutoloadURL(const OUString & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getAutoloadSecs() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setAutoloadSecs(::sal_Int32 the_value) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); virtual OUString SAL_CALL getDefaultTarget() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setDefaultTarget(const OUString & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL - getDocumentStatistics() throw (css::uno::RuntimeException); + getDocumentStatistics() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setDocumentStatistics( const css::uno::Sequence< css::beans::NamedValue > & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual ::sal_Int16 SAL_CALL getEditingCycles() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setEditingCycles(::sal_Int16 the_value) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); virtual ::sal_Int32 SAL_CALL getEditingDuration() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setEditingDuration(::sal_Int32 the_value) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); virtual void SAL_CALL resetUserData(const OUString & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::beans::XPropertyContainer > SAL_CALL - getUserDefinedProperties() throw (css::uno::RuntimeException); + getUserDefinedProperties() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage > & Storage, const css::uno::Sequence< css::beans::PropertyValue > & Medium) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::io::WrongFormatException, - css::lang::WrappedTargetException, css::io::IOException); + css::lang::WrappedTargetException, css::io::IOException, std::exception); virtual void SAL_CALL loadFromMedium(const OUString & URL, const css::uno::Sequence< css::beans::PropertyValue > & Medium) throw (css::uno::RuntimeException, css::io::WrongFormatException, - css::lang::WrappedTargetException, css::io::IOException); + css::lang::WrappedTargetException, css::io::IOException, std::exception); virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage > & Storage, const css::uno::Sequence< css::beans::PropertyValue > & Medium) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::io::IOException); + css::lang::WrappedTargetException, css::io::IOException, std::exception); virtual void SAL_CALL storeToMedium(const OUString & URL, const css::uno::Sequence< css::beans::PropertyValue > & Medium) throw (css::uno::RuntimeException, - css::lang::WrappedTargetException, css::io::IOException); + css::lang::WrappedTargetException, css::io::IOException, std::exception); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any > & aArguments) - throw (css::uno::RuntimeException, css::uno::Exception); + throw (css::uno::RuntimeException, css::uno::Exception, std::exception); // ::com::sun::star::util::XCloneable: virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // ::com::sun::star::util::XModifiable: virtual ::sal_Bool SAL_CALL isModified( ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setModified( ::sal_Bool bModified ) - throw (css::beans::PropertyVetoException, css::uno::RuntimeException); + throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception); // ::com::sun::star::util::XModifyBroadcaster: virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener > & xListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener > & xListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // ::com::sun::star::xml::sax::XSAXSerializable virtual void SAL_CALL serialize( const css::uno::Reference<css::xml::sax::XDocumentHandler>& i_xHandler, const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces) - throw (css::uno::RuntimeException, css::xml::sax::SAXException); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); protected: SfxDocumentMetaData(SfxDocumentMetaData &); // not defined @@ -367,25 +367,25 @@ protected: public: CompatWriterDocPropsImpl( css::uno::Reference< css::uno::XComponentContext > const & context) : CompatWriterDocPropsImpl_BASE( context ) {} // XCompatWriterDocPropsImpl - virtual OUString SAL_CALL getManager() throw (::com::sun::star::uno::RuntimeException) { return msManager; } - virtual void SAL_CALL setManager( const OUString& _manager ) throw (::com::sun::star::uno::RuntimeException) { msManager = _manager; } - virtual OUString SAL_CALL getCategory() throw (::com::sun::star::uno::RuntimeException){ return msCategory; } - virtual void SAL_CALL setCategory( const OUString& _category ) throw (::com::sun::star::uno::RuntimeException){ msCategory = _category; } - virtual OUString SAL_CALL getCompany() throw (::com::sun::star::uno::RuntimeException){ return msCompany; } - virtual void SAL_CALL setCompany( const OUString& _company ) throw (::com::sun::star::uno::RuntimeException){ msCompany = _company; } + virtual OUString SAL_CALL getManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { return msManager; } + virtual void SAL_CALL setManager( const OUString& _manager ) throw (::com::sun::star::uno::RuntimeException, std::exception) { msManager = _manager; } + virtual OUString SAL_CALL getCategory() throw (::com::sun::star::uno::RuntimeException, std::exception){ return msCategory; } + virtual void SAL_CALL setCategory( const OUString& _category ) throw (::com::sun::star::uno::RuntimeException, std::exception){ msCategory = _category; } + virtual OUString SAL_CALL getCompany() throw (::com::sun::star::uno::RuntimeException, std::exception){ return msCompany; } + virtual void SAL_CALL setCompany( const OUString& _company ) throw (::com::sun::star::uno::RuntimeException, std::exception){ msCompany = _company; } // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("CompatWriterDocPropsImpl"); } - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aServiceNames(1); aServiceNames[ 0 ] = "com.sun.star.writer.DocumentProperties"; @@ -1384,21 +1384,21 @@ SfxDocumentMetaData::SfxDocumentMetaData( // com.sun.star.uno.XServiceInfo: OUString SAL_CALL -SfxDocumentMetaData::getImplementationName() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getImplementationName() throw (css::uno::RuntimeException, std::exception) { return OUString("SfxDocumentMetaData"); } ::sal_Bool SAL_CALL SfxDocumentMetaData::supportsService(OUString const & serviceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } css::uno::Sequence< OUString > SAL_CALL SfxDocumentMetaData::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > s(1); s[0] = "com.sun.star.document.DocumentProperties"; @@ -1407,7 +1407,7 @@ SfxDocumentMetaData::getSupportedServiceNames() // ::com::sun::star::lang::XComponent: -void SAL_CALL SfxDocumentMetaData::dispose() throw (css::uno::RuntimeException) +void SAL_CALL SfxDocumentMetaData::dispose() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); if (!m_isInitialized) { @@ -1427,21 +1427,21 @@ void SAL_CALL SfxDocumentMetaData::dispose() throw (css::uno::RuntimeException) // ::com::sun::star::document::XDocumentProperties: OUString SAL_CALL -SfxDocumentMetaData::getAuthor() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getAuthor() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); return getMetaText("meta:initial-creator"); } void SAL_CALL SfxDocumentMetaData::setAuthor(const OUString & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { setMetaTextAndNotify("meta:initial-creator", the_value); } OUString SAL_CALL -SfxDocumentMetaData::getGenerator() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getGenerator() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); return getMetaText("meta:generator"); @@ -1449,13 +1449,13 @@ SfxDocumentMetaData::getGenerator() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setGenerator(const OUString & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { setMetaTextAndNotify("meta:generator", the_value); } css::util::DateTime SAL_CALL -SfxDocumentMetaData::getCreationDate() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getCreationDate() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); return textToDateTimeDefault(getMetaText("meta:creation-date")); @@ -1463,26 +1463,26 @@ SfxDocumentMetaData::getCreationDate() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setCreationDate(const css::util::DateTime & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { setMetaTextAndNotify("meta:creation-date", dateTimeToText(the_value)); } OUString SAL_CALL -SfxDocumentMetaData::getTitle() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getTitle() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); return getMetaText("dc:title"); } void SAL_CALL SfxDocumentMetaData::setTitle(const OUString & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { setMetaTextAndNotify("dc:title", the_value); } OUString SAL_CALL -SfxDocumentMetaData::getSubject() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getSubject() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); return getMetaText("dc:subject"); @@ -1490,13 +1490,13 @@ SfxDocumentMetaData::getSubject() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setSubject(const OUString & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { setMetaTextAndNotify("dc:subject", the_value); } OUString SAL_CALL -SfxDocumentMetaData::getDescription() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getDescription() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); return getMetaText("dc:description"); @@ -1504,13 +1504,13 @@ SfxDocumentMetaData::getDescription() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setDescription(const OUString & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { setMetaTextAndNotify("dc:description", the_value); } css::uno::Sequence< OUString > -SAL_CALL SfxDocumentMetaData::getKeywords() throw (css::uno::RuntimeException) +SAL_CALL SfxDocumentMetaData::getKeywords() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); return getMetaList("meta:keyword"); @@ -1519,7 +1519,7 @@ SAL_CALL SfxDocumentMetaData::getKeywords() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setKeywords( const css::uno::Sequence< OUString > & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard g(m_aMutex); if (setMetaList("meta:keyword", the_value)) { @@ -1529,7 +1529,7 @@ SfxDocumentMetaData::setKeywords( } css::lang::Locale SAL_CALL - SfxDocumentMetaData::getLanguage() throw (css::uno::RuntimeException) + SfxDocumentMetaData::getLanguage() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); css::lang::Locale loc( LanguageTag( getMetaText("dc:language")).getLocale( false)); @@ -1538,14 +1538,14 @@ css::lang::Locale SAL_CALL void SAL_CALL SfxDocumentMetaData::setLanguage(const css::lang::Locale & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { OUString text( LanguageTag::convertToBcp47( the_value, false)); setMetaTextAndNotify("dc:language", text); } OUString SAL_CALL -SfxDocumentMetaData::getModifiedBy() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getModifiedBy() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); return getMetaText("dc:creator"); @@ -1553,13 +1553,13 @@ SfxDocumentMetaData::getModifiedBy() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setModifiedBy(const OUString & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { setMetaTextAndNotify("dc:creator", the_value); } css::util::DateTime SAL_CALL -SfxDocumentMetaData::getModificationDate() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getModificationDate() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); return textToDateTimeDefault(getMetaText("dc:date")); @@ -1567,13 +1567,13 @@ SfxDocumentMetaData::getModificationDate() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setModificationDate(const css::util::DateTime & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { setMetaTextAndNotify("dc:date", dateTimeToText(the_value)); } OUString SAL_CALL -SfxDocumentMetaData::getPrintedBy() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getPrintedBy() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); return getMetaText("meta:printed-by"); @@ -1581,13 +1581,13 @@ SfxDocumentMetaData::getPrintedBy() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setPrintedBy(const OUString & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { setMetaTextAndNotify("meta:printed-by", the_value); } css::util::DateTime SAL_CALL -SfxDocumentMetaData::getPrintDate() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getPrintDate() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); return textToDateTimeDefault(getMetaText("meta:print-date")); @@ -1595,13 +1595,13 @@ SfxDocumentMetaData::getPrintDate() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setPrintDate(const css::util::DateTime & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { setMetaTextAndNotify("meta:print-date", dateTimeToText(the_value)); } OUString SAL_CALL -SfxDocumentMetaData::getTemplateName() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getTemplateName() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); checkInit(); @@ -1610,7 +1610,7 @@ SfxDocumentMetaData::getTemplateName() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setTemplateName(const OUString & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard g(m_aMutex); checkInit(); @@ -1622,7 +1622,7 @@ SfxDocumentMetaData::setTemplateName(const OUString & the_value) } OUString SAL_CALL -SfxDocumentMetaData::getTemplateURL() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getTemplateURL() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); checkInit(); @@ -1631,7 +1631,7 @@ SfxDocumentMetaData::getTemplateURL() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setTemplateURL(const OUString & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard g(m_aMutex); checkInit(); @@ -1643,7 +1643,7 @@ SfxDocumentMetaData::setTemplateURL(const OUString & the_value) } css::util::DateTime SAL_CALL -SfxDocumentMetaData::getTemplateDate() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getTemplateDate() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); checkInit(); @@ -1652,7 +1652,7 @@ SfxDocumentMetaData::getTemplateDate() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setTemplateDate(const css::util::DateTime & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard g(m_aMutex); checkInit(); @@ -1664,7 +1664,7 @@ SfxDocumentMetaData::setTemplateDate(const css::util::DateTime & the_value) } OUString SAL_CALL -SfxDocumentMetaData::getAutoloadURL() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getAutoloadURL() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); checkInit(); @@ -1673,7 +1673,7 @@ SfxDocumentMetaData::getAutoloadURL() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setAutoloadURL(const OUString & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard g(m_aMutex); checkInit(); @@ -1685,7 +1685,7 @@ SfxDocumentMetaData::setAutoloadURL(const OUString & the_value) } ::sal_Int32 SAL_CALL -SfxDocumentMetaData::getAutoloadSecs() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getAutoloadSecs() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); checkInit(); @@ -1694,7 +1694,7 @@ SfxDocumentMetaData::getAutoloadSecs() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setAutoloadSecs(::sal_Int32 the_value) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException) + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) { if (the_value < 0) throw css::lang::IllegalArgumentException( OUString("SfxDocumentMetaData::setAutoloadSecs: argument is negative"), @@ -1709,7 +1709,7 @@ SfxDocumentMetaData::setAutoloadSecs(::sal_Int32 the_value) } OUString SAL_CALL -SfxDocumentMetaData::getDefaultTarget() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getDefaultTarget() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); checkInit(); @@ -1718,7 +1718,7 @@ SfxDocumentMetaData::getDefaultTarget() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setDefaultTarget(const OUString & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard g(m_aMutex); checkInit(); @@ -1730,7 +1730,7 @@ SfxDocumentMetaData::setDefaultTarget(const OUString & the_value) } css::uno::Sequence< css::beans::NamedValue > SAL_CALL -SfxDocumentMetaData::getDocumentStatistics() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getDocumentStatistics() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); checkInit(); @@ -1760,7 +1760,7 @@ SfxDocumentMetaData::getDocumentStatistics() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setDocumentStatistics( const css::uno::Sequence< css::beans::NamedValue > & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard g(m_aMutex); checkInit(); @@ -1792,7 +1792,7 @@ SfxDocumentMetaData::setDocumentStatistics( } ::sal_Int16 SAL_CALL -SfxDocumentMetaData::getEditingCycles() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getEditingCycles() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); OUString text = getMetaText("meta:editing-cycles"); @@ -1807,7 +1807,7 @@ SfxDocumentMetaData::getEditingCycles() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setEditingCycles(::sal_Int16 the_value) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException) + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) { if (the_value < 0) throw css::lang::IllegalArgumentException( OUString("SfxDocumentMetaData::setEditingCycles: argument is negative"), @@ -1818,7 +1818,7 @@ SfxDocumentMetaData::setEditingCycles(::sal_Int16 the_value) } ::sal_Int32 SAL_CALL -SfxDocumentMetaData::getEditingDuration() throw (css::uno::RuntimeException) +SfxDocumentMetaData::getEditingDuration() throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); return textToDuration(getMetaText("meta:editing-duration")); @@ -1826,7 +1826,7 @@ SfxDocumentMetaData::getEditingDuration() throw (css::uno::RuntimeException) void SAL_CALL SfxDocumentMetaData::setEditingDuration(::sal_Int32 the_value) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException) + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) { if (the_value < 0) throw css::lang::IllegalArgumentException( OUString("SfxDocumentMetaData::setEditingDuration: argument is negative"), @@ -1836,7 +1836,7 @@ SfxDocumentMetaData::setEditingDuration(::sal_Int32 the_value) void SAL_CALL SfxDocumentMetaData::resetUserData(const OUString & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard g(m_aMutex); @@ -1864,7 +1864,7 @@ SfxDocumentMetaData::resetUserData(const OUString & the_value) css::uno::Reference< css::beans::XPropertyContainer > SAL_CALL SfxDocumentMetaData::getUserDefinedProperties() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); checkInit(); @@ -1879,7 +1879,7 @@ SfxDocumentMetaData::loadFromStorage( const css::uno::Sequence< css::beans::PropertyValue > & Medium) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::io::WrongFormatException, - css::lang::WrappedTargetException, css::io::IOException) + css::lang::WrappedTargetException, css::io::IOException, std::exception) { if (!xStorage.is()) throw css::lang::IllegalArgumentException( OUString("SfxDocumentMetaData::loadFromStorage: argument is null"), *this, 0); @@ -1949,7 +1949,7 @@ SfxDocumentMetaData::storeToStorage( const css::uno::Reference< css::embed::XStorage > & xStorage, const css::uno::Sequence< css::beans::PropertyValue > & Medium) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::io::IOException) + css::lang::WrappedTargetException, css::io::IOException, std::exception) { if (!xStorage.is()) throw css::lang::IllegalArgumentException( OUString("SfxDocumentMetaData::storeToStorage:" @@ -2023,7 +2023,7 @@ void SAL_CALL SfxDocumentMetaData::loadFromMedium(const OUString & URL, const css::uno::Sequence< css::beans::PropertyValue > & Medium) throw (css::uno::RuntimeException, css::io::WrongFormatException, - css::lang::WrappedTargetException, css::io::IOException) + css::lang::WrappedTargetException, css::io::IOException, std::exception) { css::uno::Reference<css::io::XInputStream> xIn; utl::MediaDescriptor md(Medium); @@ -2065,7 +2065,7 @@ void SAL_CALL SfxDocumentMetaData::storeToMedium(const OUString & URL, const css::uno::Sequence< css::beans::PropertyValue > & Medium) throw (css::uno::RuntimeException, - css::lang::WrappedTargetException, css::io::IOException) + css::lang::WrappedTargetException, css::io::IOException, std::exception) { utl::MediaDescriptor md(Medium); if (!URL.isEmpty()) { @@ -2114,7 +2114,7 @@ SfxDocumentMetaData::storeToMedium(const OUString & URL, void SAL_CALL SfxDocumentMetaData::initialize( const css::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) - throw (css::uno::RuntimeException, css::uno::Exception) + throw (css::uno::RuntimeException, css::uno::Exception, std::exception) { // possible arguments: // - no argument: default initialization (empty DOM) @@ -2152,7 +2152,7 @@ SfxDocumentMetaData::initialize( // ::com::sun::star::util::XCloneable: css::uno::Reference<css::util::XCloneable> SAL_CALL SfxDocumentMetaData::createClone() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); checkInit(); @@ -2183,7 +2183,7 @@ SfxDocumentMetaData::createClone() // ::com::sun::star::util::XModifiable: ::sal_Bool SAL_CALL SfxDocumentMetaData::isModified( ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); checkInit(); @@ -2193,7 +2193,7 @@ SfxDocumentMetaData::createClone() } void SAL_CALL SfxDocumentMetaData::setModified( ::sal_Bool bModified ) - throw (css::beans::PropertyVetoException, css::uno::RuntimeException) + throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) { css::uno::Reference<css::util::XModifiable> xMB; { // do not lock mutex while notifying (#i93514#) to prevent deadlock @@ -2231,7 +2231,7 @@ void SAL_CALL SfxDocumentMetaData::setModified( ::sal_Bool bModified ) // ::com::sun::star::util::XModifyBroadcaster: void SAL_CALL SfxDocumentMetaData::addModifyListener( const css::uno::Reference< css::util::XModifyListener > & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); checkInit(); @@ -2245,7 +2245,7 @@ void SAL_CALL SfxDocumentMetaData::addModifyListener( void SAL_CALL SfxDocumentMetaData::removeModifyListener( const css::uno::Reference< css::util::XModifyListener > & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard g(m_aMutex); checkInit(); @@ -2261,7 +2261,7 @@ void SAL_CALL SfxDocumentMetaData::removeModifyListener( void SAL_CALL SfxDocumentMetaData::serialize( const css::uno::Reference<css::xml::sax::XDocumentHandler>& i_xHandler, const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces) - throw (css::uno::RuntimeException, css::xml::sax::SAXException) + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) { ::osl::MutexGuard g(m_aMutex); checkInit(); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 45c6e3cc0cd7..786ed55b6b70 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -174,7 +174,7 @@ class SfxMediumHandler_Impl : public ::cppu::WeakImplHelper1< com::sun::star::ta public: virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); SfxMediumHandler_Impl( com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > xInteraction ) : m_xInter( xInteraction ) @@ -190,7 +190,7 @@ SfxMediumHandler_Impl::~SfxMediumHandler_Impl() void SAL_CALL SfxMediumHandler_Impl::handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest ) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { if( !m_xInter.is() ) return; diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx index a76a5e2923d7..c632159a9a28 100644 --- a/sfx2/source/doc/docstoragemodifylistener.cxx +++ b/sfx2/source/doc/docstoragemodifylistener.cxx @@ -59,7 +59,7 @@ namespace sfx2 } - void SAL_CALL DocumentStorageModifyListener::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException) + void SAL_CALL DocumentStorageModifyListener::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException, std::exception) { ::osl::Guard< comphelper::SolarMutex > aGuard( m_rMutex ); // storageIsModified must not contain any locking! @@ -68,7 +68,7 @@ namespace sfx2 } - void SAL_CALL DocumentStorageModifyListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException) + void SAL_CALL DocumentStorageModifyListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception) { // not interested in. In particular, we do *not* dispose ourself when a storage we're // listening at is disposed. The reason here is that this listener instance is *reused* diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 0a051139bb95..3c500c129e33 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -172,10 +172,10 @@ public: : m_xInteractionHandler( rxInteractionHandler ) {} - virtual uno::Reference<task::XInteractionHandler> SAL_CALL getInteractionHandler() throw (uno::RuntimeException) + virtual uno::Reference<task::XInteractionHandler> SAL_CALL getInteractionHandler() throw (uno::RuntimeException, std::exception) { return m_xInteractionHandler; } - virtual uno::Reference<ucb::XProgressHandler> SAL_CALL getProgressHandler() throw (uno::RuntimeException) + virtual uno::Reference<ucb::XProgressHandler> SAL_CALL getProgressHandler() throw (uno::RuntimeException, std::exception) { return m_xProgressHandler; } }; @@ -2224,19 +2224,19 @@ public: ~SfxDocTplService(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.sfx2.DocumentTemplates"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.DocumentTemplates"); @@ -2245,27 +2245,27 @@ public: // --- XLocalizable --- - void SAL_CALL setLocale( const css::lang::Locale & eLocale ) throw( css::uno::RuntimeException ); - css::lang::Locale SAL_CALL getLocale() throw( css::uno::RuntimeException ); + void SAL_CALL setLocale( const css::lang::Locale & eLocale ) throw( css::uno::RuntimeException, std::exception ); + css::lang::Locale SAL_CALL getLocale() throw( css::uno::RuntimeException, std::exception ); // --- XDocumentTemplates --- - css::uno::Reference< css::ucb::XContent > SAL_CALL getContent() throw( css::uno::RuntimeException ); + css::uno::Reference< css::ucb::XContent > SAL_CALL getContent() throw( css::uno::RuntimeException, std::exception ); sal_Bool SAL_CALL storeTemplate( const OUString& GroupName, const OUString& TemplateName, - const css::uno::Reference< css::frame::XStorable >& Storable ) throw( css::uno::RuntimeException ); + const css::uno::Reference< css::frame::XStorable >& Storable ) throw( css::uno::RuntimeException, std::exception ); sal_Bool SAL_CALL addTemplate( const OUString& GroupName, const OUString& TemplateName, - const OUString& SourceURL ) throw( css::uno::RuntimeException ); + const OUString& SourceURL ) throw( css::uno::RuntimeException, std::exception ); sal_Bool SAL_CALL removeTemplate( const OUString& GroupName, - const OUString& TemplateName ) throw( css::uno::RuntimeException ); + const OUString& TemplateName ) throw( css::uno::RuntimeException, std::exception ); sal_Bool SAL_CALL renameTemplate( const OUString& GroupName, const OUString& OldTemplateName, - const OUString& NewTemplateName ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL addGroup( const OUString& GroupName ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL removeGroup( const OUString& GroupName ) throw( css::uno::RuntimeException ); + const OUString& NewTemplateName ) throw( css::uno::RuntimeException, std::exception ); + sal_Bool SAL_CALL addGroup( const OUString& GroupName ) throw( css::uno::RuntimeException, std::exception ); + sal_Bool SAL_CALL removeGroup( const OUString& GroupName ) throw( css::uno::RuntimeException, std::exception ); sal_Bool SAL_CALL renameGroup( const OUString& OldGroupName, - const OUString& NewGroupName ) throw( css::uno::RuntimeException ); - void SAL_CALL update() throw( css::uno::RuntimeException ); + const OUString& NewGroupName ) throw( css::uno::RuntimeException, std::exception ); + void SAL_CALL update() throw( css::uno::RuntimeException, std::exception ); }; @@ -2286,7 +2286,7 @@ SfxDocTplService::~SfxDocTplService() Locale SAL_CALL SfxDocTplService::getLocale() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return pImp->getLocale(); } @@ -2294,7 +2294,7 @@ Locale SAL_CALL SfxDocTplService::getLocale() void SAL_CALL SfxDocTplService::setLocale( const Locale & rLocale ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { pImp->setLocale( rLocale ); } @@ -2303,7 +2303,7 @@ void SAL_CALL SfxDocTplService::setLocale( const Locale & rLocale ) //--- XDocumentTemplates --- uno::Reference< ucb::XContent > SAL_CALL SfxDocTplService::getContent() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( pImp->init() ) return pImp->getContent().get(); @@ -2315,7 +2315,7 @@ uno::Reference< ucb::XContent > SAL_CALL SfxDocTplService::getContent() sal_Bool SAL_CALL SfxDocTplService::storeTemplate( const OUString& GroupName, const OUString& TemplateName, const uno::Reference< frame::XStorable >& Storable ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( pImp->init() ) return pImp->storeTemplate( GroupName, TemplateName, Storable ); @@ -2327,7 +2327,7 @@ sal_Bool SAL_CALL SfxDocTplService::storeTemplate( const OUString& GroupName, sal_Bool SAL_CALL SfxDocTplService::addTemplate( const OUString& rGroupName, const OUString& rTemplateName, const OUString& rSourceURL ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( pImp->init() ) return pImp->addTemplate( rGroupName, rTemplateName, rSourceURL ); @@ -2338,7 +2338,7 @@ sal_Bool SAL_CALL SfxDocTplService::addTemplate( const OUString& rGroupName, sal_Bool SAL_CALL SfxDocTplService::removeTemplate( const OUString& rGroupName, const OUString& rTemplateName ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( pImp->init() ) return pImp->removeTemplate( rGroupName, rTemplateName ); @@ -2350,7 +2350,7 @@ sal_Bool SAL_CALL SfxDocTplService::removeTemplate( const OUString& rGroupName, sal_Bool SAL_CALL SfxDocTplService::renameTemplate( const OUString& rGroupName, const OUString& rOldName, const OUString& rNewName ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( rOldName == rNewName ) return sal_True; @@ -2363,7 +2363,7 @@ sal_Bool SAL_CALL SfxDocTplService::renameTemplate( const OUString& rGroupName, sal_Bool SAL_CALL SfxDocTplService::addGroup( const OUString& rGroupName ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( pImp->init() ) return pImp->addGroup( rGroupName ); @@ -2373,7 +2373,7 @@ sal_Bool SAL_CALL SfxDocTplService::addGroup( const OUString& rGroupName ) sal_Bool SAL_CALL SfxDocTplService::removeGroup( const OUString& rGroupName ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( pImp->init() ) return pImp->removeGroup( rGroupName ); @@ -2384,7 +2384,7 @@ sal_Bool SAL_CALL SfxDocTplService::removeGroup( const OUString& rGroupName ) sal_Bool SAL_CALL SfxDocTplService::renameGroup( const OUString& rOldName, const OUString& rNewName ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( rOldName == rNewName ) return sal_True; @@ -2397,7 +2397,7 @@ sal_Bool SAL_CALL SfxDocTplService::renameGroup( const OUString& rOldName, void SAL_CALL SfxDocTplService::update() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( pImp->init() ) pImp->update( sal_True ); diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index 8faa07de09bb..ce1e7e16ae34 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -135,19 +135,19 @@ uno::Sequence< beans::StringPair > DocTemplLocaleHelper::GetParsingResult() void SAL_CALL DocTemplLocaleHelper::startDocument() - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL DocTemplLocaleHelper::endDocument() - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL DocTemplLocaleHelper::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) - throw( xml::sax::SAXException, uno::RuntimeException ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { if ( aName == m_aGroupListElement ) { @@ -199,7 +199,7 @@ void SAL_CALL DocTemplLocaleHelper::startElement( const OUString& aName, const u void SAL_CALL DocTemplLocaleHelper::endElement( const OUString& aName ) - throw( xml::sax::SAXException, uno::RuntimeException ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { sal_Int32 nLength = m_aElementsSeq.getLength(); if ( nLength <= 0 ) @@ -213,25 +213,25 @@ void SAL_CALL DocTemplLocaleHelper::endElement( const OUString& aName ) void SAL_CALL DocTemplLocaleHelper::characters( const OUString& /*aChars*/ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL DocTemplLocaleHelper::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL DocTemplLocaleHelper::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL DocTemplLocaleHelper::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx index b52475180948..5508477b35bf 100644 --- a/sfx2/source/doc/doctemplateslocal.hxx +++ b/sfx2/source/doc/doctemplateslocal.hxx @@ -64,14 +64,14 @@ public: throw( ::com::sun::star::uno::Exception ); // XDocumentHandler - virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); }; #endif diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index b8e85653ee5d..2c57d3e05b4e 100644 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -265,7 +265,7 @@ namespace sfx2 } - void SAL_CALL DocumentUndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException) + void SAL_CALL DocumentUndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException, std::exception) { // SYNCHRONIZED ---> UndoManagerGuard aGuard( *this ); @@ -275,7 +275,7 @@ namespace sfx2 } - void SAL_CALL DocumentUndoManager::enterHiddenUndoContext( ) throw (EmptyUndoStackException, RuntimeException) + void SAL_CALL DocumentUndoManager::enterHiddenUndoContext( ) throw (EmptyUndoStackException, RuntimeException, std::exception) { // SYNCHRONIZED ---> UndoManagerGuard aGuard( *this ); @@ -285,7 +285,7 @@ namespace sfx2 } - void SAL_CALL DocumentUndoManager::leaveUndoContext( ) throw (InvalidStateException, RuntimeException) + void SAL_CALL DocumentUndoManager::leaveUndoContext( ) throw (InvalidStateException, RuntimeException, std::exception) { // SYNCHRONIZED ---> UndoManagerGuard aGuard( *this ); @@ -295,7 +295,7 @@ namespace sfx2 } - void SAL_CALL DocumentUndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (RuntimeException, IllegalArgumentException) + void SAL_CALL DocumentUndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (RuntimeException, IllegalArgumentException, std::exception) { // SYNCHRONIZED ---> UndoManagerGuard aGuard( *this ); @@ -305,7 +305,7 @@ namespace sfx2 } - void SAL_CALL DocumentUndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) + void SAL_CALL DocumentUndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception) { // SYNCHRONIZED ---> UndoManagerGuard aGuard( *this ); @@ -315,7 +315,7 @@ namespace sfx2 } - void SAL_CALL DocumentUndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) + void SAL_CALL DocumentUndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception) { // SYNCHRONIZED ---> UndoManagerGuard aGuard( *this ); @@ -325,49 +325,49 @@ namespace sfx2 } - ::sal_Bool SAL_CALL DocumentUndoManager::isUndoPossible( ) throw (RuntimeException) + ::sal_Bool SAL_CALL DocumentUndoManager::isUndoPossible( ) throw (RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.isUndoPossible(); } - ::sal_Bool SAL_CALL DocumentUndoManager::isRedoPossible( ) throw (RuntimeException) + ::sal_Bool SAL_CALL DocumentUndoManager::isRedoPossible( ) throw (RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.isRedoPossible(); } - OUString SAL_CALL DocumentUndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL DocumentUndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getCurrentUndoActionTitle(); } - OUString SAL_CALL DocumentUndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL DocumentUndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getCurrentRedoActionTitle(); } - Sequence< OUString > SAL_CALL DocumentUndoManager::getAllUndoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DocumentUndoManager::getAllUndoActionTitles( ) throw (RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getAllUndoActionTitles(); } - Sequence< OUString > SAL_CALL DocumentUndoManager::getAllRedoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DocumentUndoManager::getAllRedoActionTitles( ) throw (RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getAllRedoActionTitles(); } - void SAL_CALL DocumentUndoManager::clear( ) throw (UndoContextNotClosedException, RuntimeException) + void SAL_CALL DocumentUndoManager::clear( ) throw (UndoContextNotClosedException, RuntimeException, std::exception) { // SYNCHRONIZED ---> UndoManagerGuard aGuard( *this ); @@ -377,7 +377,7 @@ namespace sfx2 } - void SAL_CALL DocumentUndoManager::clearRedo( ) throw (UndoContextNotClosedException, RuntimeException) + void SAL_CALL DocumentUndoManager::clearRedo( ) throw (UndoContextNotClosedException, RuntimeException, std::exception) { // SYNCHRONIZED ---> UndoManagerGuard aGuard( *this ); @@ -387,7 +387,7 @@ namespace sfx2 } - void SAL_CALL DocumentUndoManager::reset() throw (RuntimeException) + void SAL_CALL DocumentUndoManager::reset() throw (RuntimeException, std::exception) { // SYNCHRONIZED ---> UndoManagerGuard aGuard( *this ); @@ -397,49 +397,49 @@ namespace sfx2 } - void SAL_CALL DocumentUndoManager::lock( ) throw (RuntimeException) + void SAL_CALL DocumentUndoManager::lock( ) throw (RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); m_pImpl->aUndoHelper.lock(); } - void SAL_CALL DocumentUndoManager::unlock( ) throw (RuntimeException, NotLockedException) + void SAL_CALL DocumentUndoManager::unlock( ) throw (RuntimeException, NotLockedException, std::exception) { UndoManagerGuard aGuard( *this ); m_pImpl->aUndoHelper.unlock(); } - ::sal_Bool SAL_CALL DocumentUndoManager::isLocked( ) throw (RuntimeException) + ::sal_Bool SAL_CALL DocumentUndoManager::isLocked( ) throw (RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.isLocked(); } - void SAL_CALL DocumentUndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) + void SAL_CALL DocumentUndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.addUndoManagerListener( i_listener ); } - void SAL_CALL DocumentUndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) + void SAL_CALL DocumentUndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.removeUndoManagerListener( i_listener ); } - Reference< XInterface > SAL_CALL DocumentUndoManager::getParent( ) throw (RuntimeException) + Reference< XInterface > SAL_CALL DocumentUndoManager::getParent( ) throw (RuntimeException, std::exception) { UndoManagerGuard aGuard( *this ); return static_cast< XModel* >( &getBaseModel() ); } - void SAL_CALL DocumentUndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException) + void SAL_CALL DocumentUndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException, std::exception) { (void)i_parent; throw NoSupportException( OUString(), m_pImpl->getThis() ); diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 9e41641e68ec..03941276ba14 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -68,19 +68,19 @@ public: ~IFrameObject(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.sfx2.IFrameObject"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.SpecialEmbeddedObject"); @@ -88,21 +88,21 @@ public: } virtual sal_Bool SAL_CALL load( const css::uno::Sequence < css::beans::PropertyValue >& lDescriptor, - const css::uno::Reference < css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL cancel() throw( css::uno::RuntimeException ); - virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException, css::uno::RuntimeException ); - virtual void SAL_CALL addCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException) ; - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + const css::uno::Reference < css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) ; + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); }; class IFrameWindow_Impl : public Window @@ -173,7 +173,7 @@ IFrameObject::~IFrameObject() sal_Bool SAL_CALL IFrameObject::load( const uno::Sequence < com::sun::star::beans::PropertyValue >& /*lDescriptor*/, const uno::Reference < frame::XFrame >& xFrame ) -throw( uno::RuntimeException ) +throw( uno::RuntimeException, std::exception ) { if ( SvtMiscOptions().IsPluginsEnabled() ) { @@ -219,7 +219,7 @@ throw( uno::RuntimeException ) return sal_False; } -void SAL_CALL IFrameObject::cancel() throw( com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::cancel() throw( com::sun::star::uno::RuntimeException, std::exception ) { try { @@ -233,31 +233,31 @@ void SAL_CALL IFrameObject::cancel() throw( com::sun::star::uno::RuntimeExceptio } } -void SAL_CALL IFrameObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException, std::exception ) { } -void SAL_CALL IFrameObject::addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException, std::exception ) { } -void SAL_CALL IFrameObject::removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException, std::exception ) { } -void SAL_CALL IFrameObject::disposing( const com::sun::star::lang::EventObject& ) throw (com::sun::star::uno::RuntimeException) +void SAL_CALL IFrameObject::disposing( const com::sun::star::lang::EventObject& ) throw (com::sun::star::uno::RuntimeException, std::exception) { cancel(); } -uno::Reference< beans::XPropertySetInfo > SAL_CALL IFrameObject::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException ) +uno::Reference< beans::XPropertySetInfo > SAL_CALL IFrameObject::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > xInfo = new SfxItemPropertySetInfo( maPropMap ); return xInfo; } void SAL_CALL IFrameObject::setPropertyValue(const OUString& aPropertyName, const uno::Any& aAny) - throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) + throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName ); if( !pEntry ) @@ -338,7 +338,7 @@ void SAL_CALL IFrameObject::setPropertyValue(const OUString& aPropertyName, cons } uno::Any SAL_CALL IFrameObject::getPropertyValue(const OUString& aPropertyName) - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName ); if( !pEntry ) @@ -394,23 +394,23 @@ uno::Any SAL_CALL IFrameObject::getPropertyValue(const OUString& aPropertyName) return aAny; } -void SAL_CALL IFrameObject::addPropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::addPropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { } -void SAL_CALL IFrameObject::removePropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::removePropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { } -void SAL_CALL IFrameObject::addVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::addVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { } -void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { } -::sal_Int16 SAL_CALL IFrameObject::execute() throw (::com::sun::star::uno::RuntimeException) +::sal_Int16 SAL_CALL IFrameObject::execute() throw (::com::sun::star::uno::RuntimeException, std::exception) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, ".uno:InsertObjectFloatingFrame", mxObj ); @@ -419,7 +419,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const return 0; } -void SAL_CALL IFrameObject::setTitle( const OUString& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL IFrameObject::setTitle( const OUString& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { } diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 50c46815f874..6de6e06a8d48 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -155,11 +155,11 @@ public: void SetPreventClose( sal_Bool bPrevent ) { m_bPreventClose = bPrevent; } virtual void SAL_CALL queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) - throw ( uno::RuntimeException, util::CloseVetoException ); + throw ( uno::RuntimeException, util::CloseVetoException, std::exception ); - virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException ) ; + virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException, std::exception ) ; - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException ) ; + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException, std::exception ) ; } ; @@ -170,7 +170,7 @@ SfxClosePreventer_Impl::SfxClosePreventer_Impl() } void SAL_CALL SfxClosePreventer_Impl::queryClosing( const lang::EventObject&, sal_Bool bDeliverOwnership ) - throw ( uno::RuntimeException, util::CloseVetoException ) + throw ( uno::RuntimeException, util::CloseVetoException, std::exception ) { if ( m_bPreventClose ) { @@ -181,10 +181,10 @@ void SAL_CALL SfxClosePreventer_Impl::queryClosing( const lang::EventObject&, sa } } -void SAL_CALL SfxClosePreventer_Impl::notifyClosing( const lang::EventObject& ) throw ( uno::RuntimeException ) +void SAL_CALL SfxClosePreventer_Impl::notifyClosing( const lang::EventObject& ) throw ( uno::RuntimeException, std::exception ) {} -void SAL_CALL SfxClosePreventer_Impl::disposing( const lang::EventObject& ) throw ( uno::RuntimeException ) +void SAL_CALL SfxClosePreventer_Impl::disposing( const lang::EventObject& ) throw ( uno::RuntimeException, std::exception ) {} diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index e9a3a76e54af..262dabd41c1a 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -157,24 +157,24 @@ class SfxModelListener_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star:: public: SfxModelListener_Impl( SfxObjectShell* pDoc ) : mpDoc(pDoc) {}; virtual void SAL_CALL queryClosing( const com::sun::star::lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) - throw ( com::sun::star::uno::RuntimeException, com::sun::star::util::CloseVetoException) ; - virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aEvent ) throw ( com::sun::star::uno::RuntimeException ) ; - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw ( com::sun::star::uno::RuntimeException ) ; + throw ( com::sun::star::uno::RuntimeException, com::sun::star::util::CloseVetoException, std::exception) ; + virtual void SAL_CALL notifyClosing( const com::sun::star::lang::EventObject& aEvent ) throw ( com::sun::star::uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw ( com::sun::star::uno::RuntimeException, std::exception ) ; }; void SAL_CALL SfxModelListener_Impl::queryClosing( const com::sun::star::lang::EventObject& , sal_Bool ) - throw ( com::sun::star::uno::RuntimeException, com::sun::star::util::CloseVetoException) + throw ( com::sun::star::uno::RuntimeException, com::sun::star::util::CloseVetoException, std::exception) { } -void SAL_CALL SfxModelListener_Impl::notifyClosing( const com::sun::star::lang::EventObject& ) throw ( com::sun::star::uno::RuntimeException ) +void SAL_CALL SfxModelListener_Impl::notifyClosing( const com::sun::star::lang::EventObject& ) throw ( com::sun::star::uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; mpDoc->Broadcast( SfxSimpleHint(SFX_HINT_DEINITIALIZING) ); } -void SAL_CALL SfxModelListener_Impl::disposing( const com::sun::star::lang::EventObject& _rEvent ) throw ( com::sun::star::uno::RuntimeException ) +void SAL_CALL SfxModelListener_Impl::disposing( const com::sun::star::lang::EventObject& _rEvent ) throw ( com::sun::star::uno::RuntimeException, std::exception ) { // am I ThisComponent in AppBasic? SolarMutexGuard aSolarGuard; diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx index 4529730f7d05..4516624e2c65 100644 --- a/sfx2/source/doc/ownsubfilterservice.cxx +++ b/sfx2/source/doc/ownsubfilterservice.cxx @@ -47,13 +47,13 @@ public: virtual ~OwnSubFilterService(); // XFilter - virtual ::sal_Bool SAL_CALL filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) throw (uno::RuntimeException); - virtual void SAL_CALL cancel() throw (uno::RuntimeException); + virtual ::sal_Bool SAL_CALL filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL cancel() throw (uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (uno::RuntimeException); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception); }; OwnSubFilterService::OwnSubFilterService(const css::uno::Sequence< css::uno::Any >& aArguments) @@ -85,7 +85,7 @@ OwnSubFilterService::~OwnSubFilterService() } sal_Bool SAL_CALL OwnSubFilterService::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if ( !m_pObjectShell ) throw uno::RuntimeException(); @@ -94,25 +94,25 @@ sal_Bool SAL_CALL OwnSubFilterService::filter( const uno::Sequence< beans::Prope } void SAL_CALL OwnSubFilterService::cancel() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // not implemented } OUString SAL_CALL OwnSubFilterService::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.document.OwnSubFilter"); } sal_Bool SAL_CALL OwnSubFilterService::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL OwnSubFilterService::getSupportedServiceNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(2); aRet[0] = "com.sun.star.document.OwnSubFilter"; diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx index 43f73973382d..9775dca4adef 100644 --- a/sfx2/source/doc/plugin.cxx +++ b/sfx2/source/doc/plugin.cxx @@ -98,34 +98,34 @@ public: ~PluginObject(); virtual sal_Bool SAL_CALL load( const css::uno::Sequence < css::beans::PropertyValue >& lDescriptor, - const css::uno::Reference < css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL cancel() throw( css::uno::RuntimeException ); - virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException, css::uno::RuntimeException ); - virtual void SAL_CALL addCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException) ; - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + const css::uno::Reference < css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) ; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.sfx2.PluginObject"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.SpecialEmbeddedObject"); @@ -145,7 +145,7 @@ PluginObject::~PluginObject() sal_Bool SAL_CALL PluginObject::load( const uno::Sequence < com::sun::star::beans::PropertyValue >& /*lDescriptor*/, const uno::Reference < frame::XFrame >& xFrame ) -throw( uno::RuntimeException ) +throw( uno::RuntimeException, std::exception ) { uno::Reference< plugin::XPluginManager > xPMgr( plugin::PluginManager::create(comphelper::getProcessComponentContext()) ); @@ -212,7 +212,7 @@ throw( uno::RuntimeException ) return sal_False; } -void SAL_CALL PluginObject::cancel() throw( com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::cancel() throw( com::sun::star::uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xComp( mxPlugin, uno::UNO_QUERY ); if (xComp.is()) @@ -220,31 +220,31 @@ void SAL_CALL PluginObject::cancel() throw( com::sun::star::uno::RuntimeExceptio mxPlugin = 0; } -void SAL_CALL PluginObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException, std::exception ) { } -void SAL_CALL PluginObject::addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException, std::exception ) { } -void SAL_CALL PluginObject::removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException, std::exception ) { } -void SAL_CALL PluginObject::disposing( const com::sun::star::lang::EventObject& ) throw (com::sun::star::uno::RuntimeException) +void SAL_CALL PluginObject::disposing( const com::sun::star::lang::EventObject& ) throw (com::sun::star::uno::RuntimeException, std::exception) { cancel(); } -uno::Reference< beans::XPropertySetInfo > SAL_CALL PluginObject::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException ) +uno::Reference< beans::XPropertySetInfo > SAL_CALL PluginObject::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { static uno::Reference< beans::XPropertySetInfo > xInfo = new SfxItemPropertySetInfo( maPropMap ); return xInfo; } void SAL_CALL PluginObject::setPropertyValue(const OUString& aPropertyName, const uno::Any& aAny) - throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) + throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if ( aPropertyName == "PluginURL" ) { @@ -266,7 +266,7 @@ void SAL_CALL PluginObject::setPropertyValue(const OUString& aPropertyName, cons } uno::Any SAL_CALL PluginObject::getPropertyValue(const OUString& aPropertyName) - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aAny; if ( aPropertyName == "PluginURL" ) @@ -288,19 +288,19 @@ uno::Any SAL_CALL PluginObject::getPropertyValue(const OUString& aPropertyName) return aAny; } -void SAL_CALL PluginObject::addPropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::addPropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { } -void SAL_CALL PluginObject::removePropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::removePropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { } -void SAL_CALL PluginObject::addVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::addVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { } -void SAL_CALL PluginObject::removeVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::removeVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { } diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index c5f893c7b8f1..d92a31fb80b1 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -103,10 +103,10 @@ class SfxPrintJob_Impl : public cppu::WeakImplHelper1 public: SfxPrintJob_Impl( IMPL_PrintListener_DataContainer* pData ); - virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrintOptions( ) throw (RuntimeException); - virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter( ) throw (RuntimeException); - virtual Reference< ::com::sun::star::view::XPrintable > SAL_CALL getPrintable( ) throw (RuntimeException); - virtual void SAL_CALL cancelJob() throw (RuntimeException); + virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrintOptions( ) throw (RuntimeException, std::exception); + virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter( ) throw (RuntimeException, std::exception); + virtual Reference< ::com::sun::star::view::XPrintable > SAL_CALL getPrintable( ) throw (RuntimeException, std::exception); + virtual void SAL_CALL cancelJob() throw (RuntimeException, std::exception); }; SfxPrintJob_Impl::SfxPrintJob_Impl( IMPL_PrintListener_DataContainer* pData ) @@ -114,12 +114,12 @@ SfxPrintJob_Impl::SfxPrintJob_Impl( IMPL_PrintListener_DataContainer* pData ) { } -Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrintOptions() throw (RuntimeException) +Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrintOptions() throw (RuntimeException, std::exception) { return m_pData->m_aPrintOptions; } -Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrinter() throw (RuntimeException) +Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::getPrinter() throw (RuntimeException, std::exception) { if( m_pData->m_pObjectShell.Is() ) { @@ -130,13 +130,13 @@ Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL SfxPrintJob_Impl::ge return Sequence< ::com::sun::star::beans::PropertyValue >(); } -Reference< ::com::sun::star::view::XPrintable > SAL_CALL SfxPrintJob_Impl::getPrintable() throw (RuntimeException) +Reference< ::com::sun::star::view::XPrintable > SAL_CALL SfxPrintJob_Impl::getPrintable() throw (RuntimeException, std::exception) { Reference < view::XPrintable > xPrintable( m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->GetModel() : NULL, UNO_QUERY ); return xPrintable; } -void SAL_CALL SfxPrintJob_Impl::cancelJob() throw (RuntimeException) +void SAL_CALL SfxPrintJob_Impl::cancelJob() throw (RuntimeException, std::exception) { // FIXME: how to cancel PrintJob via API?! if( m_pData->m_pObjectShell.Is() ) @@ -148,7 +148,7 @@ SfxPrintHelper::SfxPrintHelper() m_pData = new IMPL_PrintListener_DataContainer(m_aMutex); } -void SAL_CALL SfxPrintHelper::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +void SAL_CALL SfxPrintHelper::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { if ( aArguments.getLength() ) { @@ -253,7 +253,7 @@ namespace // XPrintable -uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() throw(::com::sun::star::uno::RuntimeException) +uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() throw(::com::sun::star::uno::RuntimeException, std::exception) { // object already disposed? SolarMutexGuard aGuard; @@ -448,7 +448,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > } void SAL_CALL SfxPrintHelper::setPrinter(const uno::Sequence< beans::PropertyValue >& rPrinter) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { // object already disposed? SolarMutexGuard aGuard; @@ -581,7 +581,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread // XPrintable void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& rOptions) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { if( Application::GetSettings().GetMiscSettings().GetDisablePrinting() ) return; @@ -820,13 +820,13 @@ void IMPL_PrintListener_DataContainer::Notify( SfxBroadcaster& rBC, const SfxHin ((view::XPrintJobListener*)pIterator.next())->printJobEvent( aEvent ); } -void SAL_CALL SfxPrintHelper::addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SfxPrintHelper::addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const uno::Reference < view::XPrintJobListener>*)0), xListener ); } -void SAL_CALL SfxPrintHelper::removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SfxPrintHelper::removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const uno::Reference < view::XPrintJobListener>*)0), xListener ); diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx index 331c170559fc..47529163502e 100644 --- a/sfx2/source/doc/printhelper.hxx +++ b/sfx2/source/doc/printhelper.hxx @@ -47,14 +47,14 @@ public: SfxPrintHelper() ; virtual ~SfxPrintHelper() ; - void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getPrinter() throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getPrinter() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPrinter( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& seqPrinter ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL print( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& seqOptions ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); private: diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 171d2cbacb22..7a30ba3e1a21 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -154,15 +154,15 @@ public: ~SfxDocInfoListener_Impl(); virtual void SAL_CALL disposing( const lang::EventObject& ) - throw ( RuntimeException ); + throw ( RuntimeException, std::exception ); virtual void SAL_CALL modified( const lang::EventObject& ) - throw ( RuntimeException ); + throw ( RuntimeException, std::exception ); }; SfxDocInfoListener_Impl::~SfxDocInfoListener_Impl() { } void SAL_CALL SfxDocInfoListener_Impl::modified( const lang::EventObject& ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -171,7 +171,7 @@ void SAL_CALL SfxDocInfoListener_Impl::modified( const lang::EventObject& ) } void SAL_CALL SfxDocInfoListener_Impl::disposing( const lang::EventObject& ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { } @@ -322,16 +322,16 @@ public: : m_pData( pData ) {} - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( RuntimeException ) ; - virtual void SAL_CALL printJobEvent( const view::PrintJobEvent& rEvent ) throw ( RuntimeException); + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( RuntimeException, std::exception ) ; + virtual void SAL_CALL printJobEvent( const view::PrintJobEvent& rEvent ) throw ( RuntimeException, std::exception); }; -void SAL_CALL SfxPrintHelperListener_Impl::disposing( const lang::EventObject& ) throw ( RuntimeException ) +void SAL_CALL SfxPrintHelperListener_Impl::disposing( const lang::EventObject& ) throw ( RuntimeException, std::exception ) { m_pData->m_xPrintable = 0; } -void SAL_CALL SfxPrintHelperListener_Impl::printJobEvent( const view::PrintJobEvent& rEvent ) throw (RuntimeException) +void SAL_CALL SfxPrintHelperListener_Impl::printJobEvent( const view::PrintJobEvent& rEvent ) throw (RuntimeException, std::exception) { ::cppu::OInterfaceContainerHelper* pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const Reference< view::XPrintJobListener >*) NULL ) ); if ( pContainer!=NULL ) @@ -543,7 +543,7 @@ SfxBaseModel::~SfxBaseModel() // XInterface -Any SAL_CALL SfxBaseModel::queryInterface( const uno::Type& rType ) throw( RuntimeException ) +Any SAL_CALL SfxBaseModel::queryInterface( const uno::Type& rType ) throw( RuntimeException, std::exception ) { if ( ( !m_bSupportEmbeddedScripts && rType.equals( cppu::UnoType<document::XEmbeddedScripts>::get() ) ) || ( !m_bSupportDocRecovery && rType.equals( cppu::UnoType<XDocumentRecovery>::get() ) ) @@ -598,7 +598,7 @@ namespace } } -Sequence< uno::Type > SAL_CALL SfxBaseModel::getTypes() throw( RuntimeException ) +Sequence< uno::Type > SAL_CALL SfxBaseModel::getTypes() throw( RuntimeException, std::exception ) { Sequence< uno::Type > aTypes( SfxBaseModel_Base::getTypes() ); @@ -615,7 +615,7 @@ Sequence< uno::Type > SAL_CALL SfxBaseModel::getTypes() throw( RuntimeException // XTypeProvider -Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId() throw( RuntimeException, std::exception ) { // Create one Id for all instances of this class. // Use ethernet address to do this! (sal_True) @@ -663,7 +663,7 @@ Reference< script::XStarBasicAccess > implGetStarBasicAccess( SfxObjectShell* pO return xRet; } -Reference< container::XNameContainer > SAL_CALL SfxBaseModel::getLibraryContainer() throw( RuntimeException ) +Reference< container::XNameContainer > SAL_CALL SfxBaseModel::getLibraryContainer() throw( RuntimeException, std::exception ) { #ifdef DISABLE_SCRIPTING Reference< container::XNameContainer > dummy; @@ -688,7 +688,7 @@ Reference< container::XNameContainer > SAL_CALL SfxBaseModel::getLibraryContaine */ void SAL_CALL SfxBaseModel::createLibrary( const OUString& LibName, const OUString& Password, const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) - throw(container::ElementExistException, RuntimeException) + throw(container::ElementExistException, RuntimeException, std::exception) { #ifdef DISABLE_SCRIPTING (void) LibName; @@ -712,7 +712,7 @@ void SAL_CALL SfxBaseModel::createLibrary( const OUString& LibName, const OUStri */ void SAL_CALL SfxBaseModel::addModule( const OUString& LibraryName, const OUString& ModuleName, const OUString& Language, const OUString& Source ) - throw( container::NoSuchElementException, RuntimeException) + throw( container::NoSuchElementException, RuntimeException, std::exception) { #ifdef DISABLE_SCRIPTING (void) LibraryName; @@ -736,7 +736,7 @@ void SAL_CALL SfxBaseModel::addModule( const OUString& LibraryName, const OUStri */ void SAL_CALL SfxBaseModel::addDialog( const OUString& LibraryName, const OUString& DialogName, const Sequence< sal_Int8 >& Data ) - throw(container::NoSuchElementException, RuntimeException) + throw(container::NoSuchElementException, RuntimeException, std::exception) { #ifdef DISABLE_SCRIPTING (void) LibraryName; @@ -759,7 +759,7 @@ void SAL_CALL SfxBaseModel::addDialog( const OUString& LibraryName, const OUStri // XChild -Reference< XInterface > SAL_CALL SfxBaseModel::getParent() throw( RuntimeException ) +Reference< XInterface > SAL_CALL SfxBaseModel::getParent() throw( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -770,7 +770,7 @@ Reference< XInterface > SAL_CALL SfxBaseModel::getParent() throw( RuntimeExcepti // XChild -void SAL_CALL SfxBaseModel::setParent(const Reference< XInterface >& Parent) throw(lang::NoSupportException, RuntimeException) +void SAL_CALL SfxBaseModel::setParent(const Reference< XInterface >& Parent) throw(lang::NoSupportException, RuntimeException, std::exception) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); m_pData->m_xParent = Parent; @@ -780,7 +780,7 @@ void SAL_CALL SfxBaseModel::setParent(const Reference< XInterface >& Parent) thr // XChild -void SAL_CALL SfxBaseModel::dispose() throw(RuntimeException) +void SAL_CALL SfxBaseModel::dispose() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); @@ -836,7 +836,7 @@ void SAL_CALL SfxBaseModel::dispose() throw(RuntimeException) void SAL_CALL SfxBaseModel::addEventListener( const Reference< lang::XEventListener >& aListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); @@ -847,7 +847,7 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< lang::XEventListe void SAL_CALL SfxBaseModel::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); @@ -866,7 +866,7 @@ IMPL_SfxBaseModel_DataContainer::impl_setDocumentProperties( // document::XDocumentPropertiesSupplier: Reference< document::XDocumentProperties > SAL_CALL SfxBaseModel::getDocumentProperties() - throw(RuntimeException) + throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); if ( !m_pData->m_xDocumentProperties.is() ) @@ -885,7 +885,7 @@ SfxBaseModel::getDocumentProperties() void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( impl_isDisposed() ) @@ -909,7 +909,7 @@ void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject ) sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& rURL , const Sequence< beans::PropertyValue >& rArgs ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); if ( rURL.isEmpty() && rArgs.getLength() == 1 && rArgs[0].Name == "SetEmbedded" ) @@ -994,7 +994,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& // frame::XModel -OUString SAL_CALL SfxBaseModel::getURL() throw(RuntimeException) +OUString SAL_CALL SfxBaseModel::getURL() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); return m_pData->m_sURL ; @@ -1004,7 +1004,7 @@ OUString SAL_CALL SfxBaseModel::getURL() throw(RuntimeException) // frame::XModel -Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeException) +Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); if ( m_pData->m_pObjectShell.Is() ) @@ -1104,7 +1104,7 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE void SAL_CALL SfxBaseModel::connectController( const Reference< frame::XController >& xController ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); OSL_PRECOND( xController.is(), "SfxBaseModel::connectController: invalid controller!" ); @@ -1133,7 +1133,7 @@ void SAL_CALL SfxBaseModel::connectController( const Reference< frame::XControll // frame::XModel -void SAL_CALL SfxBaseModel::disconnectController( const Reference< frame::XController >& xController ) throw(RuntimeException) +void SAL_CALL SfxBaseModel::disconnectController( const Reference< frame::XController >& xController ) throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1170,22 +1170,22 @@ namespace } // XUndoAction - virtual OUString SAL_CALL getTitle() throw (RuntimeException); - virtual void SAL_CALL undo( ) throw (UndoFailedException, RuntimeException); - virtual void SAL_CALL redo( ) throw (UndoFailedException, RuntimeException); + virtual OUString SAL_CALL getTitle() throw (RuntimeException, std::exception); + virtual void SAL_CALL undo( ) throw (UndoFailedException, RuntimeException, std::exception); + virtual void SAL_CALL redo( ) throw (UndoFailedException, RuntimeException, std::exception); private: const Reference< XModel > m_xModel; const bool m_bUndoIsUnlock; }; - OUString SAL_CALL ControllerLockUndoAction::getTitle() throw (RuntimeException) + OUString SAL_CALL ControllerLockUndoAction::getTitle() throw (RuntimeException, std::exception) { // this action is intended to be used within an UndoContext only, so nobody will ever see this title ... return OUString(); } - void SAL_CALL ControllerLockUndoAction::undo( ) throw (UndoFailedException, RuntimeException) + void SAL_CALL ControllerLockUndoAction::undo( ) throw (UndoFailedException, RuntimeException, std::exception) { if ( m_bUndoIsUnlock ) m_xModel->unlockControllers(); @@ -1193,7 +1193,7 @@ namespace m_xModel->lockControllers(); } - void SAL_CALL ControllerLockUndoAction::redo( ) throw (UndoFailedException, RuntimeException) + void SAL_CALL ControllerLockUndoAction::redo( ) throw (UndoFailedException, RuntimeException, std::exception) { if ( m_bUndoIsUnlock ) m_xModel->lockControllers(); @@ -1206,7 +1206,7 @@ namespace // frame::XModel -void SAL_CALL SfxBaseModel::lockControllers() throw(RuntimeException) +void SAL_CALL SfxBaseModel::lockControllers() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1225,7 +1225,7 @@ void SAL_CALL SfxBaseModel::lockControllers() throw(RuntimeException) // frame::XModel -void SAL_CALL SfxBaseModel::unlockControllers() throw(RuntimeException) +void SAL_CALL SfxBaseModel::unlockControllers() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1244,7 +1244,7 @@ void SAL_CALL SfxBaseModel::unlockControllers() throw(RuntimeException) // frame::XModel -sal_Bool SAL_CALL SfxBaseModel::hasControllersLocked() throw(RuntimeException) +sal_Bool SAL_CALL SfxBaseModel::hasControllersLocked() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); return ( m_pData->m_nControllerLockCount != 0 ) ; @@ -1254,7 +1254,7 @@ sal_Bool SAL_CALL SfxBaseModel::hasControllersLocked() throw(RuntimeException) // frame::XModel -Reference< frame::XController > SAL_CALL SfxBaseModel::getCurrentController() throw(RuntimeException) +Reference< frame::XController > SAL_CALL SfxBaseModel::getCurrentController() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1271,7 +1271,7 @@ Reference< frame::XController > SAL_CALL SfxBaseModel::getCurrentController() th void SAL_CALL SfxBaseModel::setCurrentController( const Reference< frame::XController >& xCurrentController ) - throw (container::NoSuchElementException, RuntimeException) + throw (container::NoSuchElementException, RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1282,7 +1282,7 @@ void SAL_CALL SfxBaseModel::setCurrentController( const Reference< frame::XContr // frame::XModel -Reference< XInterface > SAL_CALL SfxBaseModel::getCurrentSelection() throw(RuntimeException) +Reference< XInterface > SAL_CALL SfxBaseModel::getCurrentSelection() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1306,7 +1306,7 @@ Reference< XInterface > SAL_CALL SfxBaseModel::getCurrentSelection() throw(Runti // XModifiable2 -sal_Bool SAL_CALL SfxBaseModel::disableSetModified() throw (RuntimeException) +sal_Bool SAL_CALL SfxBaseModel::disableSetModified() throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1319,7 +1319,7 @@ sal_Bool SAL_CALL SfxBaseModel::disableSetModified() throw (RuntimeException) return bResult; } -sal_Bool SAL_CALL SfxBaseModel::enableSetModified() throw (RuntimeException) +sal_Bool SAL_CALL SfxBaseModel::enableSetModified() throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1332,7 +1332,7 @@ sal_Bool SAL_CALL SfxBaseModel::enableSetModified() throw (RuntimeException) return bResult; } -sal_Bool SAL_CALL SfxBaseModel::isSetModifiedEnabled() throw (RuntimeException) +sal_Bool SAL_CALL SfxBaseModel::isSetModifiedEnabled() throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1346,7 +1346,7 @@ sal_Bool SAL_CALL SfxBaseModel::isSetModifiedEnabled() throw (RuntimeException) // XModifiable -sal_Bool SAL_CALL SfxBaseModel::isModified() throw(RuntimeException) +sal_Bool SAL_CALL SfxBaseModel::isModified() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1358,7 +1358,7 @@ sal_Bool SAL_CALL SfxBaseModel::isModified() throw(RuntimeException) void SAL_CALL SfxBaseModel::setModified( sal_Bool bModified ) - throw (beans::PropertyVetoException, RuntimeException) + throw (beans::PropertyVetoException, RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1370,7 +1370,7 @@ void SAL_CALL SfxBaseModel::setModified( sal_Bool bModified ) // XModifiable -void SAL_CALL SfxBaseModel::addModifyListener(const Reference< util::XModifyListener >& xListener) throw( RuntimeException ) +void SAL_CALL SfxBaseModel::addModifyListener(const Reference< util::XModifyListener >& xListener) throw( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); @@ -1381,7 +1381,7 @@ void SAL_CALL SfxBaseModel::addModifyListener(const Reference< util::XModifyList // XModifiable -void SAL_CALL SfxBaseModel::removeModifyListener(const Reference< util::XModifyListener >& xListener) throw( RuntimeException ) +void SAL_CALL SfxBaseModel::removeModifyListener(const Reference< util::XModifyListener >& xListener) throw( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -1392,7 +1392,7 @@ void SAL_CALL SfxBaseModel::removeModifyListener(const Reference< util::XModifyL // XCloseable -void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::CloseVetoException, RuntimeException) +void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::CloseVetoException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( impl_isDisposed() || m_pData->m_bClosed || m_pData->m_bClosing ) @@ -1455,7 +1455,7 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo // XCloseBroadcaster -void SAL_CALL SfxBaseModel::addCloseListener( const Reference< util::XCloseListener >& xListener ) throw (RuntimeException) +void SAL_CALL SfxBaseModel::addCloseListener( const Reference< util::XCloseListener >& xListener ) throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); @@ -1466,7 +1466,7 @@ void SAL_CALL SfxBaseModel::addCloseListener( const Reference< util::XCloseListe // XCloseBroadcaster -void SAL_CALL SfxBaseModel::removeCloseListener( const Reference< util::XCloseListener >& xListener ) throw (RuntimeException) +void SAL_CALL SfxBaseModel::removeCloseListener( const Reference< util::XCloseListener >& xListener ) throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1477,7 +1477,7 @@ void SAL_CALL SfxBaseModel::removeCloseListener( const Reference< util::XCloseLi // XPrintable -Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getPrinter() throw(RuntimeException) +Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getPrinter() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1488,7 +1488,7 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getPrinter() throw(Runti } void SAL_CALL SfxBaseModel::setPrinter(const Sequence< beans::PropertyValue >& rPrinter) - throw (lang::IllegalArgumentException, RuntimeException) + throw (lang::IllegalArgumentException, RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1497,7 +1497,7 @@ void SAL_CALL SfxBaseModel::setPrinter(const Sequence< beans::PropertyValue >& r } void SAL_CALL SfxBaseModel::print(const Sequence< beans::PropertyValue >& rOptions) - throw (lang::IllegalArgumentException, RuntimeException) + throw (lang::IllegalArgumentException, RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1509,7 +1509,7 @@ void SAL_CALL SfxBaseModel::print(const Sequence< beans::PropertyValue >& rOptio // XStorable -sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException) +sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1520,7 +1520,7 @@ sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException) // XStorable -OUString SAL_CALL SfxBaseModel::getLocation() throw(RuntimeException) +OUString SAL_CALL SfxBaseModel::getLocation() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1540,7 +1540,7 @@ OUString SAL_CALL SfxBaseModel::getLocation() throw(RuntimeException) // XStorable -sal_Bool SAL_CALL SfxBaseModel::isReadonly() throw(RuntimeException) +sal_Bool SAL_CALL SfxBaseModel::isReadonly() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1554,7 +1554,7 @@ sal_Bool SAL_CALL SfxBaseModel::isReadonly() throw(RuntimeException) void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue >& aSeqArgs ) throw ( lang::IllegalArgumentException, io::IOException, - RuntimeException ) + RuntimeException, std::exception ) { SAL_INFO( "sfx.doc", "PERFORMANCE - SfxBaseModel::storeSelf" ); SfxModelGuard aGuard( *this ); @@ -1673,7 +1673,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > // XStorable -void SAL_CALL SfxBaseModel::store() throw (io::IOException, RuntimeException) +void SAL_CALL SfxBaseModel::store() throw (io::IOException, RuntimeException, std::exception) { storeSelf( Sequence< beans::PropertyValue >() ); } @@ -1684,7 +1684,7 @@ void SAL_CALL SfxBaseModel::store() throw (io::IOException, RuntimeException) void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL , const Sequence< beans::PropertyValue >& rArgs ) - throw (io::IOException, RuntimeException) + throw (io::IOException, RuntimeException, std::exception) { SAL_INFO( "sfx.doc", "PERFORMANCE - SfxBaseModel::storeAsURL" ); SfxModelGuard aGuard( *this ); @@ -1712,7 +1712,7 @@ void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL // XUndoManagerSupplier -Reference< XUndoManager > SAL_CALL SfxBaseModel::getUndoManager( ) throw (RuntimeException) +Reference< XUndoManager > SAL_CALL SfxBaseModel::getUndoManager( ) throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); if ( !m_pData->m_pDocumentUndoManager.is() ) @@ -1726,7 +1726,7 @@ Reference< XUndoManager > SAL_CALL SfxBaseModel::getUndoManager( ) throw (Runti void SAL_CALL SfxBaseModel::storeToURL( const OUString& rURL , const Sequence< beans::PropertyValue >& rArgs ) - throw (io::IOException, RuntimeException) + throw (io::IOException, RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -1738,13 +1738,13 @@ void SAL_CALL SfxBaseModel::storeToURL( const OUString& rURL } } -::sal_Bool SAL_CALL SfxBaseModel::wasModifiedSinceLastSave() throw ( RuntimeException ) +::sal_Bool SAL_CALL SfxBaseModel::wasModifiedSinceLastSave() throw ( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); return m_pData->m_bModifiedSinceLastSave; } -void SAL_CALL SfxBaseModel::storeToRecoveryFile( const OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException ) +void SAL_CALL SfxBaseModel::storeToRecoveryFile( const OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -1756,7 +1756,7 @@ void SAL_CALL SfxBaseModel::storeToRecoveryFile( const OUString& i_TargetLocatio m_pData->m_bModifiedSinceLastSave = sal_False; } -void SAL_CALL SfxBaseModel::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException ) +void SAL_CALL SfxBaseModel::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException, std::exception ) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); @@ -1791,7 +1791,7 @@ void SAL_CALL SfxBaseModel::initNew() throw (frame::DoubleInitializationException, io::IOException, RuntimeException, - Exception) + Exception, std::exception) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); if ( IsInitialized() ) @@ -1843,7 +1843,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA throw (frame::DoubleInitializationException, io::IOException, RuntimeException, - Exception) + Exception, std::exception) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); if ( IsInitialized() ) @@ -1973,7 +1973,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFlavor ) throw (datatransfer::UnsupportedFlavorException, io::IOException, - RuntimeException) + RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -2212,7 +2212,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavors() - throw (RuntimeException) + throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -2281,7 +2281,7 @@ Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavo sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -2340,7 +2340,7 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF // XEventsSupplier -Reference< container::XNameReplace > SAL_CALL SfxBaseModel::getEvents() throw( RuntimeException ) +Reference< container::XNameReplace > SAL_CALL SfxBaseModel::getEvents() throw( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -2356,7 +2356,7 @@ Reference< container::XNameReplace > SAL_CALL SfxBaseModel::getEvents() throw( R // XEmbeddedScripts -Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getBasicLibraries() throw (RuntimeException) +Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getBasicLibraries() throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -2366,7 +2366,7 @@ Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getBas return xBasicLibraries; } -Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getDialogLibraries() throw (RuntimeException) +Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getDialogLibraries() throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -2376,7 +2376,7 @@ Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getDia return xDialogLibraries; } -::sal_Bool SAL_CALL SfxBaseModel::getAllowMacroExecution() throw (RuntimeException) +::sal_Bool SAL_CALL SfxBaseModel::getAllowMacroExecution() throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -2389,7 +2389,7 @@ Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getDia // XScriptInvocationContext -Reference< document::XEmbeddedScripts > SAL_CALL SfxBaseModel::getScriptContainer() throw (RuntimeException) +Reference< document::XEmbeddedScripts > SAL_CALL SfxBaseModel::getScriptContainer() throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -2425,7 +2425,7 @@ Reference< document::XEmbeddedScripts > SAL_CALL SfxBaseModel::getScriptContaine // XEventBroadcaster -void SAL_CALL SfxBaseModel::addEventListener( const Reference< document::XEventListener >& aListener ) throw( RuntimeException ) +void SAL_CALL SfxBaseModel::addEventListener( const Reference< document::XEventListener >& aListener ) throw( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); @@ -2436,7 +2436,7 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< document::XEventL // XEventBroadcaster -void SAL_CALL SfxBaseModel::removeEventListener( const Reference< document::XEventListener >& aListener ) throw( RuntimeException ) +void SAL_CALL SfxBaseModel::removeEventListener( const Reference< document::XEventListener >& aListener ) throw( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -2448,7 +2448,7 @@ void SAL_CALL SfxBaseModel::removeEventListener( const Reference< document::XEve void SAL_CALL SfxBaseModel::addDocumentEventListener( const Reference< document::XDocumentEventListener >& aListener ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< document::XDocumentEventListener >*)0), aListener ); @@ -2456,7 +2456,7 @@ void SAL_CALL SfxBaseModel::addDocumentEventListener( const Reference< document: void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< document::XDocumentEventListener >& aListener ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XDocumentEventListener >*)0), aListener ); @@ -2464,25 +2464,25 @@ void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< docume void SAL_CALL SfxBaseModel::notifyDocumentEvent( const OUString&, const Reference< frame::XController2 >&, const Any& ) - throw ( lang::IllegalArgumentException, lang::NoSupportException, RuntimeException ) + throw ( lang::IllegalArgumentException, lang::NoSupportException, RuntimeException, std::exception ) { throw lang::NoSupportException("SfxBaseModel controlls all the sent notifications itself!", Reference< XInterface >() ); } Sequence< document::CmisProperty > SAL_CALL SfxBaseModel::getCmisProperties() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { return m_pData->m_cmisProperties; } void SAL_CALL SfxBaseModel::setCmisProperties( const Sequence< document::CmisProperty >& _cmisproperties ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { m_pData->m_cmisProperties = _cmisproperties; } void SAL_CALL SfxBaseModel::updateCmisProperties( const Sequence< document::CmisProperty >& aProperties ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); if ( pMedium ) @@ -2504,7 +2504,7 @@ void SAL_CALL SfxBaseModel::updateCmisProperties( const Sequence< document::Cmis } -void SAL_CALL SfxBaseModel::checkOut( ) throw ( RuntimeException ) +void SAL_CALL SfxBaseModel::checkOut( ) throw ( RuntimeException, std::exception ) { SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); if ( pMedium ) @@ -2536,7 +2536,7 @@ void SAL_CALL SfxBaseModel::checkOut( ) throw ( RuntimeException ) } } -void SAL_CALL SfxBaseModel::cancelCheckOut( ) throw ( RuntimeException ) +void SAL_CALL SfxBaseModel::cancelCheckOut( ) throw ( RuntimeException, std::exception ) { SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); if ( pMedium ) @@ -2560,7 +2560,7 @@ void SAL_CALL SfxBaseModel::cancelCheckOut( ) throw ( RuntimeException ) } } -void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const OUString& rMessage ) throw ( RuntimeException ) +void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const OUString& rMessage ) throw ( RuntimeException, std::exception ) { SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); if ( pMedium ) @@ -2601,7 +2601,7 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const OUString& rMessage } } -uno::Sequence< document::CmisVersion > SAL_CALL SfxBaseModel::getAllVersions( ) throw ( RuntimeException ) +uno::Sequence< document::CmisVersion > SAL_CALL SfxBaseModel::getAllVersions( ) throw ( RuntimeException, std::exception ) { uno::Sequence< document::CmisVersion > aVersions; SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); @@ -2653,22 +2653,22 @@ sal_Bool SfxBaseModel::getBoolPropertyValue( const OUString& rName ) throw ( Run return bValue; } -sal_Bool SAL_CALL SfxBaseModel::isVersionable( ) throw ( RuntimeException ) +sal_Bool SAL_CALL SfxBaseModel::isVersionable( ) throw ( RuntimeException, std::exception ) { return getBoolPropertyValue( "IsVersionable" ); } -sal_Bool SAL_CALL SfxBaseModel::canCheckOut( ) throw ( RuntimeException ) +sal_Bool SAL_CALL SfxBaseModel::canCheckOut( ) throw ( RuntimeException, std::exception ) { return getBoolPropertyValue( "CanCheckOut" ); } -sal_Bool SAL_CALL SfxBaseModel::canCancelCheckOut( ) throw ( RuntimeException ) +sal_Bool SAL_CALL SfxBaseModel::canCancelCheckOut( ) throw ( RuntimeException, std::exception ) { return getBoolPropertyValue( "CanCancelCheckOut" ); } -sal_Bool SAL_CALL SfxBaseModel::canCheckIn( ) throw ( RuntimeException ) +sal_Bool SAL_CALL SfxBaseModel::canCheckIn( ) throw ( RuntimeException, std::exception ) { return getBoolPropertyValue( "CanCheckIn" ); } @@ -3231,7 +3231,7 @@ void SfxBaseModel::postEvent_Impl( const OUString& aName, const Reference< frame } -Reference < container::XIndexAccess > SAL_CALL SfxBaseModel::getViewData() throw(RuntimeException) +Reference < container::XIndexAccess > SAL_CALL SfxBaseModel::getViewData() throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -3274,7 +3274,7 @@ Reference < container::XIndexAccess > SAL_CALL SfxBaseModel::getViewData() throw return m_pData->m_contViewData; } -void SAL_CALL SfxBaseModel::setViewData( const Reference < container::XIndexAccess >& aData ) throw(RuntimeException) +void SAL_CALL SfxBaseModel::setViewData( const Reference < container::XIndexAccess >& aData ) throw(RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -3314,7 +3314,7 @@ sal_Bool SfxBaseModel::hasEventListeners() const return !impl_isDisposed() && (NULL != m_pData->m_aInterfaceContainer.getContainer( ::getCppuType((const Reference< document::XEventListener >*)0) ) ); } -void SAL_CALL SfxBaseModel::addPrintJobListener( const Reference< view::XPrintJobListener >& xListener ) throw (RuntimeException) +void SAL_CALL SfxBaseModel::addPrintJobListener( const Reference< view::XPrintJobListener >& xListener ) throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); @@ -3326,7 +3326,7 @@ void SAL_CALL SfxBaseModel::addPrintJobListener( const Reference< view::XPrintJo } } -void SAL_CALL SfxBaseModel::removePrintJobListener( const Reference< view::XPrintJobListener >& xListener ) throw (RuntimeException) +void SAL_CALL SfxBaseModel::removePrintJobListener( const Reference< view::XPrintJobListener >& xListener ) throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -3342,7 +3342,7 @@ void SAL_CALL SfxBaseModel::removePrintJobListener( const Reference< view::XPrin // the corresponding <so3/iface.hxx> cannon be included because it provides // declaration of class SvBorder that conflicts with ../../inc/viewfrm.hxx class SvObject; -sal_Int64 SAL_CALL SfxBaseModel::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw(RuntimeException) +sal_Int64 SAL_CALL SfxBaseModel::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw(RuntimeException, std::exception) { SvGlobalName aName( aIdentifier ); if ((aName == SvGlobalName( SO3_GLOBAL_CLASSID )) || @@ -3383,7 +3383,7 @@ void SfxBaseModel::ListenForStorage_Impl( const Reference< embed::XStorage >& xS } Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) - throw ( RuntimeException) + throw ( RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -3408,7 +3408,7 @@ Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentSubStorage( const Sequence< OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames() throw ( io::IOException, - RuntimeException ) + RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -3447,7 +3447,7 @@ Sequence< OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames() Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getScriptProvider() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -3560,7 +3560,7 @@ static void ConvertSlotsToCommands( SfxObjectShell* pDoc, Reference< container:: } Reference< ui::XUIConfigurationManager > SAL_CALL SfxBaseModel::getUIConfigurationManager() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { return Reference< ui::XUIConfigurationManager >( getUIConfigurationManager2(), UNO_QUERY_THROW ); } @@ -3670,7 +3670,7 @@ void SAL_CALL SfxBaseModel::setVisualAreaSize( sal_Int64 nAspect, const awt::Siz throw ( lang::IllegalArgumentException, embed::WrongStateException, Exception, - RuntimeException ) + RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -3701,7 +3701,7 @@ awt::Size SAL_CALL SfxBaseModel::getVisualAreaSize( sal_Int64 /*nAspect*/ ) throw ( lang::IllegalArgumentException, embed::WrongStateException, Exception, - RuntimeException) + RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -3716,7 +3716,7 @@ awt::Size SAL_CALL SfxBaseModel::getVisualAreaSize( sal_Int64 /*nAspect*/ ) sal_Int32 SAL_CALL SfxBaseModel::getMapUnit( sal_Int64 /*nAspect*/ ) throw ( Exception, - RuntimeException) + RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -3730,7 +3730,7 @@ embed::VisualRepresentation SAL_CALL SfxBaseModel::getPreferredVisualRepresentat throw ( lang::IllegalArgumentException, embed::WrongStateException, Exception, - RuntimeException ) + RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -3756,7 +3756,7 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >& frame::DoubleInitializationException, io::IOException, Exception, - RuntimeException ) + RuntimeException, std::exception ) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); if ( IsInitialized() ) @@ -3796,7 +3796,7 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >& throw ( lang::IllegalArgumentException, io::IOException, Exception, - RuntimeException ) + RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -3858,7 +3858,7 @@ void SAL_CALL SfxBaseModel::switchToStorage( const Reference< embed::XStorage >& throw ( lang::IllegalArgumentException, io::IOException, Exception, - RuntimeException ) + RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -3890,7 +3890,7 @@ void SAL_CALL SfxBaseModel::switchToStorage( const Reference< embed::XStorage >& Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentStorage() throw ( io::IOException, Exception, - RuntimeException ) + RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -3903,7 +3903,7 @@ Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentStorage() void SAL_CALL SfxBaseModel::addStorageChangeListener( const Reference< document::XStorageChangeListener >& xListener ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); @@ -3913,7 +3913,7 @@ void SAL_CALL SfxBaseModel::addStorageChangeListener( void SAL_CALL SfxBaseModel::removeStorageChangeListener( const Reference< document::XStorageChangeListener >& xListener ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -3939,7 +3939,7 @@ bool SfxBaseModel::impl_getPrintHelper() // css.frame.XModule void SAL_CALL SfxBaseModel::setIdentifier(const OUString& Identifier) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); m_pData->m_sModuleIdentifier = Identifier; @@ -3948,7 +3948,7 @@ bool SfxBaseModel::impl_getPrintHelper() // css.frame.XModule OUString SAL_CALL SfxBaseModel::getIdentifier() - throw (RuntimeException) + throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); if (!m_pData->m_sModuleIdentifier.isEmpty()) @@ -4000,7 +4000,7 @@ Reference< frame::XUntitledNumbers > SfxBaseModel::impl_getUntitledHelper () // css.frame.XTitle OUString SAL_CALL SfxBaseModel::getTitle() - throw (RuntimeException) + throw (RuntimeException, std::exception) { // SYNCHRONIZED -> SfxModelGuard aGuard( *this ); @@ -4053,7 +4053,7 @@ OUString SAL_CALL SfxBaseModel::getTitle() // css.frame.XTitle void SAL_CALL SfxBaseModel::setTitle( const OUString& sTitle ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { // SYNCHRONIZED -> SfxModelGuard aGuard( *this ); @@ -4065,7 +4065,7 @@ void SAL_CALL SfxBaseModel::setTitle( const OUString& sTitle ) // css.frame.XTitleChangeBroadcaster void SAL_CALL SfxBaseModel::addTitleChangeListener( const Reference< frame::XTitleChangeListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { // SYNCHRONIZED -> SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); @@ -4078,7 +4078,7 @@ void SAL_CALL SfxBaseModel::addTitleChangeListener( const Reference< frame::XTit // css.frame.XTitleChangeBroadcaster void SAL_CALL SfxBaseModel::removeTitleChangeListener( const Reference< frame::XTitleChangeListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { // SYNCHRONIZED -> SfxModelGuard aGuard( *this ); @@ -4092,7 +4092,7 @@ void SAL_CALL SfxBaseModel::removeTitleChangeListener( const Reference< frame::X // css.frame.XUntitledNumbers ::sal_Int32 SAL_CALL SfxBaseModel::leaseNumber( const Reference< XInterface >& xComponent ) throw (lang::IllegalArgumentException, - RuntimeException ) + RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); @@ -4103,7 +4103,7 @@ void SAL_CALL SfxBaseModel::removeTitleChangeListener( const Reference< frame::X // css.frame.XUntitledNumbers void SAL_CALL SfxBaseModel::releaseNumber( ::sal_Int32 nNumber ) throw (lang::IllegalArgumentException, - RuntimeException ) + RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); impl_getUntitledHelper ()->releaseNumber (nNumber); @@ -4113,7 +4113,7 @@ void SAL_CALL SfxBaseModel::releaseNumber( ::sal_Int32 nNumber ) // css.frame.XUntitledNumbers void SAL_CALL SfxBaseModel::releaseNumberForComponent( const Reference< XInterface >& xComponent ) throw (lang::IllegalArgumentException, - RuntimeException ) + RuntimeException, std::exception ) { SfxModelGuard aGuard( *this ); impl_getUntitledHelper ()->releaseNumberForComponent (xComponent); @@ -4122,7 +4122,7 @@ void SAL_CALL SfxBaseModel::releaseNumberForComponent( const Reference< XInterfa // css.frame.XUntitledNumbers OUString SAL_CALL SfxBaseModel::getUntitledPrefix() - throw (RuntimeException) + throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); return impl_getUntitledHelper ()->getUntitledPrefix (); @@ -4131,7 +4131,7 @@ OUString SAL_CALL SfxBaseModel::getUntitledPrefix() // frame::XModel2 Reference< container::XEnumeration > SAL_CALL SfxBaseModel::getControllers() - throw (RuntimeException) + throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4149,7 +4149,7 @@ Reference< container::XEnumeration > SAL_CALL SfxBaseModel::getControllers() // frame::XModel2 Sequence< OUString > SAL_CALL SfxBaseModel::getAvailableViewControllerNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4167,7 +4167,7 @@ Sequence< OUString > SAL_CALL SfxBaseModel::getAvailableViewControllerNames() Reference< frame::XController2 > SAL_CALL SfxBaseModel::createDefaultViewController( const Reference< frame::XFrame >& i_rFrame ) throw (RuntimeException , lang::IllegalArgumentException, - Exception ) + Exception, std::exception ) { SfxModelGuard aGuard( *this ); @@ -4283,7 +4283,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( const OUString& i_rViewName, const Sequence< PropertyValue >& i_rArguments, const Reference< XFrame >& i_rFrame ) throw (RuntimeException , lang::IllegalArgumentException, - Exception ) + Exception, std::exception ) { SfxModelGuard aGuard( *this ); @@ -4369,7 +4369,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( // rdf::XRepositorySupplier: Reference< rdf::XRepository > SAL_CALL -SfxBaseModel::getRDFRepository() throw (RuntimeException) +SfxBaseModel::getRDFRepository() throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4384,7 +4384,7 @@ SfxBaseModel::getRDFRepository() throw (RuntimeException) // rdf::XNode: OUString SAL_CALL -SfxBaseModel::getStringValue() throw (RuntimeException) +SfxBaseModel::getStringValue() throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4399,7 +4399,7 @@ SfxBaseModel::getStringValue() throw (RuntimeException) // rdf::XURI: OUString SAL_CALL -SfxBaseModel::getNamespace() throw (RuntimeException) +SfxBaseModel::getNamespace() throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4413,7 +4413,7 @@ SfxBaseModel::getNamespace() throw (RuntimeException) } OUString SAL_CALL -SfxBaseModel::getLocalName() throw (RuntimeException) +SfxBaseModel::getLocalName() throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4430,7 +4430,7 @@ SfxBaseModel::getLocalName() throw (RuntimeException) Reference< rdf::XMetadatable > SAL_CALL SfxBaseModel::getElementByMetadataReference( const beans::StringPair & i_rReference) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4445,7 +4445,7 @@ throw (RuntimeException) Reference< rdf::XMetadatable > SAL_CALL SfxBaseModel::getElementByURI(const Reference< rdf::XURI > & i_xURI) -throw (RuntimeException, lang::IllegalArgumentException) +throw (RuntimeException, lang::IllegalArgumentException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4461,7 +4461,7 @@ throw (RuntimeException, lang::IllegalArgumentException) Sequence< Reference< rdf::XURI > > SAL_CALL SfxBaseModel::getMetadataGraphsWithType( const Reference<rdf::XURI> & i_xType) -throw (RuntimeException, lang::IllegalArgumentException) +throw (RuntimeException, lang::IllegalArgumentException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4478,7 +4478,7 @@ Reference<rdf::XURI> SAL_CALL SfxBaseModel::addMetadataFile(const OUString & i_rFileName, const Sequence < Reference< rdf::XURI > > & i_rTypes) throw (RuntimeException, lang::IllegalArgumentException, - container::ElementExistException) + container::ElementExistException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4499,7 +4499,7 @@ SfxBaseModel::importMetadataFile(::sal_Int16 i_Format, const Sequence < Reference< rdf::XURI > > & i_rTypes) throw (RuntimeException, lang::IllegalArgumentException, datatransfer::UnsupportedFlavorException, - container::ElementExistException, rdf::ParseException, io::IOException) + container::ElementExistException, rdf::ParseException, io::IOException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4517,7 +4517,7 @@ void SAL_CALL SfxBaseModel::removeMetadataFile( const Reference< rdf::XURI > & i_xGraphName) throw (RuntimeException, lang::IllegalArgumentException, - container::NoSuchElementException) + container::NoSuchElementException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4533,7 +4533,7 @@ throw (RuntimeException, lang::IllegalArgumentException, void SAL_CALL SfxBaseModel::addContentOrStylesFile(const OUString & i_rFileName) throw (RuntimeException, lang::IllegalArgumentException, - container::ElementExistException) + container::ElementExistException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4549,7 +4549,7 @@ throw (RuntimeException, lang::IllegalArgumentException, void SAL_CALL SfxBaseModel::removeContentOrStylesFile(const OUString & i_rFileName) throw (RuntimeException, lang::IllegalArgumentException, - container::NoSuchElementException) + container::NoSuchElementException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4568,7 +4568,7 @@ SfxBaseModel::loadMetadataFromStorage( Reference<rdf::XURI> const & i_xBaseURI, Reference<task::XInteractionHandler> const & i_xHandler) throw (RuntimeException, lang::IllegalArgumentException, - lang::WrappedTargetException) + lang::WrappedTargetException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4596,7 +4596,7 @@ void SAL_CALL SfxBaseModel::storeMetadataToStorage( Reference< embed::XStorage > const & i_xStorage) throw (RuntimeException, lang::IllegalArgumentException, - lang::WrappedTargetException) + lang::WrappedTargetException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4613,7 +4613,7 @@ void SAL_CALL SfxBaseModel::loadMetadataFromMedium( const Sequence< beans::PropertyValue > & i_rMedium) throw (RuntimeException, lang::IllegalArgumentException, - lang::WrappedTargetException) + lang::WrappedTargetException, std::exception) { SfxModelGuard aGuard( *this ); @@ -4640,7 +4640,7 @@ void SAL_CALL SfxBaseModel::storeMetadataToMedium( const Sequence< beans::PropertyValue > & i_rMedium) throw (RuntimeException, lang::IllegalArgumentException, - lang::WrappedTargetException) + lang::WrappedTargetException, std::exception) { SfxModelGuard aGuard( *this ); diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index e40a94d60845..e62283fafb4c 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -76,13 +76,13 @@ namespace sfx2 ); // XSingleServiceFactory - virtual Reference< XInterface > SAL_CALL createInstance( ) throw (Exception, RuntimeException); - virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException); + virtual Reference< XInterface > SAL_CALL createInstance( ) throw (Exception, RuntimeException, std::exception); + virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception); protected: virtual ~SfxModelFactory(); @@ -123,7 +123,7 @@ namespace sfx2 } - Reference< XInterface > SAL_CALL SfxModelFactory::createInstance( ) throw (Exception, RuntimeException) + Reference< XInterface > SAL_CALL SfxModelFactory::createInstance( ) throw (Exception, RuntimeException, std::exception) { return createInstanceWithArguments( Sequence< Any >() ); } @@ -152,7 +152,7 @@ namespace sfx2 } - Reference< XInterface > SAL_CALL SfxModelFactory::createInstanceWithArguments( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) + Reference< XInterface > SAL_CALL SfxModelFactory::createInstanceWithArguments( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) { ::comphelper::NamedValueCollection aArgs( _rArguments ); const sal_Bool bEmbeddedObject = aArgs.getOrDefault( "EmbeddedObject", sal_False ); @@ -189,17 +189,17 @@ namespace sfx2 return xInstance; } - OUString SAL_CALL SfxModelFactory::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL SfxModelFactory::getImplementationName( ) throw (RuntimeException, std::exception) { return m_sImplementationName; } - ::sal_Bool SAL_CALL SfxModelFactory::supportsService( const OUString& _rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL SfxModelFactory::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL SfxModelFactory::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SfxModelFactory::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return m_aServiceNames; } diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index b717be82229c..bc73fe7fdb47 100644 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -64,32 +64,32 @@ namespace sfx2 virtual void SAL_CALL release( ) throw (); // XUndoManager - virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XLockable, base of XUndoManager - virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XChild, base of XUndoManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); private: ::boost::scoped_ptr< DocumentUndoManager_Impl > m_pImpl; diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index d2bb21b76be4..45306be926c3 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -67,26 +67,26 @@ public: // --- XNameReplace --- virtual void SAL_CALL replaceByName( const OUString & aName, const css::uno::Any & aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException ); + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); // --- XNameAccess ( parent of XNameReplace ) --- virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException ); - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw ( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw ( css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw ( css::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw ( css::uno::RuntimeException, std::exception ); // --- XElementAccess ( parent of XNameAccess ) --- - virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasElements() throw ( css::uno::RuntimeException ); + virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL hasElements() throw ( css::uno::RuntimeException, std::exception ); // --- ::document::XEventListener --- virtual void SAL_CALL notifyEvent( const css::document::EventObject& aEvent ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); // --- ::lang::XEventListener --- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); static SvxMacro* ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bNormalizeMacro ); static void NormalizeMacro( const css::uno::Any& rIn, css::uno::Any& rOut, SfxObjectShell* pDoc ); diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx index 2770bb226995..cb5740f455aa 100644 --- a/sfx2/source/inc/fltoptint.hxx +++ b/sfx2/source/inc/fltoptint.hxx @@ -31,8 +31,8 @@ class FilterOptionsContinuation : public comphelper::OInteraction< ::com::sun::s ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties; public: - virtual void SAL_CALL setFilterOptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rProp ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getFilterOptions( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFilterOptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rProp ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getFilterOptions( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; class RequestFilterOptions : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > @@ -59,12 +59,12 @@ public: } virtual ::com::sun::star::uno::Any SAL_CALL getRequest() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); }; #endif diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx index f0a775787d7e..d5e1c8d845a9 100644 --- a/sfx2/source/inc/macroloader.hxx +++ b/sfx2/source/inc/macroloader.hxx @@ -54,39 +54,39 @@ public: throw (css::uno::Exception, css::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); static ErrCode loadMacro( const OUString& aURL, css::uno::Any& rRetval, SfxObjectShell* pDoc=NULL ) throw( css::uno::RuntimeException ); virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName, FrameSearchFlags eSearchFlags ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); virtual css::uno::Sequence< css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescriptor ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL dispatchWithReturnValue( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); }; #endif diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index 6387d83b2b6b..42a53a07de65 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -51,8 +51,8 @@ public: const ::com::sun::star::util::URL& rURL, SfxStateCache* pStateCache, const SfxSlot* pSlot ); - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); void Release(); const ::com::sun::star::frame::FeatureStateEvent& GetStatus() const; diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index b05807c2495b..152a44e074dc 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -185,19 +185,19 @@ class LayoutManagerListener : public ::cppu::WeakImplHelper2< // XComponent - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XLayoutManagerEventListener - virtual void SAL_CALL layoutEvent( const ::com::sun::star::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const ::com::sun::star::uno::Any& aInfo ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL layoutEvent( const ::com::sun::star::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const ::com::sun::star::uno::Any& aInfo ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: sal_Bool m_bHasFrame; diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 5c49ba694b9f..f205f6598da6 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -59,7 +59,7 @@ using namespace css; void SAL_CALL SfxEvents_Impl::replaceByName( const OUString & aName, const uno::Any & rElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException ) + lang::WrappedTargetException, uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); @@ -117,7 +117,7 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUString & aName, const uno:: uno::Any SAL_CALL SfxEvents_Impl::getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); @@ -135,13 +135,13 @@ uno::Any SAL_CALL SfxEvents_Impl::getByName( const OUString& aName ) } -uno::Sequence< OUString > SAL_CALL SfxEvents_Impl::getElementNames() throw ( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SfxEvents_Impl::getElementNames() throw ( uno::RuntimeException, std::exception ) { return maEventNames; } -sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName ) throw ( uno::RuntimeException ) +sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName ) throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); @@ -161,14 +161,14 @@ sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName ) throw ( uno // --- XElementAccess ( parent of XNameAccess ) --- -uno::Type SAL_CALL SfxEvents_Impl::getElementType() throw ( uno::RuntimeException ) +uno::Type SAL_CALL SfxEvents_Impl::getElementType() throw ( uno::RuntimeException, std::exception ) { uno::Type aElementType = ::getCppuType( (const uno::Sequence < beans::PropertyValue > *)0 ); return aElementType; } -sal_Bool SAL_CALL SfxEvents_Impl::hasElements() throw ( uno::RuntimeException ) +sal_Bool SAL_CALL SfxEvents_Impl::hasElements() throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); @@ -274,7 +274,7 @@ void SfxEvents_Impl::Execute( uno::Any& aEventData, const document::DocumentEven // --- ::document::XEventListener --- -void SAL_CALL SfxEvents_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException ) +void SAL_CALL SfxEvents_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) { ::osl::ClearableMutexGuard aGuard( maMutex ); @@ -304,7 +304,7 @@ void SAL_CALL SfxEvents_Impl::notifyEvent( const document::EventObject& aEvent ) // --- ::lang::XEventListener --- -void SAL_CALL SfxEvents_Impl::disposing( const lang::EventObject& /*Source*/ ) throw( uno::RuntimeException ) +void SAL_CALL SfxEvents_Impl::disposing( const lang::EventObject& /*Source*/ ) throw( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index cc1715104837..58771cccd618 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -70,12 +70,12 @@ public: // css.container.XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL nextElement() throw(css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); }; @@ -98,19 +98,19 @@ public: virtual ~SfxGlobalEvents_Impl(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.sfx2.GlobalEventBroadcaster"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.GlobalEventBroadcaster"); @@ -119,54 +119,54 @@ public: // css.document.XEventBroadcaster virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener(const css::uno::Reference< css::document::XEventListener >& xListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // css.document.XDocumentEventBroadcaster - virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException); + virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception); // css.document.XEventListener virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // css.document.XDocumentEventListener - virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (css::uno::RuntimeException); + virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (css::uno::RuntimeException, std::exception); // css.container.XSet virtual sal_Bool SAL_CALL has(const css::uno::Any& aElement) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual void SAL_CALL insert(const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException , css::container::ElementExistException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual void SAL_CALL remove(const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); // css.container.XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // css.container.XElementAccess virtual css::uno::Type SAL_CALL getElementType() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // css.lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); private: @@ -200,7 +200,7 @@ void ModelCollectionEnumeration::setModelList(const TModelList& rList) } sal_Bool SAL_CALL ModelCollectionEnumeration::hasMoreElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -211,7 +211,7 @@ sal_Bool SAL_CALL ModelCollectionEnumeration::hasMoreElements() uno::Any SAL_CALL ModelCollectionEnumeration::nextElement() throw(container::NoSuchElementException, lang::WrappedTargetException , - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -249,7 +249,7 @@ SfxGlobalEvents_Impl::~SfxGlobalEvents_Impl() uno::Reference< container::XNameReplace > SAL_CALL SfxGlobalEvents_Impl::getEvents() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -259,7 +259,7 @@ uno::Reference< container::XNameReplace > SAL_CALL SfxGlobalEvents_Impl::getEven void SAL_CALL SfxGlobalEvents_Impl::addEventListener(const uno::Reference< document::XEventListener >& xListener) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { // container is threadsafe m_aLegacyListeners.addInterface(xListener); @@ -267,7 +267,7 @@ void SAL_CALL SfxGlobalEvents_Impl::addEventListener(const uno::Reference< docum void SAL_CALL SfxGlobalEvents_Impl::removeEventListener(const uno::Reference< document::XEventListener >& xListener) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { // container is threadsafe m_aLegacyListeners.removeInterface(xListener); @@ -275,14 +275,14 @@ void SAL_CALL SfxGlobalEvents_Impl::removeEventListener(const uno::Reference< do void SAL_CALL SfxGlobalEvents_Impl::addDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& _Listener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { m_aDocumentListeners.addInterface( _Listener ); } void SAL_CALL SfxGlobalEvents_Impl::removeDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& _Listener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { m_aDocumentListeners.removeInterface( _Listener ); } @@ -290,7 +290,7 @@ void SAL_CALL SfxGlobalEvents_Impl::removeDocumentEventListener( const uno::Refe void SAL_CALL SfxGlobalEvents_Impl::notifyDocumentEvent( const OUString& /*_EventName*/, const uno::Reference< frame::XController2 >& /*_ViewController*/, const uno::Any& /*_Supplement*/ ) - throw (lang::IllegalArgumentException, lang::NoSupportException, uno::RuntimeException) + throw (lang::IllegalArgumentException, lang::NoSupportException, uno::RuntimeException, std::exception) { // we're a multiplexer only, no chance to generate artifical events here throw lang::NoSupportException(OUString(), *this); @@ -298,7 +298,7 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyDocumentEvent( const OUString& /*_Even void SAL_CALL SfxGlobalEvents_Impl::notifyEvent(const document::EventObject& aEvent) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { document::DocumentEvent aDocEvent(aEvent.Source, aEvent.EventName, NULL, uno::Any()); implts_notifyJobExecution(aEvent); @@ -308,7 +308,7 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyEvent(const document::EventObject& aEv void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const document::DocumentEvent& _Event ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { implts_notifyJobExecution(document::EventObject(_Event.Source, _Event.EventName)); implts_checkAndExecuteEventBindings(_Event); @@ -317,7 +317,7 @@ void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const document::Docume void SAL_CALL SfxGlobalEvents_Impl::disposing(const lang::EventObject& aEvent) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Reference< frame::XModel > xDoc(aEvent.Source, uno::UNO_QUERY); @@ -332,7 +332,7 @@ void SAL_CALL SfxGlobalEvents_Impl::disposing(const lang::EventObject& aEvent) sal_Bool SAL_CALL SfxGlobalEvents_Impl::has(const uno::Any& aElement) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< frame::XModel > xDoc; aElement >>= xDoc; @@ -354,7 +354,7 @@ sal_Bool SAL_CALL SfxGlobalEvents_Impl::has(const uno::Any& aElement) void SAL_CALL SfxGlobalEvents_Impl::insert( const uno::Any& aElement ) throw (lang::IllegalArgumentException , container::ElementExistException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< frame::XModel > xDoc; aElement >>= xDoc; @@ -391,7 +391,7 @@ void SAL_CALL SfxGlobalEvents_Impl::insert( const uno::Any& aElement ) void SAL_CALL SfxGlobalEvents_Impl::remove( const uno::Any& aElement ) throw (lang::IllegalArgumentException , container::NoSuchElementException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< frame::XModel > xDoc; aElement >>= xDoc; @@ -426,7 +426,7 @@ void SAL_CALL SfxGlobalEvents_Impl::remove( const uno::Any& aElement ) uno::Reference< container::XEnumeration > SAL_CALL SfxGlobalEvents_Impl::createEnumeration() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -443,14 +443,14 @@ uno::Reference< container::XEnumeration > SAL_CALL SfxGlobalEvents_Impl::createE uno::Type SAL_CALL SfxGlobalEvents_Impl::getElementType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ::getCppuType(static_cast< uno::Reference< frame::XModel >* >(NULL)); } sal_Bool SAL_CALL SfxGlobalEvents_Impl::hasElements() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); diff --git a/sfx2/source/sidebar/Accessible.cxx b/sfx2/source/sidebar/Accessible.cxx index 4f2aa8ab8bf2..691296eb5fd2 100644 --- a/sfx2/source/sidebar/Accessible.cxx +++ b/sfx2/source/sidebar/Accessible.cxx @@ -55,7 +55,7 @@ void SAL_CALL Accessible::disposing (void) Reference<accessibility::XAccessibleContext> SAL_CALL Accessible::getAccessibleContext (void) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { return mxContext; } diff --git a/sfx2/source/sidebar/Accessible.hxx b/sfx2/source/sidebar/Accessible.hxx index dbc03f87d005..6d1ab5d2369e 100644 --- a/sfx2/source/sidebar/Accessible.hxx +++ b/sfx2/source/sidebar/Accessible.hxx @@ -58,7 +58,7 @@ public: // XAccessible virtual cssu::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException, std::exception); private: cssu::Reference<css::accessibility::XAccessibleContext> mxContext; diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx index 2001e9e84457..e1ffbf3f4f17 100644 --- a/sfx2/source/sidebar/CommandInfoProvider.cxx +++ b/sfx2/source/sidebar/CommandInfoProvider.cxx @@ -63,7 +63,7 @@ namespace mxFrame->removeEventListener(this); } virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { (void)rEvent; mrInfoProvider.SetFrame(NULL); diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index a1d9086d8e51..7ee4e702a1df 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -66,14 +66,14 @@ namespace mxFrame->removeFrameActionListener(this); } virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { (void)rEvent; mrControllerItem.ResetFrame(); mxFrame = NULL; } virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { if (rEvent.Action == frame::FrameAction_CONTEXT_CHANGED) mrControllerItem.NotifyFrameContextChange(); diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index cac4b7ea8d3a..ee839fc90c7f 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -241,7 +241,7 @@ void SAL_CALL SidebarController::disposing (void) void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { // Update to the requested new context asynchronously to avoid // subtle errors caused by SFX2 which in rare cases can not @@ -260,7 +260,7 @@ void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::Contex void SAL_CALL SidebarController::disposing (const css::lang::EventObject& rEventObject) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { (void)rEventObject; @@ -271,7 +271,7 @@ void SAL_CALL SidebarController::disposing (const css::lang::EventObject& rEvent void SAL_CALL SidebarController::propertyChange (const css::beans::PropertyChangeEvent& rEvent) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { (void)rEvent; @@ -282,7 +282,7 @@ void SAL_CALL SidebarController::propertyChange (const css::beans::PropertyChang void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEvent& rEvent) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { bool bIsReadWrite (true); if (rEvent.IsEnabled) @@ -305,7 +305,7 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv void SAL_CALL SidebarController::requestLayout (void) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { sal_Int32 nMinimalWidth = 0; if (mpCurrentDeck) diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx index efa1e8c79696..98dfbb197288 100644 --- a/sfx2/source/sidebar/SidebarController.hxx +++ b/sfx2/source/sidebar/SidebarController.hxx @@ -92,23 +92,23 @@ public: // ui::XContextChangeEventListener virtual void SAL_CALL notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent) - throw(cssu::RuntimeException); + throw(cssu::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw(cssu::RuntimeException); + throw(cssu::RuntimeException, std::exception); // beans::XPropertyChangeListener virtual void SAL_CALL propertyChange (const css::beans::PropertyChangeEvent& rEvent) - throw(cssu::RuntimeException); + throw(cssu::RuntimeException, std::exception); // frame::XStatusListener virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent) - throw(cssu::RuntimeException); + throw(cssu::RuntimeException, std::exception); // ui::XSidebar virtual void SAL_CALL requestLayout (void) - throw(cssu::RuntimeException); + throw(cssu::RuntimeException, std::exception); void NotifyResize (void); diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx index 37d2f6e4ce5f..5a0f3c4766f6 100644 --- a/sfx2/source/sidebar/SidebarPanelBase.cxx +++ b/sfx2/source/sidebar/SidebarPanelBase.cxx @@ -114,7 +114,7 @@ void SAL_CALL SidebarPanelBase::disposing (void) // XContextChangeEventListener void SAL_CALL SidebarPanelBase::notifyContextChangeEvent ( const ui::ContextChangeEventObject& rEvent) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { IContextChangeReceiver* pContextChangeReceiver = dynamic_cast<IContextChangeReceiver*>(mpControl); @@ -132,7 +132,7 @@ void SAL_CALL SidebarPanelBase::notifyContextChangeEvent ( void SAL_CALL SidebarPanelBase::disposing ( const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException) + throw (cssu::RuntimeException, std::exception) { (void)rEvent; @@ -144,7 +144,7 @@ void SAL_CALL SidebarPanelBase::disposing ( cssu::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { return mxFrame; } @@ -153,7 +153,7 @@ cssu::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void) ::rtl::OUString SAL_CALL SidebarPanelBase::getResourceURL (void) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { return msResourceURL; } @@ -162,7 +162,7 @@ cssu::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame (void) sal_Int16 SAL_CALL SidebarPanelBase::getType (void) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { return ui::UIElementType::TOOLPANEL; } @@ -171,7 +171,7 @@ sal_Int16 SAL_CALL SidebarPanelBase::getType (void) Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface (void) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { return Reference<XInterface>(static_cast<XWeak*>(this)); } @@ -181,7 +181,7 @@ Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface (void) Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessible ( const Reference<accessibility::XAccessible>& rxParentAccessible) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { (void)rxParentAccessible; @@ -193,7 +193,7 @@ Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessibl Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow (void) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { if (mpControl != NULL) return Reference<awt::XWindow>( @@ -207,7 +207,7 @@ Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow (void) ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWidth) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { if (maLayoutSize.Minimum >= 0) return maLayoutSize; @@ -233,7 +233,7 @@ ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWi return ui::LayoutSize(0,0,0); } -sal_Int32 SAL_CALL SidebarPanelBase::getMinimalWidth () throw(cssu::RuntimeException) +sal_Int32 SAL_CALL SidebarPanelBase::getMinimalWidth () throw(cssu::RuntimeException, std::exception) { if (isLayoutEnabled(mpControl)) { diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index b3c77e7efae9..55cd68bc5131 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -468,7 +468,7 @@ Reference<beans::XPropertySet> Theme::GetPropertySet (void) Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo (void) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { return Reference<beans::XPropertySetInfo>(this); } @@ -479,7 +479,7 @@ Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo (void) void SAL_CALL Theme::setPropertyValue ( const ::rtl::OUString& rsPropertyName, const cssu::Any& rValue) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName)); if (iId == maPropertyNameToIdMap.end()) @@ -527,7 +527,7 @@ Any SAL_CALL Theme::getPropertyValue ( const ::rtl::OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException) + cssu::RuntimeException, std::exception) { PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName)); if (iId == maPropertyNameToIdMap.end()) @@ -550,7 +550,7 @@ void SAL_CALL Theme::addPropertyChangeListener( const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException) + cssu::RuntimeException, std::exception) { ThemeItem eItem (__AnyItem); if (rsPropertyName.getLength() > 0) @@ -578,7 +578,7 @@ void SAL_CALL Theme::removePropertyChangeListener( const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException) + cssu::RuntimeException, std::exception) { ThemeItem eItem (__AnyItem); if (rsPropertyName.getLength() > 0) @@ -616,7 +616,7 @@ void SAL_CALL Theme::addVetoableChangeListener( const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException) + cssu::RuntimeException, std::exception) { ThemeItem eItem (__AnyItem); if (rsPropertyName.getLength() > 0) @@ -644,7 +644,7 @@ void SAL_CALL Theme::removeVetoableChangeListener( const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException) + cssu::RuntimeException, std::exception) { ThemeItem eItem (__AnyItem); if (rsPropertyName.getLength() > 0) @@ -677,7 +677,7 @@ void SAL_CALL Theme::removeVetoableChangeListener( cssu::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { ::std::vector<beans::Property> aProperties; @@ -706,7 +706,7 @@ cssu::Sequence<css::beans::Property> SAL_CALL Theme::getProperties (void) beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, - cssu::RuntimeException) + cssu::RuntimeException, std::exception) { PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName)); if (iId == maPropertyNameToIdMap.end()) @@ -729,7 +729,7 @@ beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsProp sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyName) - throw(cssu::RuntimeException) + throw(cssu::RuntimeException, std::exception) { PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName)); if (iId == maPropertyNameToIdMap.end()) diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 4c5c34758d58..48c2023f6668 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -176,7 +176,7 @@ SfxStatusBarControl::~SfxStatusBarControl() // XInterface uno::Any SAL_CALL SfxStatusBarControl::queryInterface( const uno::Type & rType ) -throw( uno::RuntimeException) +throw( uno::RuntimeException, std::exception) { return svt::StatusbarController::queryInterface( rType ); } @@ -194,7 +194,7 @@ void SAL_CALL SfxStatusBarControl::release() throw() // XEventListener void SAL_CALL SfxStatusBarControl::disposing( const lang::EventObject& aEvent ) -throw( uno::RuntimeException ) +throw( uno::RuntimeException, std::exception ) { svt::StatusbarController::disposing( aEvent ); } @@ -202,7 +202,7 @@ throw( uno::RuntimeException ) // XComponent void SAL_CALL SfxStatusBarControl::dispose() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { svt::StatusbarController::dispose(); } @@ -210,7 +210,7 @@ throw (uno::RuntimeException) // XStatusListener void SAL_CALL SfxStatusBarControl::statusChanged( const frame::FeatureStateEvent& rEvent ) -throw ( ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { SfxViewFrame* pViewFrame = NULL; uno::Reference < frame::XController > xController; @@ -318,7 +318,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) ::sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonDown( const awt::MouseEvent& rMouseEvent ) -throw ( uno::RuntimeException ) +throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; ::Point aPos( rMouseEvent.X, rMouseEvent.Y ); @@ -336,7 +336,7 @@ throw ( uno::RuntimeException ) ::sal_Bool SAL_CALL SfxStatusBarControl::mouseMove( const awt::MouseEvent& rMouseEvent ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ::Point aPos( rMouseEvent.X, rMouseEvent.Y ); @@ -353,7 +353,7 @@ throw (uno::RuntimeException) ::sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonUp( const ::awt::MouseEvent& rMouseEvent ) -throw ( uno::RuntimeException ) +throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; ::Point aPos( rMouseEvent.X, rMouseEvent.Y ); @@ -373,7 +373,7 @@ void SAL_CALL SfxStatusBarControl::command( ::sal_Int32 nCommand, ::sal_Bool /*bMouseEvent*/, const ::com::sun::star::uno::Any& /*aData*/ ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ::Point aPos( rPos.X, rPos.Y ); @@ -388,7 +388,7 @@ void SAL_CALL SfxStatusBarControl::paint( const uno::Reference< awt::XGraphics >& xGraphics, const awt::Rectangle& rOutputRectangle, ::sal_Int32 nStyle ) -throw ( ::uno::RuntimeException ) +throw ( ::uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -404,7 +404,7 @@ throw ( ::uno::RuntimeException ) void SAL_CALL SfxStatusBarControl::click( const awt::Point& ) -throw ( uno::RuntimeException ) +throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; Click(); @@ -413,7 +413,7 @@ throw ( uno::RuntimeException ) void SAL_CALL SfxStatusBarControl::doubleClick( const awt::Point& ) -throw ( uno::RuntimeException ) +throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; DoubleClick(); diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index dd2f3d982f41..ae65f986cadf 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -269,7 +269,7 @@ unsigned short SfxToolBoxControl::GetSlotId() const -void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( m_bDisposed ) return; @@ -463,7 +463,7 @@ void SfxToolBoxControl::Dispatch( const OUString& aCommand, ::com::sun::star::un // XInterface Any SAL_CALL SfxToolBoxControl::queryInterface( const Type & rType ) -throw(::com::sun::star::uno::RuntimeException) +throw(::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType, (static_cast< ::com::sun::star::awt::XDockableWindowListener* >(this)), @@ -482,14 +482,14 @@ void SAL_CALL SfxToolBoxControl::release() throw() } void SAL_CALL SfxToolBoxControl::disposing( const ::com::sun::star::lang::EventObject& aEvent ) -throw( ::com::sun::star::uno::RuntimeException ) +throw( ::com::sun::star::uno::RuntimeException, std::exception ) { svt::ToolboxController::disposing( aEvent ); } // XStatusListener void SAL_CALL SfxToolBoxControl::statusChanged( const FeatureStateEvent& rEvent ) -throw ( ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { SfxViewFrame* pViewFrame = NULL; Reference < XController > xController; @@ -601,45 +601,45 @@ throw ( ::com::sun::star::uno::RuntimeException ) } // XSubToolbarController -::sal_Bool SAL_CALL SfxToolBoxControl::opensSubToolbar() throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL SfxToolBoxControl::opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception) { return sal_False; } -OUString SAL_CALL SfxToolBoxControl::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL SfxToolBoxControl::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString(); } -void SAL_CALL SfxToolBoxControl::functionSelected( const OUString& /*aCommand*/ ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SfxToolBoxControl::functionSelected( const OUString& /*aCommand*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // must be implemented by sub-class } -void SAL_CALL SfxToolBoxControl::updateImage() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SfxToolBoxControl::updateImage() throw (::com::sun::star::uno::RuntimeException, std::exception) { // must be implemented by sub-class } // XToolbarController -void SAL_CALL SfxToolBoxControl::execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SfxToolBoxControl::execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Select( (sal_uInt16)KeyModifier ); } -void SAL_CALL SfxToolBoxControl::click() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SfxToolBoxControl::click() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Click(); } -void SAL_CALL SfxToolBoxControl::doubleClick() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SfxToolBoxControl::doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; DoubleClick(); } -Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createPopupWindow() throw (::com::sun::star::uno::RuntimeException) +Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Window* pWindow = CreatePopupWindow(); @@ -649,7 +649,7 @@ Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createPo return Reference< ::com::sun::star::awt::XWindow >(); } -Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createItemWindow( const Reference< ::com::sun::star::awt::XWindow >& rParent ) throw (::com::sun::star::uno::RuntimeException) +Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createItemWindow( const Reference< ::com::sun::star::awt::XWindow >& rParent ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return VCLUnoHelper::GetInterface( CreateItemWindow( VCLUnoHelper::GetWindow( rParent ))); @@ -657,38 +657,38 @@ Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createIt // XDockableWindowListener void SAL_CALL SfxToolBoxControl::startDocking( const ::com::sun::star::awt::DockingEvent& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { } ::com::sun::star::awt::DockingData SAL_CALL SfxToolBoxControl::docking( const ::com::sun::star::awt::DockingEvent& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return ::com::sun::star::awt::DockingData(); } void SAL_CALL SfxToolBoxControl::endDocking( const ::com::sun::star::awt::EndDockingEvent& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { } sal_Bool SAL_CALL SfxToolBoxControl::prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return sal_False; } void SAL_CALL SfxToolBoxControl::toggleFloatingMode( const ::com::sun::star::lang::EventObject& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { } void SAL_CALL SfxToolBoxControl::closed( const ::com::sun::star::lang::EventObject& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { } void SAL_CALL SfxToolBoxControl::endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& aEvent ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1039,7 +1039,7 @@ SfxFrameStatusListener::~SfxFrameStatusListener() // XStatusListener void SAL_CALL SfxFrameStatusListener::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& rEvent ) -throw ( ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { SfxViewFrame* pViewFrame = NULL; Reference < XController > xController; diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 01f146aca582..73263dcb955d 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -109,19 +109,19 @@ public: SfxFrameLoader_Impl( const css::uno::Reference < css::uno::XComponentContext >& _rxContext ); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); // XSynchronousFrameLoader - virtual sal_Bool SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& _rArgs, const css::uno::Reference< css::frame::XFrame >& _rxFrame ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL cancel() throw( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& _rArgs, const css::uno::Reference< css::frame::XFrame >& _rxFrame ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ); protected: virtual ~SfxFrameLoader_Impl(); @@ -617,7 +617,7 @@ Reference< XController2 > SfxFrameLoader_Impl::impl_createDocumentView( const Re sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rArgs, const Reference< XFrame >& _rTargetFrame ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { ENSURE_OR_THROW( _rTargetFrame.is(), "illegal NULL frame" ); @@ -752,24 +752,24 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA return bLoadSuccess; } -void SfxFrameLoader_Impl::cancel() throw( RuntimeException ) +void SfxFrameLoader_Impl::cancel() throw( RuntimeException, std::exception ) { } /* XServiceInfo */ -OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("com.sun.star.comp.office.FrameLoader"); } \ /* XServiceInfo */ -sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } /* XServiceInfo */ -Sequence< OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > seqServiceNames( 2 ); seqServiceNames.getArray() [0] = "com.sun.star.frame.SynchronousFrameLoader"; diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 6213c096c17e..2b5ec14759c1 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -127,36 +127,36 @@ public: uno::Reference < frame::XFrame > GetFrame() const; // XEmbeddedClient - virtual void SAL_CALL saveObject() throw ( embed::ObjectSaveVetoException, uno::Exception, uno::RuntimeException ); - virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) throw ( embed::WrongStateException, uno::RuntimeException ); + virtual void SAL_CALL saveObject() throw ( embed::ObjectSaveVetoException, uno::Exception, uno::RuntimeException, std::exception ); + virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); // XInplaceClient - virtual sal_Bool SAL_CALL canInplaceActivate() throw ( uno::RuntimeException ); - virtual void SAL_CALL activatingInplace() throw ( embed::WrongStateException, uno::RuntimeException ); - virtual void SAL_CALL activatingUI() throw ( embed::WrongStateException, uno::RuntimeException ); - virtual void SAL_CALL deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException ); - virtual void SAL_CALL deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException ); - virtual uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException ); - virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException ); - virtual awt::Rectangle SAL_CALL getPlacement() throw ( embed::WrongStateException, uno::RuntimeException ); - virtual awt::Rectangle SAL_CALL getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException ); - virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) throw ( embed::WrongStateException, uno::RuntimeException ); - virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) throw ( embed::WrongStateException, uno::RuntimeException ); - virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException ); + virtual sal_Bool SAL_CALL canInplaceActivate() throw ( uno::RuntimeException, std::exception ); + virtual void SAL_CALL activatingInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); + virtual void SAL_CALL activatingUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); + virtual void SAL_CALL deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); + virtual void SAL_CALL deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); + virtual uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); + virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); + virtual awt::Rectangle SAL_CALL getPlacement() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); + virtual awt::Rectangle SAL_CALL getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); + virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); + virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); + virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception ); // XComponentSupplier - virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() throw ( uno::RuntimeException ); + virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() throw ( uno::RuntimeException, std::exception ); // XWindowSupplier - virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() throw ( uno::RuntimeException ); + virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() throw ( uno::RuntimeException, std::exception ); // document::XEventListener - virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException ); + virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ); // XStateChangeListener - virtual void SAL_CALL changingState( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL stateChanged( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL changingState( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL stateChanged( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; SfxInPlaceClient_Impl::~SfxInPlaceClient_Impl() @@ -167,7 +167,7 @@ void SAL_CALL SfxInPlaceClient_Impl::changingState( const ::com::sun::star::lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) -throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException, std::exception) { } @@ -175,7 +175,7 @@ void SAL_CALL SfxInPlaceClient_Impl::stateChanged( const ::com::sun::star::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( m_pClient && nOldState != embed::EmbedStates::LOADED && nNewState == embed::EmbedStates::RUNNING ) { @@ -187,7 +187,7 @@ throw (::com::sun::star::uno::RuntimeException) } } -void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException ) +void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -200,7 +200,7 @@ void SAL_CALL SfxInPlaceClient_Impl::notifyEvent( const document::EventObject& a } void SAL_CALL SfxInPlaceClient_Impl::disposing( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { DELETEZ( m_pClient ); } @@ -217,7 +217,7 @@ uno::Reference < frame::XFrame > SfxInPlaceClient_Impl::GetFrame() const void SAL_CALL SfxInPlaceClient_Impl::saveObject() throw ( embed::ObjectSaveVetoException, uno::Exception, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( !m_bStoreObject ) // client wants to discard the object (usually it means the container document is closed while an object is active @@ -312,7 +312,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject() void SAL_CALL SfxInPlaceClient_Impl::visibilityChanged( sal_Bool bVisible ) throw ( embed::WrongStateException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -327,7 +327,7 @@ void SAL_CALL SfxInPlaceClient_Impl::visibilityChanged( sal_Bool bVisible ) // XInplaceClient sal_Bool SAL_CALL SfxInPlaceClient_Impl::canInplaceActivate() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { if ( !m_xObject.is() ) throw uno::RuntimeException(); @@ -342,7 +342,7 @@ sal_Bool SAL_CALL SfxInPlaceClient_Impl::canInplaceActivate() void SAL_CALL SfxInPlaceClient_Impl::activatingInplace() throw ( embed::WrongStateException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); @@ -353,7 +353,7 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingInplace() void SAL_CALL SfxInPlaceClient_Impl::activatingUI() throw ( embed::WrongStateException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); @@ -366,7 +366,7 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingUI() void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace() throw ( embed::WrongStateException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); @@ -377,7 +377,7 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace() void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI() throw ( embed::WrongStateException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); @@ -389,7 +389,7 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI() uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SfxInPlaceClient_Impl::getLayoutManager() throw ( embed::WrongStateException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference < beans::XPropertySet > xFrame( GetFrame(), uno::UNO_QUERY ); if ( !xFrame.is() ) @@ -412,7 +412,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SfxInPlaceCli uno::Reference< frame::XDispatchProvider > SAL_CALL SfxInPlaceClient_Impl::getInplaceDispatchProvider() throw ( embed::WrongStateException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return uno::Reference < frame::XDispatchProvider >( GetFrame(), uno::UNO_QUERY_THROW ); } @@ -420,7 +420,7 @@ uno::Reference< frame::XDispatchProvider > SAL_CALL SfxInPlaceClient_Impl::getIn awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getPlacement() throw ( embed::WrongStateException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); @@ -437,7 +437,7 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getPlacement() awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getClipRectangle() throw ( embed::WrongStateException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); @@ -454,7 +454,7 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getClipRectangle() void SAL_CALL SfxInPlaceClient_Impl::translateAccelerators( const uno::Sequence< awt::KeyEvent >& /*aKeys*/ ) throw ( embed::WrongStateException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); @@ -465,7 +465,7 @@ void SAL_CALL SfxInPlaceClient_Impl::translateAccelerators( const uno::Sequence< void SAL_CALL SfxInPlaceClient_Impl::scrollObject( const awt::Size& /*aOffset*/ ) throw ( embed::WrongStateException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); @@ -475,7 +475,7 @@ void SAL_CALL SfxInPlaceClient_Impl::scrollObject( const awt::Size& /*aOffset*/ void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< embed::XInplaceObject > xInplace( m_xObject, uno::UNO_QUERY ); if ( !xInplace.is() || !m_pClient || !m_pClient->GetEditWin() || !m_pClient->GetViewShell() ) @@ -525,7 +525,7 @@ void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPo // XComponentSupplier uno::Reference< util::XCloseable > SAL_CALL SfxInPlaceClient_Impl::getComponent() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { if ( !m_pClient || !m_pClient->GetViewShell() ) throw uno::RuntimeException(); @@ -546,7 +546,7 @@ uno::Reference< util::XCloseable > SAL_CALL SfxInPlaceClient_Impl::getComponent( // XWindowSupplier uno::Reference< awt::XWindow > SAL_CALL SfxInPlaceClient_Impl::getWindow() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { if ( !m_pClient || !m_pClient->GetEditWin() ) throw uno::RuntimeException(); diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 721a1a0d5efe..0f5df44af853 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -207,16 +207,16 @@ public: --m_refCount; } - virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException); - virtual void SAL_CALL end(void) throw(RuntimeException); - virtual void SAL_CALL setText(const OUString& aText) throw(RuntimeException); - virtual void SAL_CALL setValue(sal_Int32 nValue) throw(RuntimeException); - virtual void SAL_CALL reset() throw(RuntimeException); + virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException, std::exception); + virtual void SAL_CALL end(void) throw(RuntimeException, std::exception); + virtual void SAL_CALL setText(const OUString& aText) throw(RuntimeException, std::exception); + virtual void SAL_CALL setValue(sal_Int32 nValue) throw(RuntimeException, std::exception); + virtual void SAL_CALL reset() throw(RuntimeException, std::exception); - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw(RuntimeException); + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw(RuntimeException, std::exception); }; -void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException) +void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -235,7 +235,7 @@ void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange) } } -void SAL_CALL SfxStatusIndicator::end(void) throw(RuntimeException) +void SAL_CALL SfxStatusIndicator::end(void) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -250,7 +250,7 @@ void SAL_CALL SfxStatusIndicator::end(void) throw(RuntimeException) } } -void SAL_CALL SfxStatusIndicator::setText(const OUString& aText) throw(RuntimeException) +void SAL_CALL SfxStatusIndicator::setText(const OUString& aText) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -265,7 +265,7 @@ void SAL_CALL SfxStatusIndicator::setText(const OUString& aText) throw(RuntimeEx } } -void SAL_CALL SfxStatusIndicator::setValue( sal_Int32 nValue ) throw(RuntimeException) +void SAL_CALL SfxStatusIndicator::setValue( sal_Int32 nValue ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -284,7 +284,7 @@ void SAL_CALL SfxStatusIndicator::setValue( sal_Int32 nValue ) throw(RuntimeExce } } -void SAL_CALL SfxStatusIndicator::reset() throw(RuntimeException) +void SAL_CALL SfxStatusIndicator::reset() throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -299,7 +299,7 @@ void SAL_CALL SfxStatusIndicator::reset() throw(RuntimeException) } } -void SAL_CALL SfxStatusIndicator::disposing( const lang::EventObject& /*Source*/ ) throw(RuntimeException) +void SAL_CALL SfxStatusIndicator::disposing( const lang::EventObject& /*Source*/ ) throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; xOwner = 0; @@ -315,8 +315,8 @@ class IMPL_SfxBaseController_ListenerHelper : public ::cppu::WeakImplHelper1< fr public: IMPL_SfxBaseController_ListenerHelper( SfxBaseController* pController ) ; virtual ~IMPL_SfxBaseController_ListenerHelper() ; - virtual void SAL_CALL frameAction( const frame::FrameActionEvent& aEvent ) throw (RuntimeException) ; - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (RuntimeException) ; + virtual void SAL_CALL frameAction( const frame::FrameActionEvent& aEvent ) throw (RuntimeException, std::exception) ; + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) ; private: @@ -330,9 +330,9 @@ public: IMPL_SfxBaseController_CloseListenerHelper( SfxBaseController* pController ) ; virtual ~IMPL_SfxBaseController_CloseListenerHelper() ; virtual void SAL_CALL queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) - throw (RuntimeException, util::CloseVetoException) ; - virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) throw (RuntimeException) ; - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (RuntimeException) ; + throw (RuntimeException, util::CloseVetoException, std::exception) ; + virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) ; + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) ; private: @@ -349,12 +349,12 @@ IMPL_SfxBaseController_CloseListenerHelper::~IMPL_SfxBaseController_CloseListene { } -void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::disposing( const lang::EventObject& /*aEvent*/ ) throw( RuntimeException ) +void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::disposing( const lang::EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception ) { } void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) - throw (RuntimeException, util::CloseVetoException) + throw (RuntimeException, util::CloseVetoException, std::exception) { SolarMutexGuard aGuard; SfxViewShell* pShell = m_pController->GetViewShell_Impl(); @@ -378,7 +378,7 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const la } } -void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::notifyClosing( const lang::EventObject& /*aEvent*/ ) throw (RuntimeException) +void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::notifyClosing( const lang::EventObject& /*aEvent*/ ) throw (RuntimeException, std::exception) { } @@ -436,7 +436,7 @@ IMPL_SfxBaseController_ListenerHelper::~IMPL_SfxBaseController_ListenerHelper() { } -void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::FrameActionEvent& aEvent ) throw( RuntimeException ) +void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::FrameActionEvent& aEvent ) throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if ( @@ -461,7 +461,7 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::F // IMPL_SfxBaseController_ListenerHelper -> XEventListener -void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const lang::EventObject& /*aEvent*/ ) throw( RuntimeException ) +void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const lang::EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if ( m_pController && m_pController->getFrame().is() ) @@ -493,7 +493,7 @@ SfxBaseController::~SfxBaseController() // SfxBaseController -> XController2 -Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (RuntimeException) +Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( !m_pData->m_pViewShell ) @@ -502,7 +502,7 @@ Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (Run return Reference< XWindow >( GetViewFrame_Impl().GetFrame().GetWindow().GetComponentInterface(), UNO_QUERY_THROW ); } -OUString SAL_CALL SfxBaseController::getViewControllerName() throw (RuntimeException) +OUString SAL_CALL SfxBaseController::getViewControllerName() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( !m_pData->m_pViewShell || !m_pData->m_pViewShell->GetObjectShell() ) @@ -519,7 +519,7 @@ OUString SAL_CALL SfxBaseController::getViewControllerName() throw (RuntimeExcep return sViewName; } -Sequence< PropertyValue > SAL_CALL SfxBaseController::getCreationArguments() throw (RuntimeException) +Sequence< PropertyValue > SAL_CALL SfxBaseController::getCreationArguments() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( !m_pData->m_pViewShell || !m_pData->m_pViewShell->GetObjectShell() ) @@ -546,7 +546,7 @@ SfxViewFrame& SfxBaseController::GetViewFrame_Impl() const // SfxBaseController -> XController2 -> XController -void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >& xFrame ) throw( RuntimeException ) +void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >& xFrame ) throw( RuntimeException, std::exception ) { Reference< frame::XFrame > xTemp( getFrame() ) ; @@ -584,7 +584,7 @@ void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >& // SfxBaseController -> XController -sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel >& xModel ) throw( RuntimeException ) +sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel >& xModel ) throw( RuntimeException, std::exception ) { if ( m_pData->m_pViewShell && xModel.is() && xModel != m_pData->m_pViewShell->GetObjectShell()->GetModel() ) { @@ -603,7 +603,7 @@ sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel // SfxBaseController -> XController -sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( RuntimeException ) +sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -661,7 +661,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime // SfxBaseController -> XController -uno::Any SfxBaseController::getViewData() throw( RuntimeException ) +uno::Any SfxBaseController::getViewData() throw( RuntimeException, std::exception ) { uno::Any aAny; OUString sData; @@ -679,7 +679,7 @@ uno::Any SfxBaseController::getViewData() throw( RuntimeException ) // SfxBaseController -> XController -void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw( RuntimeException ) +void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if ( m_pData->m_pViewShell ) @@ -694,7 +694,7 @@ void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw // SfxBaseController -> XController -Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() throw( RuntimeException ) +Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; return m_pData->m_xFrame; @@ -704,7 +704,7 @@ Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() throw( Runtime // SfxBaseController -> XController -Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( RuntimeException ) +Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; return m_pData->m_pViewShell ? m_pData->m_pViewShell->GetObjectShell()->GetModel() : Reference < frame::XModel > () ; @@ -716,7 +716,7 @@ Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( Runtime Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const util::URL& aURL , const OUString& sTargetFrameName, - sal_Int32 eSearchFlags ) throw( RuntimeException ) + sal_Int32 eSearchFlags ) throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; Reference< frame::XDispatch > xDisp; @@ -872,7 +872,7 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const // SfxBaseController -> XDispatchProvider -uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( RuntimeException ) +uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( RuntimeException, std::exception ) { // Create return list - which must have same size then the given descriptor // It's not allowed to pack it! @@ -894,7 +894,7 @@ uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::query frame::BorderWidths SAL_CALL SfxBaseController::getBorder() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { frame::BorderWidths aResult; @@ -912,21 +912,21 @@ frame::BorderWidths SAL_CALL SfxBaseController::getBorder() } void SAL_CALL SfxBaseController::addBorderResizeListener( const Reference< frame::XBorderResizeListener >& xListener ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { m_pData->m_aListenerContainer.addInterface( ::getCppuType((const Reference< frame::XBorderResizeListener >*)0), xListener ); } void SAL_CALL SfxBaseController::removeBorderResizeListener( const Reference< frame::XBorderResizeListener >& xListener ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { m_pData->m_aListenerContainer.removeInterface( ::getCppuType((const Reference< frame::XBorderResizeListener >*)0), xListener ); } awt::Rectangle SAL_CALL SfxBaseController::queryBorderedArea( const awt::Rectangle& aPreliminaryRectangle ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; if ( m_pData->m_pViewShell ) @@ -967,7 +967,7 @@ void SfxBaseController::BorderWidthsChanged_Impl() // SfxBaseController -> XComponent -void SAL_CALL SfxBaseController::dispose() throw( RuntimeException ) +void SAL_CALL SfxBaseController::dispose() throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; Reference< XController > xTmp( this ); @@ -1038,7 +1038,7 @@ void SAL_CALL SfxBaseController::dispose() throw( RuntimeException ) // SfxBaseController -> XComponent -void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException ) +void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException, std::exception ) { m_pData->m_aListenerContainer.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); } @@ -1047,7 +1047,7 @@ void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEvent // SfxBaseController -> XComponent -void SAL_CALL SfxBaseController::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException ) +void SAL_CALL SfxBaseController::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException, std::exception ) { m_pData->m_aListenerContainer.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); } @@ -1078,7 +1078,7 @@ SfxViewShell* SfxBaseController::GetViewShell_Impl() const return m_pData->m_pViewShell; } -Reference< task::XStatusIndicator > SAL_CALL SfxBaseController::getStatusIndicator( ) throw (RuntimeException) +Reference< task::XStatusIndicator > SAL_CALL SfxBaseController::getStatusIndicator( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pData->m_pViewShell && !m_pData->m_xIndicator.is() ) @@ -1086,7 +1086,7 @@ Reference< task::XStatusIndicator > SAL_CALL SfxBaseController::getStatusIndicat return m_pData->m_xIndicator; } -void SAL_CALL SfxBaseController::registerContextMenuInterceptor( const Reference< ui::XContextMenuInterceptor >& xInterceptor ) throw( RuntimeException ) +void SAL_CALL SfxBaseController::registerContextMenuInterceptor( const Reference< ui::XContextMenuInterceptor >& xInterceptor ) throw( RuntimeException, std::exception ) { m_pData->m_aInterceptorContainer.addInterface( xInterceptor ); @@ -1096,7 +1096,7 @@ void SAL_CALL SfxBaseController::registerContextMenuInterceptor( const Reference m_pData->m_pViewShell->AddContextMenuInterceptor_Impl( xInterceptor ); } -void SAL_CALL SfxBaseController::releaseContextMenuInterceptor( const Reference< ui::XContextMenuInterceptor >& xInterceptor ) throw( RuntimeException ) +void SAL_CALL SfxBaseController::releaseContextMenuInterceptor( const Reference< ui::XContextMenuInterceptor >& xInterceptor ) throw( RuntimeException, std::exception ) { m_pData->m_aInterceptorContainer.removeInterface( xInterceptor ); @@ -1106,32 +1106,32 @@ void SAL_CALL SfxBaseController::releaseContextMenuInterceptor( const Reference< m_pData->m_pViewShell->RemoveContextMenuInterceptor_Impl( xInterceptor ); } -void SAL_CALL SfxBaseController::addKeyHandler( const Reference< awt::XKeyHandler >& xHandler ) throw (RuntimeException) +void SAL_CALL SfxBaseController::addKeyHandler( const Reference< awt::XKeyHandler >& xHandler ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; m_pData->m_aUserInputInterception.addKeyHandler( xHandler ); } -void SAL_CALL SfxBaseController::removeKeyHandler( const Reference< awt::XKeyHandler >& xHandler ) throw (RuntimeException) +void SAL_CALL SfxBaseController::removeKeyHandler( const Reference< awt::XKeyHandler >& xHandler ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; m_pData->m_aUserInputInterception.removeKeyHandler( xHandler ); } -void SAL_CALL SfxBaseController::addMouseClickHandler( const Reference< awt::XMouseClickHandler >& xHandler ) throw (RuntimeException) +void SAL_CALL SfxBaseController::addMouseClickHandler( const Reference< awt::XMouseClickHandler >& xHandler ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; m_pData->m_aUserInputInterception.addMouseClickHandler( xHandler ); } -void SAL_CALL SfxBaseController::removeMouseClickHandler( const Reference< awt::XMouseClickHandler >& xHandler ) throw (RuntimeException) +void SAL_CALL SfxBaseController::removeMouseClickHandler( const Reference< awt::XMouseClickHandler >& xHandler ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; m_pData->m_aUserInputInterception.removeMouseClickHandler( xHandler ); } uno::Sequence< sal_Int16 > SAL_CALL SfxBaseController::getSupportedCommandGroups() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1165,7 +1165,7 @@ throw (RuntimeException) } uno::Sequence< frame::DispatchInformation > SAL_CALL SfxBaseController::getConfigurableDispatchInformation( sal_Int16 nCmdGroup ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { std::list< frame::DispatchInformation > aCmdList; @@ -1494,7 +1494,7 @@ Reference< frame::XTitle > SfxBaseController::impl_getTitleHelper () // frame::XTitle OUString SAL_CALL SfxBaseController::getTitle() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return impl_getTitleHelper()->getTitle (); } @@ -1502,7 +1502,7 @@ OUString SAL_CALL SfxBaseController::getTitle() // frame::XTitle void SAL_CALL SfxBaseController::setTitle(const OUString& sTitle) - throw (RuntimeException) + throw (RuntimeException, std::exception) { impl_getTitleHelper()->setTitle (sTitle); } @@ -1510,7 +1510,7 @@ void SAL_CALL SfxBaseController::setTitle(const OUString& sTitle) // frame::XTitleChangeBroadcaster void SAL_CALL SfxBaseController::addTitleChangeListener(const Reference< frame::XTitleChangeListener >& xListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Reference< frame::XTitleChangeBroadcaster > xBroadcaster(impl_getTitleHelper(), uno::UNO_QUERY); if (xBroadcaster.is ()) @@ -1520,7 +1520,7 @@ void SAL_CALL SfxBaseController::addTitleChangeListener(const Reference< frame:: // frame::XTitleChangeBroadcaster void SAL_CALL SfxBaseController::removeTitleChangeListener(const Reference< frame::XTitleChangeListener >& xListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Reference< frame::XTitleChangeBroadcaster > xBroadcaster(impl_getTitleHelper(), uno::UNO_QUERY); if (xBroadcaster.is ()) diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 56614448414b..2b7d94da21df 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -101,11 +101,11 @@ public: // XEventListener virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XClipboardListener virtual void SAL_CALL changedContents( const datatransfer::clipboard::ClipboardEvent& rEventObject ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); void DisconnectViewShell() { m_pViewShell = NULL; } void ChangedContents(); @@ -185,7 +185,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SfxClipboardChangeListener, AsyncExecuteHdl_Impl, A } void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject& /*rEventObject*/ ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { // Either clipboard or ViewShell is going to be destroyed -> no interest in listening anymore uno::Reference< lang::XComponent > xCtrl( m_xCtrl ); @@ -205,7 +205,7 @@ void SAL_CALL SfxClipboardChangeListener::disposing( const lang::EventObject& /* } void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::clipboard::ClipboardEvent& ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { // Make asynchronous call to avoid locking SolarMutex which is the // root for many deadlocks, especially in conjuction with the "Windows" |