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/source/dialog/backingcomp.cxx | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'sfx2/source/dialog/backingcomp.cxx')
-rw-r--r-- | sfx2/source/dialog/backingcomp.cxx | 100 |
1 files changed, 50 insertions, 50 deletions
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 ) { } |