From 5e21a413c788f839a66d9e4c14e745ed18058db8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 25 Feb 2014 21:31:58 +0100 Subject: cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3 --- dbaccess/source/ui/control/dbtreelistbox.cxx | 16 ++++++++-------- dbaccess/source/ui/control/sqledit.cxx | 4 ++-- dbaccess/source/ui/control/toolboxcontroller.cxx | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'dbaccess/source/ui/control') diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 12a2e3270e09..d4615353283e 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -535,10 +535,10 @@ namespace { } - virtual ::sal_Bool SAL_CALL select( const Any& xSelection ) throw (IllegalArgumentException, RuntimeException); - virtual Any SAL_CALL getSelection( ) throw (RuntimeException); - virtual void SAL_CALL addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException); - virtual void SAL_CALL removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL select( const Any& xSelection ) throw (IllegalArgumentException, RuntimeException, std::exception); + virtual Any SAL_CALL getSelection( ) throw (RuntimeException, std::exception); + virtual void SAL_CALL addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception); + virtual void SAL_CALL removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception); protected: virtual ~SelectionSupplier() @@ -549,24 +549,24 @@ namespace Any m_aSelection; }; - ::sal_Bool SAL_CALL SelectionSupplier::select( const Any& /*_Selection*/ ) throw (IllegalArgumentException, RuntimeException) + ::sal_Bool SAL_CALL SelectionSupplier::select( const Any& /*_Selection*/ ) throw (IllegalArgumentException, RuntimeException, std::exception) { throw IllegalArgumentException(); // API bug: this should be a NoSupportException } - Any SAL_CALL SelectionSupplier::getSelection( ) throw (RuntimeException) + Any SAL_CALL SelectionSupplier::getSelection( ) throw (RuntimeException, std::exception) { return m_aSelection; } - void SAL_CALL SelectionSupplier::addSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException) + void SAL_CALL SelectionSupplier::addSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException, std::exception) { OSL_FAIL( "SelectionSupplier::removeSelectionChangeListener: no support!" ); // API bug: this should be a NoSupportException } - void SAL_CALL SelectionSupplier::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException) + void SAL_CALL SelectionSupplier::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException, std::exception) { OSL_FAIL( "SelectionSupplier::removeSelectionChangeListener: no support!" ); // API bug: this should be a NoSupportException diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index b1f377e04e4e..6e6e53fe970a 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -48,7 +48,7 @@ private: virtual ~ChangesListener() {} virtual void SAL_CALL disposing(css::lang::EventObject const &) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(editor_.m_mutex); editor_.m_notifier.clear(); @@ -56,7 +56,7 @@ private: virtual void SAL_CALL propertiesChange( css::uno::Sequence< css::beans::PropertyChangeEvent > const &) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard g; editor_.ImplSetFont(); diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index bb8683a84d70..9332118a0a36 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -87,7 +87,7 @@ namespace dbaui } // XInterface - Any SAL_CALL OToolboxController::queryInterface( const Type& _rType ) throw (RuntimeException) + Any SAL_CALL OToolboxController::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) { Any aReturn = ToolboxController::queryInterface(_rType); if (!aReturn.hasValue()) @@ -102,7 +102,7 @@ namespace dbaui { ToolboxController::release(); } - void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) + void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) { ToolboxController::initialize(_rArguments); SolarMutexGuard aSolarMutexGuard; @@ -148,7 +148,7 @@ namespace dbaui pToolBox->SetItemBits(m_nToolBoxId,pToolBox->GetItemBits(m_nToolBoxId) | TIB_DROPDOWN); } } - void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) + void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); @@ -224,7 +224,7 @@ namespace dbaui return pMenu; } SAL_WNODEPRECATED_DECLARATIONS_POP - Reference< ::com::sun::star::awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException) + Reference< ::com::sun::star::awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException, std::exception) { // execute the menu SolarMutexGuard aSolarMutexGuard; -- cgit