diff options
Diffstat (limited to 'framework/source/uielement')
34 files changed, 222 insertions, 222 deletions
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index aa6aaf01f867..1a95e500ae6b 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -139,7 +139,7 @@ static Image RetrieveImage( Reference< com::sun::star::frame::XFrame >& rFrame, } // XComponent -void SAL_CALL AddonsToolBarManager::dispose() throw( RuntimeException ) +void SAL_CALL AddonsToolBarManager::dispose() throw( RuntimeException, std::exception ) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 2c6c04d1612f..e0aa84977032 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -64,7 +64,7 @@ AddonsToolBarWrapper::~AddonsToolBarWrapper() } // XComponent -void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException ) +void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException, std::exception ) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -81,7 +81,7 @@ void SAL_CALL AddonsToolBarWrapper::dispose() throw ( RuntimeException ) } // XInitialization -void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -143,7 +143,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument } // XUIElement interface -Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw (::com::sun::star::uno::RuntimeException) +Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 09a70da6b292..d09fb90d693a 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -73,7 +73,7 @@ ButtonToolbarController::~ButtonToolbarController() // XInterface uno::Any SAL_CALL ButtonToolbarController::queryInterface( const uno::Type& rType ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { Any a = ::cppu::queryInterface( rType , @@ -102,7 +102,7 @@ void SAL_CALL ButtonToolbarController::release() throw () // XInitialization void SAL_CALL ButtonToolbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { bool bInitialized( true ); @@ -140,7 +140,7 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException } // XComponent -void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -159,21 +159,21 @@ void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::R void SAL_CALL ButtonToolbarController::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // do nothing } void SAL_CALL ButtonToolbarController::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // do nothing } // XUpdatable void SAL_CALL ButtonToolbarController::update() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; if ( m_bDisposed ) @@ -183,7 +183,7 @@ throw (::com::sun::star::uno::RuntimeException) // XEventListener void SAL_CALL ButtonToolbarController::disposing( const com::sun::star::lang::EventObject& Source ) -throw ( ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { uno::Reference< uno::XInterface > xSource( Source.Source ); @@ -198,7 +198,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) } void SAL_CALL ButtonToolbarController::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& ) -throw ( ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { // do nothing if ( m_bDisposed ) @@ -207,7 +207,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) // XToolbarController void SAL_CALL ButtonToolbarController::execute( sal_Int16 KeyModifier ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { uno::Reference< frame::XDispatch > xDispatch; uno::Reference< frame::XFrame > xFrame; @@ -264,7 +264,7 @@ throw (::com::sun::star::uno::RuntimeException) } void SAL_CALL ButtonToolbarController::click() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; @@ -276,7 +276,7 @@ throw (::com::sun::star::uno::RuntimeException) } void SAL_CALL ButtonToolbarController::doubleClick() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // do nothing if ( m_bDisposed ) @@ -284,7 +284,7 @@ throw (::com::sun::star::uno::RuntimeException) } uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createPopupWindow() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( m_bDisposed ) throw DisposedException(); @@ -294,7 +294,7 @@ throw (::com::sun::star::uno::RuntimeException) uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( m_bDisposed ) throw DisposedException(); diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 0049f6f21ecd..eb80188c2c26 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -168,7 +168,7 @@ ComboboxToolbarController::~ComboboxToolbarController() void SAL_CALL ComboboxToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 386a20711b96..7ce3c45a1243 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -75,7 +75,7 @@ ComplexToolbarController::~ComplexToolbarController() void SAL_CALL ComplexToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; @@ -99,7 +99,7 @@ Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyMo } void SAL_CALL ComplexToolbarController::execute( sal_Int16 KeyModifier ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; @@ -139,7 +139,7 @@ throw ( RuntimeException ) void ComplexToolbarController::statusChanged( const FeatureStateEvent& Event ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index c6bb47a9aae9..67b67d28715a 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -183,19 +183,19 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.ControlMenuController"); } 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.PopupMenuController"); @@ -204,19 +204,19 @@ public: // XPopupMenuController - virtual void SAL_CALL updatePopupMenu() throw (uno::RuntimeException); + virtual void SAL_CALL updatePopupMenu() throw (uno::RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException); + virtual void SAL_CALL initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception); // XStatusListener - virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException, std::exception ); // XMenuListener - virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException); + virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException ); + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ); private: virtual void impl_setPopupMenu(); @@ -295,7 +295,7 @@ void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rP } // XEventListener -void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -310,7 +310,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run } // XStatusListener -void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { osl::ResettableMutexGuard aLock( m_aMutex ); @@ -373,7 +373,7 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat } } -void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException) +void SAL_CALL ControlMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception) { osl::ResettableMutexGuard aLock( m_aMutex ); @@ -422,7 +422,7 @@ void ControlMenuController::impl_setPopupMenu() } // if ( m_pResPopupMenu == 0 ) } -void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::ResettableMutexGuard aLock( m_aMutex ); @@ -452,7 +452,7 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star:: } // XInitialization -void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL ControlMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { osl::ResettableMutexGuard aLock( m_aMutex ); svt::PopupMenuControllerBase::initialize(aArguments); diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index fef232b39d45..36d30ed28e2b 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -152,7 +152,7 @@ DropdownToolbarController::~DropdownToolbarController() void SAL_CALL DropdownToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 211de6c724df..6c62b6b69817 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -149,7 +149,7 @@ EditToolbarController::~EditToolbarController() void SAL_CALL EditToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 1f243371660d..be85882478f6 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -116,7 +116,7 @@ void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq } // XEventListener -void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -131,7 +131,7 @@ void SAL_CALL FontMenuController::disposing( const EventObject& ) throw ( Runtim } // XStatusListener -void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL FontMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { com::sun::star::awt::FontDescriptor aFontDescriptor; Sequence< OUString > aFontNameSeq; @@ -158,7 +158,7 @@ void FontMenuController::impl_select(const Reference< XDispatch >& _xDispatch,co _xDispatch->dispatch( aTargetURL, aArgs ); } -void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException) +void SAL_CALL FontMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception) { osl::MutexGuard aLock( m_aMutex ); @@ -207,7 +207,7 @@ void FontMenuController::impl_setPopupMenu() m_xFontListDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } -void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL FontMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { svt::PopupMenuControllerBase::updatePopupMenu(); diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 69625f061181..124c29212aa7 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -243,7 +243,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r } // XEventListener -void SAL_CALL FontSizeMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL FontSizeMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -257,7 +257,7 @@ void SAL_CALL FontSizeMenuController::disposing( const EventObject& ) throw ( Ru } // XStatusListener -void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL FontSizeMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { com::sun::star::awt::FontDescriptor aFontDescriptor; ::com::sun::star::frame::status::FontHeight aFontHeight; @@ -304,7 +304,7 @@ void FontSizeMenuController::impl_setPopupMenu() m_xCurrentFontDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 ); } -void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL FontSizeMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { osl::ClearableMutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx index 62e19d00858a..2133045074c5 100644 --- a/framework/source/uielement/genericstatusbarcontroller.cxx +++ b/framework/source/uielement/genericstatusbarcontroller.cxx @@ -70,7 +70,7 @@ GenericStatusbarController::~GenericStatusbarController() } void SAL_CALL GenericStatusbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { svt::StatusbarController::dispose(); @@ -83,7 +83,7 @@ throw ( RuntimeException ) void SAL_CALL GenericStatusbarController::statusChanged( const FeatureStateEvent& rEvent) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -124,7 +124,7 @@ void SAL_CALL GenericStatusbarController::paint( const Reference< awt::XGraphics >& xGraphics, const awt::Rectangle& rOutputRectangle, ::sal_Int32 /*nStyle*/ ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { OSL_TRACE("framework::GenericStatusbarController::paint"); SolarMutexGuard aGuard; diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 61cfb09a96fd..f5fdc40b13ba 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -120,7 +120,7 @@ GenericToolbarController::~GenericToolbarController() } void SAL_CALL GenericToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; @@ -131,7 +131,7 @@ throw ( RuntimeException ) } void SAL_CALL GenericToolbarController::execute( sal_Int16 KeyModifier ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { Reference< XDispatch > xDispatch; Reference< XURLTransformer > xURLTransformer; @@ -178,7 +178,7 @@ throw ( RuntimeException ) } void GenericToolbarController::statusChanged( const FeatureStateEvent& Event ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; @@ -338,13 +338,13 @@ Toolbarmenu::~Toolbarmenu() OSL_TRACE("**** destructing Toolbarmenu 0x%x", this ); } -void SAL_CALL MenuToolbarController::click() throw (RuntimeException) +void SAL_CALL MenuToolbarController::click() throw (RuntimeException, std::exception) { createPopupWindow(); } Reference< XWindow > SAL_CALL -MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException) +MenuToolbarController::createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( !pMenu ) { diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index f0656db07bd4..273956e6c68a 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -185,7 +185,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra } // XEventListener -void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -199,7 +199,7 @@ void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( Runt } // XStatusListener -void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { Reference< com::sun::star::frame::XModel > xModel; @@ -221,7 +221,7 @@ void HeaderMenuController::impl_select(const Reference< XDispatch >& _xDispatch, _xDispatch->dispatch( aTargetURL, aArgs ); } -void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::ResettableMutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 3065fe785c8a..f86f59fcf697 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -123,7 +123,7 @@ ImageButtonToolbarController::~ImageButtonToolbarController() void SAL_CALL ImageButtonToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; ComplexToolbarController::dispose(); diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index e2c982cd902c..1d736eb8d633 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -86,7 +86,7 @@ LanguageSelectionMenuController::~LanguageSelectionMenuController() } // XEventListener -void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -101,7 +101,7 @@ void SAL_CALL LanguageSelectionMenuController::disposing( const EventObject& ) t } // XStatusListener -void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL LanguageSelectionMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; @@ -278,7 +278,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup } -void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { svt::PopupMenuControllerBase::updatePopupMenu(); @@ -313,7 +313,7 @@ void SAL_CALL LanguageSelectionMenuController::updatePopupMenu() throw ( ::com:: } // XInitialization -void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL LanguageSelectionMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index f06197afc9ab..af1ec30368e1 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -104,17 +104,17 @@ public: } // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException); + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ); // XStatusbarController virtual void SAL_CALL command( const css::awt::Point& aPos, ::sal_Int32 nCommand, ::sal_Bool bMouseEvent, - const css::uno::Any& aData ) throw (css::uno::RuntimeException); - virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException); + const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception); private: virtual ~LangSelectionStatusbarController() {} @@ -141,7 +141,7 @@ LangSelectionStatusbarController::LangSelectionStatusbarController( const uno::R } void SAL_CALL LangSelectionStatusbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) -throw (css::uno::Exception, css::uno::RuntimeException) +throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; @@ -293,7 +293,7 @@ void SAL_CALL LangSelectionStatusbarController::command( ::sal_Int32 nCommand, ::sal_Bool /*bMouseEvent*/, const css::uno::Any& /*aData*/ ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { if ( nCommand & ::awt::Command::CONTEXTMENU ) { @@ -303,14 +303,14 @@ throw (css::uno::RuntimeException) void SAL_CALL LangSelectionStatusbarController::click( const css::awt::Point& aPos ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException, std::exception) { LangMenu( aPos ); } // XStatusListener void SAL_CALL LangSelectionStatusbarController::statusChanged( const FeatureStateEvent& Event ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // This function will be called when observed data changes, // for example the selection or keyboard language. diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 99b3f570d9d6..5c0979180ac9 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -96,7 +96,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo } // XEventListener -void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -115,7 +115,7 @@ void SAL_CALL MacrosMenuController::disposing( const EventObject& ) throw ( Runt } // XStatusListener -void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException ) +void SAL_CALL MacrosMenuController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); if ( m_xPopupMenu.is() ) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 05e914929041..228e7a3ff938 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -128,7 +128,7 @@ class StringLength : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XSt // XStringWidth sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return aString.getLength(); } @@ -226,7 +226,7 @@ MenuBarManager::MenuBarManager( Init(rFrame,pAddonPopupMenu,bDelete,bDeleteChildren,true); } -Any SAL_CALL MenuBarManager::queryInterface( const Type & rType ) throw ( RuntimeException ) +Any SAL_CALL MenuBarManager::queryInterface( const Type & rType ) throw ( RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( rType , @@ -256,7 +256,7 @@ void SAL_CALL MenuBarManager::release() throw() } -Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw (RuntimeException) +Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw (RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -327,7 +327,7 @@ void MenuBarManager::Destroy() } // XComponent -void SAL_CALL MenuBarManager::dispose() throw( RuntimeException ) +void SAL_CALL MenuBarManager::dispose() throw( RuntimeException, std::exception ) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -377,7 +377,7 @@ void SAL_CALL MenuBarManager::dispose() throw( RuntimeException ) } } -void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException ) +void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -388,7 +388,7 @@ void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } -void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException ) +void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ @@ -396,7 +396,7 @@ void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListen } void SAL_CALL MenuBarManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { ResetableGuard aGuard( m_aLock ); @@ -412,20 +412,20 @@ throw (RuntimeException) } void SAL_CALL MenuBarManager::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { elementInserted(Event); } void SAL_CALL MenuBarManager::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { elementInserted(Event); } // XFrameActionListener void SAL_CALL MenuBarManager::frameAction( const FrameActionEvent& Action ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -446,7 +446,7 @@ throw ( RuntimeException ) // XStatusListener void SAL_CALL MenuBarManager::statusChanged( const FeatureStateEvent& Event ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { OUString aFeatureURL = Event.FeatureURL.Complete; @@ -653,7 +653,7 @@ void MenuBarManager::RemoveListener() m_xFrame = 0; } -void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( RuntimeException ) +void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception ) { MenuItemHandler* pMenuItemDisposing = NULL; @@ -775,7 +775,7 @@ private: virtual com::sun::star::uno::Any SAL_CALL getValueByName( OUString const & Name) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { return Name != JAVA_INTERACTION_HANDLER_NAME && context_.is() ? context_->getValueByName(Name) diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index e822785c5c17..67ca57f3a945 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -94,7 +94,7 @@ MenuBarWrapper::~MenuBarWrapper() { } -void SAL_CALL MenuBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL MenuBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -113,7 +113,7 @@ void SAL_CALL MenuBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeExc } // XInitialization -void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -203,7 +203,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th } // XUIElementSettings -void SAL_CALL MenuBarWrapper::updateSettings() throw ( RuntimeException ) +void SAL_CALL MenuBarWrapper::updateSettings() throw ( RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -256,13 +256,13 @@ void MenuBarWrapper::fillPopupControllerCache() // XElementAccess Type SAL_CALL MenuBarWrapper::getElementType() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return ::getCppuType(( Reference< XDispatchProvider >*)0); } ::sal_Bool SAL_CALL MenuBarWrapper::hasElements() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -278,7 +278,7 @@ Any SAL_CALL MenuBarWrapper::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -299,7 +299,7 @@ throw ( container::NoSuchElementException, } Sequence< OUString > SAL_CALL MenuBarWrapper::getElementNames() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -323,7 +323,7 @@ throw (::com::sun::star::uno::RuntimeException) ::sal_Bool SAL_CALL MenuBarWrapper::hasByName( const OUString& aName ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -340,7 +340,7 @@ throw (::com::sun::star::uno::RuntimeException) } // XUIElement -Reference< XInterface > SAL_CALL MenuBarWrapper::getRealInterface() throw ( RuntimeException ) +Reference< XInterface > SAL_CALL MenuBarWrapper::getRealInterface() throw ( RuntimeException, std::exception ) { if ( m_bDisposed ) throw DisposedException(); diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 16da1544849d..73e5a2ac1d5e 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -367,7 +367,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup } // XEventListener -void SAL_CALL NewMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL NewMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -382,12 +382,12 @@ void SAL_CALL NewMenuController::disposing( const EventObject& ) throw ( Runtime } // XStatusListener -void SAL_CALL NewMenuController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException ) +void SAL_CALL NewMenuController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException, std::exception ) { } // XMenuListener -void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException) +void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception) { Reference< css::awt::XPopupMenu > xPopupMenu; Reference< XDispatch > xDispatch; @@ -443,7 +443,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent } } -void SAL_CALL NewMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException) +void SAL_CALL NewMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; if ( m_xFrame.is() && m_xPopupMenu.is() ) @@ -508,7 +508,7 @@ void NewMenuController::impl_setPopupMenu() } // XInitialization -void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL NewMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index 618171c1e785..e270f3c287d0 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -62,19 +62,19 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.ObjectMenuController"); } 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.PopupMenuController"); @@ -82,10 +82,10 @@ public: } // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ); // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException ); + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ); private: void fillPopupMenu( const css::uno::Sequence< css::embed::VerbDescriptor >& rVerbCommandSeq, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu ); @@ -136,7 +136,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed: } // XEventListener -void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -151,7 +151,7 @@ void SAL_CALL ObjectMenuController::disposing( const EventObject& ) throw ( Runt } // XStatusListener -void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL ObjectMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { Sequence < com::sun::star::embed::VerbDescriptor > aVerbCommandSeq; if ( Event.State >>= aVerbCommandSeq ) diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index f16bf43fc9e0..e0ce22aba52e 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -52,13 +52,13 @@ public: virtual ~PopupMenuToolbarController(); // XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException ); + virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ); // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException); + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception); // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ); protected: PopupMenuToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, @@ -92,7 +92,7 @@ PopupMenuToolbarController::~PopupMenuToolbarController() } void SAL_CALL PopupMenuToolbarController::dispose() -throw ( css::uno::RuntimeException ) +throw ( css::uno::RuntimeException, std::exception ) { svt::ToolboxController::dispose(); @@ -120,7 +120,7 @@ throw ( css::uno::RuntimeException ) void SAL_CALL PopupMenuToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) -throw ( css::uno::Exception, css::uno::RuntimeException ) +throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { ToolboxController::initialize( aArguments ); @@ -157,7 +157,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException ) } void SAL_CALL PopupMenuToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException ) + throw ( css::uno::RuntimeException, std::exception ) { // TODO move to base class @@ -167,7 +167,7 @@ void SAL_CALL PopupMenuToolbarController::statusChanged( const css::frame::Featu css::uno::Reference< css::awt::XWindow > SAL_CALL PopupMenuToolbarController::createPopupWindow() - throw ( css::uno::RuntimeException ) + throw ( css::uno::RuntimeException, std::exception ) { css::uno::Reference< css::awt::XWindow > xRet; @@ -352,12 +352,12 @@ public: css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); - void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException); + void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); private: void functionExecuted( const OUString &rCommand ); - void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException ); - void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException); + void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ); + void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception); void setItemImage( const OUString &rCommand ); OUString m_aLastURL; @@ -391,7 +391,7 @@ css::uno::Sequence<OUString> NewToolbarController::getSupportedServiceNames() } void SAL_CALL NewToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) -throw ( css::uno::Exception, css::uno::RuntimeException ) +throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { PopupMenuToolbarController::initialize( aArguments ); @@ -400,7 +400,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException ) } void SAL_CALL NewToolbarController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) - throw ( css::uno::RuntimeException ) + throw ( css::uno::RuntimeException, std::exception ) { if ( rEvent.IsEnabled ) { @@ -421,7 +421,7 @@ void SAL_CALL NewToolbarController::statusChanged( const css::frame::FeatureStat } void SAL_CALL NewToolbarController::execute( sal_Int16 /*KeyModifier*/ ) -throw ( css::uno::RuntimeException ) +throw ( css::uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); if ( !m_aLastURL.getLength() ) diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index 9669cf7364ea..f00583735fb7 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -246,21 +246,21 @@ throw (uno::RuntimeException) // XInitialization void SAL_CALL ProgressBarWrapper::initialize( const uno::Sequence< uno::Any >& ) -throw (uno::Exception, uno::RuntimeException) +throw (uno::Exception, uno::RuntimeException, std::exception) { // dummy - do nothing } // XUpdatable void SAL_CALL ProgressBarWrapper::update() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { // dummy - do nothing } // XComponent void SAL_CALL ProgressBarWrapper::dispose() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { uno::Reference< lang::XComponent > xThis( static_cast< cppu::OWeakObject* >(this), @@ -298,7 +298,7 @@ throw (uno::RuntimeException) // XUIElement uno::Reference< uno::XInterface > SAL_CALL ProgressBarWrapper::getRealInterface() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { /* SAFE AREA ----------------------------------------------------------------------------------------------- */ // Ready for multithreading diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 99cd85781e64..d181ac240fca 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -64,19 +64,19 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.framework.RecentFilesMenuController"); } 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.PopupMenuController"); @@ -84,20 +84,20 @@ public: } // XStatusListener - virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException, std::exception ); // XMenuListener - virtual void SAL_CALL itemSelected( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException); - virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException); + virtual void SAL_CALL itemSelected( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL itemActivated( const awt::MenuEvent& rEvent ) throw (uno::RuntimeException, std::exception); // XDispatchProvider - virtual uno::Reference< frame::XDispatch > SAL_CALL queryDispatch( const util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( uno::RuntimeException ); + virtual uno::Reference< frame::XDispatch > SAL_CALL queryDispatch( const util::URL& aURL, const OUString& sTarget, sal_Int32 nFlags ) throw( uno::RuntimeException, std::exception ); // XDispatch - virtual void SAL_CALL dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& seqProperties ) throw( uno::RuntimeException ); + virtual void SAL_CALL dispatch( const util::URL& aURL, const uno::Sequence< beans::PropertyValue >& seqProperties ) throw( uno::RuntimeException, std::exception ); // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( uno::RuntimeException ); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ); DECL_STATIC_LINK( RecentFilesMenuController, ExecuteHdl_Impl, LoadRecentFile* ); @@ -290,7 +290,7 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) } // XEventListener -void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -304,13 +304,13 @@ void SAL_CALL RecentFilesMenuController::disposing( const EventObject& ) throw ( } // XStatusListener -void SAL_CALL RecentFilesMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL RecentFilesMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); m_bDisabled = !Event.IsEnabled; } -void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException) +void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception) { Reference< css::awt::XPopupMenu > xPopupMenu; @@ -336,7 +336,7 @@ void SAL_CALL RecentFilesMenuController::itemSelected( const css::awt::MenuEvent } } -void SAL_CALL RecentFilesMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException) +void SAL_CALL RecentFilesMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception) { osl::MutexGuard aLock( m_aMutex ); impl_setPopupMenu(); @@ -354,7 +354,7 @@ Reference< XDispatch > SAL_CALL RecentFilesMenuController::queryDispatch( const URL& aURL, const OUString& /*sTarget*/, sal_Int32 /*nFlags*/ ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); @@ -370,7 +370,7 @@ throw( RuntimeException ) void SAL_CALL RecentFilesMenuController::dispatch( const URL& aURL, const Sequence< PropertyValue >& /*seqProperties*/ ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index b1c88f89fb31..100d7af2c31e 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -210,7 +210,7 @@ SpinfieldToolbarController::~SpinfieldToolbarController() void SAL_CALL SpinfieldToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx index 4a15b3a33495..a19e6f7f01fe 100644 --- a/framework/source/uielement/statusbaritem.cxx +++ b/framework/source/uielement/statusbaritem.cxx @@ -90,21 +90,21 @@ void SAL_CALL StatusbarItem::disposing() } OUString SAL_CALL StatusbarItem::getCommand() -throw (RuntimeException) +throw (RuntimeException, std::exception) { osl::MutexGuard aGuard( m_aMutex ); return m_aCommand; } ::sal_uInt16 SAL_CALL StatusbarItem::getItemId() -throw (RuntimeException) +throw (RuntimeException, std::exception) { osl::MutexGuard aGuard( m_aMutex ); return m_nId; } ::sal_uInt32 SAL_CALL StatusbarItem::getWidth() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -114,14 +114,14 @@ throw (RuntimeException) } ::sal_uInt16 SAL_CALL StatusbarItem::getStyle() -throw (RuntimeException) +throw (RuntimeException, std::exception) { osl::MutexGuard aGuard( m_aMutex ); return m_nStyle; } ::sal_Int32 SAL_CALL StatusbarItem::getOffset() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -131,7 +131,7 @@ throw (RuntimeException) } ::com::sun::star::awt::Rectangle SAL_CALL StatusbarItem::getItemRect() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ::com::sun::star::awt::Rectangle aAWTRect; @@ -148,7 +148,7 @@ throw (RuntimeException) } OUString SAL_CALL StatusbarItem::getText() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -158,7 +158,7 @@ throw (RuntimeException) } void SAL_CALL StatusbarItem::setText( const OUString& rText ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -166,7 +166,7 @@ throw (RuntimeException) } OUString SAL_CALL StatusbarItem::getHelpText() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -176,7 +176,7 @@ throw (RuntimeException) } void SAL_CALL StatusbarItem::setHelpText( const OUString& rHelpText ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -184,7 +184,7 @@ throw (RuntimeException) } OUString SAL_CALL StatusbarItem::getQuickHelpText() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -194,7 +194,7 @@ throw (RuntimeException) } void SAL_CALL StatusbarItem::setQuickHelpText( const OUString& rQuickHelpText ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -202,7 +202,7 @@ throw (RuntimeException) } OUString SAL_CALL StatusbarItem::getAccessibleName() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -212,7 +212,7 @@ throw (RuntimeException) } void SAL_CALL StatusbarItem::setAccessibleName( const OUString& rAccessibleName ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -220,7 +220,7 @@ throw (RuntimeException) } ::sal_Bool SAL_CALL StatusbarItem::getVisible() -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) @@ -230,7 +230,7 @@ throw (RuntimeException) } void SAL_CALL StatusbarItem::setVisible( ::sal_Bool bVisible ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( !m_pStatusBar ) @@ -246,7 +246,7 @@ throw (RuntimeException) } void SAL_CALL StatusbarItem::repaint( ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 577ca6198bda..1decf935c86a 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -164,14 +164,14 @@ StatusBar* StatusBarManager::GetStatusBar() const } void StatusBarManager::frameAction( const frame::FrameActionEvent& Action ) -throw ( uno::RuntimeException ) +throw ( uno::RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); if ( Action.Action == frame::FrameAction_CONTEXT_CHANGED ) UpdateControllers(); } -void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException ) +void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException, std::exception ) { { ResetableGuard aGuard( m_aLock ); @@ -191,7 +191,7 @@ void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) thr } // XComponent -void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException ) +void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xThis( static_cast< OWeakObject* >(this), uno::UNO_QUERY ); @@ -238,7 +238,7 @@ void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException ) } } -void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException ) +void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -250,14 +250,14 @@ void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XE ( const uno::Reference< lang::XEventListener >* ) NULL ), xListener ); } -void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException ) +void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException, std::exception ) { m_aListenerContainer.removeInterface( ::getCppuType( ( const uno::Reference< lang::XEventListener >* ) NULL ), xListener ); } // XUIConfigurationListener -void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException ) +void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -265,7 +265,7 @@ void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEve return; } -void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException ) +void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -273,7 +273,7 @@ void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEven return; } -void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException ) +void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index ee451b27723a..6cc31b78ff98 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -64,7 +64,7 @@ StatusBarWrapper::~StatusBarWrapper() { } -void SAL_CALL StatusBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL StatusBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -88,7 +88,7 @@ void SAL_CALL StatusBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeE } // XInitialization -void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -137,7 +137,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) } // XUIElementSettings -void SAL_CALL StatusBarWrapper::updateSettings() throw ( RuntimeException ) +void SAL_CALL StatusBarWrapper::updateSettings() throw ( RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -162,7 +162,7 @@ void SAL_CALL StatusBarWrapper::updateSettings() throw ( RuntimeException ) } } -Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface() throw ( RuntimeException ) +Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface() throw ( RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx index 267f8c0a89af..5bd9e1ca806b 100644 --- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx +++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx @@ -47,7 +47,7 @@ StatusIndicatorInterfaceWrapper::~StatusIndicatorInterfaceWrapper() void SAL_CALL StatusIndicatorInterfaceWrapper::start( const OUString& sText, sal_Int32 nRange ) -throw( ::com::sun::star::uno::RuntimeException ) +throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) @@ -59,7 +59,7 @@ throw( ::com::sun::star::uno::RuntimeException ) } void SAL_CALL StatusIndicatorInterfaceWrapper::end() -throw( ::com::sun::star::uno::RuntimeException ) +throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) @@ -71,7 +71,7 @@ throw( ::com::sun::star::uno::RuntimeException ) } void SAL_CALL StatusIndicatorInterfaceWrapper::reset() -throw( ::com::sun::star::uno::RuntimeException ) +throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) @@ -84,7 +84,7 @@ throw( ::com::sun::star::uno::RuntimeException ) void SAL_CALL StatusIndicatorInterfaceWrapper::setText( const OUString& sText ) -throw( ::com::sun::star::uno::RuntimeException ) +throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) @@ -97,7 +97,7 @@ throw( ::com::sun::star::uno::RuntimeException ) void SAL_CALL StatusIndicatorInterfaceWrapper::setValue( sal_Int32 nValue ) -throw( ::com::sun::star::uno::RuntimeException ) +throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Reference< XComponent > xComp( m_xStatusIndicatorImpl ); if ( xComp.is() ) diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 5dbe7a306d8b..c5b35ed9c737 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -81,7 +81,7 @@ ToggleButtonToolbarController::~ToggleButtonToolbarController() void SAL_CALL ToggleButtonToolbarController::dispose() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarMutexGuard; ComplexToolbarController::dispose(); @@ -103,7 +103,7 @@ Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16 uno::Reference< awt::XWindow > SAL_CALL ToggleButtonToolbarController::createPopupWindow() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { uno::Reference< awt::XWindow > xWindow; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 4fbcf98536ca..caf157bef312 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -118,7 +118,7 @@ class ImageOrientationListener : public svt::FrameStatusListener const Reference< XFrame > rFrame ); virtual ~ImageOrientationListener(); - 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: Reference< XStatusListener > m_xReceiver; @@ -138,7 +138,7 @@ ImageOrientationListener::~ImageOrientationListener() } void SAL_CALL ImageOrientationListener::statusChanged( const FeatureStateEvent& Event ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { if ( m_xReceiver.is() ) m_xReceiver->statusChanged( Event ); @@ -483,7 +483,7 @@ void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference< ::com:: } void ToolBarManager::frameAction( const FrameActionEvent& Action ) -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); if ( Action.Action == FrameAction_CONTEXT_CHANGED ) @@ -491,7 +491,7 @@ throw ( RuntimeException ) } void SAL_CALL ToolBarManager::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) -throw ( ::com::sun::star::uno::RuntimeException ) +throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); if ( m_bDisposed ) @@ -508,7 +508,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) } } -void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( RuntimeException ) +void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception ) { { ResetableGuard aGuard( m_aLock ); @@ -565,7 +565,7 @@ void SAL_CALL ToolBarManager::disposing( const EventObject& Source ) throw ( Run } // XComponent -void SAL_CALL ToolBarManager::dispose() throw( RuntimeException ) +void SAL_CALL ToolBarManager::dispose() throw( RuntimeException, std::exception ) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -645,7 +645,7 @@ void SAL_CALL ToolBarManager::dispose() throw( RuntimeException ) } } -void SAL_CALL ToolBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException ) +void SAL_CALL ToolBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) { ResetableGuard aGuard( m_aLock ); @@ -656,18 +656,18 @@ void SAL_CALL ToolBarManager::addEventListener( const Reference< XEventListener m_aListenerContainer.addInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } -void SAL_CALL ToolBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException ) +void SAL_CALL ToolBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) { m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener ); } // XUIConfigurationListener -void SAL_CALL ToolBarManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ToolBarManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) { impl_elementChanged(false,Event); } -void SAL_CALL ToolBarManager::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ToolBarManager::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) { impl_elementChanged(true,Event); } @@ -738,7 +738,7 @@ void ToolBarManager::setToolBarImage(const Image& _aImage,const CommandToInfoMap ::std::for_each(_rIDs.begin(),_rIDs.end(),::boost::bind(&ToolBox::SetItemImage,m_pToolBar,_1,_aImage)); } -void SAL_CALL ToolBarManager::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ToolBarManager::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) { impl_elementChanged(false,Event); } diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 45b576561d1c..3ad9a12bfe12 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -526,7 +526,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r } // XEventListener -void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( RuntimeException ) +void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( RuntimeException, std::exception ) { Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY ); @@ -543,7 +543,7 @@ void SAL_CALL ToolbarsMenuController::disposing( const EventObject& ) throw ( Ru } // XStatusListener -void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) +void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException, std::exception ) { OUString aFeatureURL( Event.FeatureURL.Complete ); @@ -592,7 +592,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev } // XMenuListener -void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException) +void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& rEvent ) throw (RuntimeException, std::exception) { Reference< css::awt::XPopupMenu > xPopupMenu; Reference< XComponentContext > xContext; @@ -751,7 +751,7 @@ void SAL_CALL ToolbarsMenuController::itemSelected( const css::awt::MenuEvent& r } } -void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException) +void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent& ) throw (RuntimeException, std::exception) { std::vector< OUString > aCmdVector; Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY ); @@ -792,7 +792,7 @@ void SAL_CALL ToolbarsMenuController::itemActivated( const css::awt::MenuEvent& } // XPopupMenuController -void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException ) +void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); @@ -810,7 +810,7 @@ void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::X } // XInitialization -void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { osl::MutexGuard aLock( m_aMutex ); sal_Bool bInitalized( m_bInitialized ); diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index efd7c8b3dec1..84f9706c9e0b 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -75,7 +75,7 @@ void SAL_CALL ToolBarWrapper::release() throw() } uno::Any SAL_CALL ToolBarWrapper::queryInterface( const uno::Type & rType ) -throw( ::com::sun::star::uno::RuntimeException ) +throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Any a = ::cppu::queryInterface( rType , @@ -88,7 +88,7 @@ throw( ::com::sun::star::uno::RuntimeException ) } // XComponent -void SAL_CALL ToolBarWrapper::dispose() throw ( RuntimeException ) +void SAL_CALL ToolBarWrapper::dispose() throw ( RuntimeException, std::exception ) { Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY ); @@ -113,7 +113,7 @@ void SAL_CALL ToolBarWrapper::dispose() throw ( RuntimeException ) } // XInitialization -void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -193,13 +193,13 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th } // XEventListener -void SAL_CALL ToolBarWrapper::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ToolBarWrapper::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // nothing todo } // XUpdatable -void SAL_CALL ToolBarWrapper::update() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ToolBarWrapper::update() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -212,7 +212,7 @@ void SAL_CALL ToolBarWrapper::update() throw (::com::sun::star::uno::RuntimeExce } // XUIElementSettings -void SAL_CALL ToolBarWrapper::updateSettings() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ToolBarWrapper::updateSettings() throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -251,7 +251,7 @@ void ToolBarWrapper::impl_fillNewData() } // XUIElement interface -Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (::com::sun::star::uno::RuntimeException) +Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -272,7 +272,7 @@ Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (::c void SAL_CALL ToolBarWrapper::functionExecute( const OUString& aUIElementName, const OUString& aCommand ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); @@ -284,7 +284,7 @@ throw (::com::sun::star::uno::RuntimeException) } } -void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ) +void SAL_CALL ToolBarWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) { ResetableGuard aLock( m_aLock ); sal_Bool bNoClose( m_bNoClose ); diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 413aabc0204d..f7b5a357b491 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -92,28 +92,28 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) - throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // container.XContainerListener - virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException); - virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException); - virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException); + virtual void SAL_CALL elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); + virtual void SAL_CALL elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); + virtual void SAL_CALL elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException, std::exception); // lang.XEventListener - virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException); + virtual void SAL_CALL disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception); protected: virtual ::com::sun::star::uno::Any SAL_CALL getByNameImpl( const OUString& aName ); @@ -257,7 +257,7 @@ Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rComm } Any SAL_CALL ConfigurationAccess_UICommand::getByName( const OUString& rCommandURL ) -throw ( NoSuchElementException, WrappedTargetException, RuntimeException) +throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { Any aRet( getByNameImpl( rCommandURL ) ); if( !aRet.hasValue() ) @@ -267,26 +267,26 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException) } Sequence< OUString > SAL_CALL ConfigurationAccess_UICommand::getElementNames() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return getAllCommands(); } sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasByName( const OUString& rCommandURL ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return getByNameImpl( rCommandURL ).hasValue(); } // XElementAccess Type SAL_CALL ConfigurationAccess_UICommand::getElementType() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return( ::getCppuType( (const Sequence< PropertyValue >*)NULL ) ); } sal_Bool SAL_CALL ConfigurationAccess_UICommand::hasElements() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { // There must are global commands! return sal_True; @@ -562,21 +562,21 @@ sal_Bool ConfigurationAccess_UICommand::initializeConfigAccess() } // container.XContainerListener -void SAL_CALL ConfigurationAccess_UICommand::elementInserted( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICommand::elementInserted( const ContainerEvent& ) throw(RuntimeException, std::exception) { osl::MutexGuard g(m_aMutex); m_bCacheFilled = sal_False; fillCache(); } -void SAL_CALL ConfigurationAccess_UICommand::elementRemoved( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICommand::elementRemoved( const ContainerEvent& ) throw(RuntimeException, std::exception) { osl::MutexGuard g(m_aMutex); m_bCacheFilled = sal_False; fillCache(); } -void SAL_CALL ConfigurationAccess_UICommand::elementReplaced( const ContainerEvent& ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICommand::elementReplaced( const ContainerEvent& ) throw(RuntimeException, std::exception) { osl::MutexGuard g(m_aMutex); m_bCacheFilled = sal_False; @@ -584,7 +584,7 @@ void SAL_CALL ConfigurationAccess_UICommand::elementReplaced( const ContainerEve } // lang.XEventListener -void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEvent ) throw(RuntimeException) +void SAL_CALL ConfigurationAccess_UICommand::disposing( const EventObject& aEvent ) throw(RuntimeException, std::exception) { // SAFE // remove our reference to the config access @@ -668,7 +668,7 @@ Reference< XNameAccess > UICommandDescription::impl_createConfigAccess(const OUS } Any SAL_CALL UICommandDescription::getByName( const OUString& aName ) -throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { Any a; @@ -709,7 +709,7 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la } Sequence< OUString > SAL_CALL UICommandDescription::getElementNames() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard g(rBHelper.rMutex); @@ -727,7 +727,7 @@ throw (::com::sun::star::uno::RuntimeException) } sal_Bool SAL_CALL UICommandDescription::hasByName( const OUString& aName ) -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { osl::MutexGuard g(rBHelper.rMutex); @@ -737,13 +737,13 @@ throw (::com::sun::star::uno::RuntimeException) // XElementAccess Type SAL_CALL UICommandDescription::getElementType() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { return( ::getCppuType( (const Reference< XNameAccess >*)NULL ) ); } sal_Bool SAL_CALL UICommandDescription::hasElements() -throw (::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::uno::RuntimeException, std::exception) { // generic UI commands are always available! return sal_True; |