diff options
Diffstat (limited to 'framework/source/helper')
| -rw-r--r-- | framework/source/helper/dockingareadefaultacceptor.cxx | 6 | ||||
| -rw-r--r-- | framework/source/helper/ocomponentaccess.cxx | 6 | ||||
| -rw-r--r-- | framework/source/helper/ocomponentenumeration.cxx | 6 | ||||
| -rw-r--r-- | framework/source/helper/oframes.cxx | 14 | ||||
| -rw-r--r-- | framework/source/helper/persistentwindowstate.cxx | 6 | ||||
| -rw-r--r-- | framework/source/helper/statusindicator.cxx | 10 | ||||
| -rw-r--r-- | framework/source/helper/statusindicatorfactory.cxx | 6 | ||||
| -rw-r--r-- | framework/source/helper/tagwindowasmodified.cxx | 8 | ||||
| -rw-r--r-- | framework/source/helper/titlebarupdate.cxx | 8 | ||||
| -rw-r--r-- | framework/source/helper/uiconfigelementwrapperbase.cxx | 34 | ||||
| -rw-r--r-- | framework/source/helper/uielementwrapperbase.cxx | 22 | ||||
| -rw-r--r-- | framework/source/helper/vclstatusindicator.cxx | 10 |
12 files changed, 68 insertions, 68 deletions
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index 651f3002cc95..47fd34fd6041 100644 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -56,7 +56,7 @@ DockingAreaDefaultAcceptor::~DockingAreaDefaultAcceptor() //***************************************************************************************************************** // XDockingAreaAcceptor //***************************************************************************************************************** -css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException) +css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException, std::exception) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -68,7 +68,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::ge return xContainerWindow; } -sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException) +sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException, std::exception) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -105,7 +105,7 @@ sal_Bool SAL_CALL DockingAreaDefaultAcceptor::requestDockingAreaSpace( const css return sal_False; } -void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException) +void SAL_CALL DockingAreaDefaultAcceptor::setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException, std::exception) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index 5e5d3397ffde..6bc4685a8cb3 100644 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -59,7 +59,7 @@ OComponentAccess::~OComponentAccess() //***************************************************************************************************************** // XEnumerationAccess //***************************************************************************************************************** -css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException ) +css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -89,7 +89,7 @@ css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration //***************************************************************************************************************** // XElementAccess //***************************************************************************************************************** -Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException ) +Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::exception ) { // Elements in list an enumeration are components! // Return the uno-type of XComponent. @@ -99,7 +99,7 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException ) //***************************************************************************************************************** // XElementAccess //***************************************************************************************************************** -sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException ) +sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 80b64c6fa646..2c1f9e1b5db2 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -64,7 +64,7 @@ OComponentEnumeration::~OComponentEnumeration() //***************************************************************************************************************** // XEventListener //***************************************************************************************************************** -void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) throw( RuntimeException ) +void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -81,7 +81,7 @@ void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) thro //***************************************************************************************************************** // XEnumeration //***************************************************************************************************************** -sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeException ) +sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -98,7 +98,7 @@ sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeExcepti //***************************************************************************************************************** Any SAL_CALL OComponentEnumeration::nextElement() throw( NoSuchElementException , WrappedTargetException , - RuntimeException ) + RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 7c60eaae9b1e..4ba1b88f1d75 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -66,7 +66,7 @@ OFrames::~OFrames() //***************************************************************************************************************** // XFrames //***************************************************************************************************************** -void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException ) +void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -92,7 +92,7 @@ void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) thr //***************************************************************************************************************** // XFrames //***************************************************************************************************************** -void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException ) +void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -119,7 +119,7 @@ void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) thr //***************************************************************************************************************** // XFrames //***************************************************************************************************************** -Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException ) +Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -226,7 +226,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int //***************************************************************************************************************** // XIndexAccess //***************************************************************************************************************** -sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException ) +sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -252,7 +252,7 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException ) //***************************************************************************************************************** Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException , WrappedTargetException , - RuntimeException ) + RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); @@ -282,7 +282,7 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce //***************************************************************************************************************** // XElementAccess //***************************************************************************************************************** -Type SAL_CALL OFrames::getElementType() throw( RuntimeException ) +Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception ) { // This "container" support XFrame-interfaces only! return ::getCppuType( (const css::uno::Reference< XFrame >*)NULL ); @@ -291,7 +291,7 @@ Type SAL_CALL OFrames::getElementType() throw( RuntimeException ) //***************************************************************************************************************** // XElementAccess //***************************************************************************************************************** -sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException ) +sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception ) { // Ready for multithreading ResetableGuard aGuard( m_aLock ); diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 1b5f6ce72491..634583b52ea6 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -60,7 +60,7 @@ PersistentWindowState::~PersistentWindowState() //***************************************************************************************************************** void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { // check arguments css::uno::Reference< css::frame::XFrame > xFrame; @@ -90,7 +90,7 @@ void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::u //***************************************************************************************************************** void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEvent& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -151,7 +151,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv //***************************************************************************************************************** void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // nothing todo here - because we hold the frame as weak reference only } diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx index b3f7fc2a4cb7..8585679d214f 100644 --- a/framework/source/helper/statusindicator.cxx +++ b/framework/source/helper/statusindicator.cxx @@ -43,7 +43,7 @@ StatusIndicator::~StatusIndicator() //*********************************************** void SAL_CALL StatusIndicator::start(const OUString& sText , sal_Int32 nRange) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ReadGuard aReadLock(m_aLock); @@ -59,7 +59,7 @@ void SAL_CALL StatusIndicator::start(const OUString& sText , //*********************************************** void SAL_CALL StatusIndicator::end() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ReadGuard aReadLock(m_aLock); @@ -75,7 +75,7 @@ void SAL_CALL StatusIndicator::end() //*********************************************** void SAL_CALL StatusIndicator::reset() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ReadGuard aReadLock(m_aLock); @@ -91,7 +91,7 @@ void SAL_CALL StatusIndicator::reset() //*********************************************** void SAL_CALL StatusIndicator::setText(const OUString& sText) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ReadGuard aReadLock(m_aLock); @@ -107,7 +107,7 @@ void SAL_CALL StatusIndicator::setText(const OUString& sText) //*********************************************** void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ReadGuard aReadLock(m_aLock); diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 9610ba17710d..3b55f7c6e7c1 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -74,7 +74,7 @@ StatusIndicatorFactory::~StatusIndicatorFactory() void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if (lArguments.getLength() > 0) { // SAFE -> ---------------------------------- @@ -113,7 +113,7 @@ void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css:: css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFactory::createStatusIndicator() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { StatusIndicator* pIndicator = new StatusIndicator(this); css::uno::Reference< css::task::XStatusIndicator > xIndicator(static_cast< ::cppu::OWeakObject* >(pIndicator), css::uno::UNO_QUERY_THROW); @@ -123,7 +123,7 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFacto void SAL_CALL StatusIndicatorFactory::update() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 758092b016b7..538b789d8a7e 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -56,7 +56,7 @@ TagWindowAsModified::~TagWindowAsModified() //***************************************************************************************************************** void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { css::uno::Reference< css::frame::XFrame > xFrame; @@ -78,7 +78,7 @@ void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno //***************************************************************************************************************** void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -118,7 +118,7 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent //***************************************************************************************************************** void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEvent& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { if ( (aEvent.Action != css::frame::FrameAction_COMPONENT_REATTACHED) && @@ -144,7 +144,7 @@ void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEven //***************************************************************************************************************** void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index b958b94de25f..188d09512bdc 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -69,7 +69,7 @@ TitleBarUpdate::~TitleBarUpdate() //***************************************************************************************************************** void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { // check arguments css::uno::Reference< css::frame::XFrame > xFrame; @@ -103,7 +103,7 @@ void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any //***************************************************************************************************************** void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aEvent) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // we are interested on events only, which must trigger a title bar update // because component was changed. @@ -119,14 +119,14 @@ void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aE //***************************************************************************************************************** void SAL_CALL TitleBarUpdate::titleChanged(const css::frame::TitleChangedEvent& /* aEvent */) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { impl_forceUpdate (); } //***************************************************************************************************************** void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // nothing todo here - because we hold the frame as weak reference only } diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index df0ddf867276..e9229ed2d369 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -78,7 +78,7 @@ UIConfigElementWrapperBase::~UIConfigElementWrapperBase() { } -Any SAL_CALL UIConfigElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException) +Any SAL_CALL UIConfigElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) { Any aRet = UIConfigElementWrapperBase_BASE::queryInterface( _rType ); if ( !aRet.hasValue() ) @@ -86,7 +86,7 @@ Any SAL_CALL UIConfigElementWrapperBase::queryInterface( const Type& _rType ) th return aRet; } -Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes( ) throw(RuntimeException, std::exception) { return comphelper::concatSequences( UIConfigElementWrapperBase_BASE::getTypes(), @@ -95,26 +95,26 @@ Sequence< Type > SAL_CALL UIConfigElementWrapperBase::getTypes( ) throw(Runtime } // XComponent -void SAL_CALL UIConfigElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); } -void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), aListener ); } // XEventListener void SAL_CALL UIConfigElementWrapperBase::disposing( const EventObject& ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); m_xConfigSource.clear(); } void SAL_CALL UIConfigElementWrapperBase::initialize( const Sequence< Any >& aArguments ) -throw ( Exception, RuntimeException ) +throw ( Exception, RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -147,22 +147,22 @@ throw ( Exception, RuntimeException ) } // XUpdatable -void SAL_CALL UIConfigElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException, std::exception) { // can be implemented by derived class } -void SAL_CALL UIConfigElementWrapperBase::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigElementWrapperBase::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // can be implemented by derived class } -void SAL_CALL UIConfigElementWrapperBase::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigElementWrapperBase::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // can be implemented by derived class } -void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIConfigElementWrapperBase::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { // can be implemented by derived class } @@ -252,7 +252,7 @@ sal_Bool SAL_CALL UIConfigElementWrapperBase::convertFastPropertyValue( Any& } void SAL_CALL UIConfigElementWrapperBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , - const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception ) + const com::sun::star::uno::Any& aValue ) throw( com::sun::star::uno::Exception, std::exception ) { switch( nHandle ) { @@ -401,7 +401,7 @@ void SAL_CALL UIConfigElementWrapperBase::getFastPropertyValue( com::sun::star:: return(*pInfoHelper); } -com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIConfigElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException) +com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIConfigElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -450,7 +450,7 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigE // Return "PropertyDescriptor" return lPropertyDescriptor; } -void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAccess >& xSettings ) throw ( RuntimeException ) +void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAccess >& xSettings ) throw ( RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -489,7 +489,7 @@ void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAc void UIConfigElementWrapperBase::impl_fillNewData() { } -Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_Bool bWriteable ) throw ( RuntimeException ) +Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_Bool bWriteable ) throw ( RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -500,20 +500,20 @@ Reference< XIndexAccess > SAL_CALL UIConfigElementWrapperBase::getSettings( sal_ return m_xConfigData; } -Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (RuntimeException) +Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); Reference< XFrame > xFrame( m_xWeakFrame ); return xFrame; } -OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException) +OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); return m_aResourceURL; } -::sal_Int16 SAL_CALL UIConfigElementWrapperBase::getType() throw (RuntimeException) +::sal_Int16 SAL_CALL UIConfigElementWrapperBase::getType() throw (RuntimeException, std::exception) { ResetableGuard aLock( m_aLock ); return m_nType; diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index 2dd1a63c6f58..45f37902ef03 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -59,7 +59,7 @@ UIElementWrapperBase::~UIElementWrapperBase() { } -Any SAL_CALL UIElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException) +Any SAL_CALL UIElementWrapperBase::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) { Any aRet = UIElementWrapperBase_BASE::queryInterface( _rType ); if ( !aRet.hasValue() ) @@ -67,7 +67,7 @@ Any SAL_CALL UIElementWrapperBase::queryInterface( const Type& _rType ) throw(Ru return aRet; } -Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes( ) throw(RuntimeException, std::exception) { return comphelper::concatSequences( UIElementWrapperBase_BASE::getTypes(), @@ -75,18 +75,18 @@ Sequence< Type > SAL_CALL UIElementWrapperBase::getTypes( ) throw(RuntimeExcept ); } -void SAL_CALL UIElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIElementWrapperBase::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); } -void SAL_CALL UIElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIElementWrapperBase::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener ); } void SAL_CALL UIElementWrapperBase::initialize( const Sequence< Any >& aArguments ) -throw ( Exception, RuntimeException ) +throw ( Exception, RuntimeException, std::exception ) { ResetableGuard aLock( m_aLock ); @@ -113,24 +113,24 @@ throw ( Exception, RuntimeException ) } // XUIElement -::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame() throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL UIElementWrapperBase::getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame( m_xWeakFrame ); return xFrame; } -OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_aResourceURL; } -::sal_Int16 SAL_CALL UIElementWrapperBase::getType() throw (::com::sun::star::uno::RuntimeException) +::sal_Int16 SAL_CALL UIElementWrapperBase::getType() throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_nType; } // XUpdatable -void SAL_CALL UIElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL UIElementWrapperBase::update() throw (::com::sun::star::uno::RuntimeException, std::exception) { // can be implemented by derived class } @@ -147,7 +147,7 @@ sal_Bool SAL_CALL UIElementWrapperBase::convertFastPropertyValue( Any& /*a } void SAL_CALL UIElementWrapperBase::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/ , - const com::sun::star::uno::Any& /*aValue*/ ) throw( com::sun::star::uno::Exception ) + const com::sun::star::uno::Any& /*aValue*/ ) throw( com::sun::star::uno::Exception, std::exception ) { } @@ -195,7 +195,7 @@ void SAL_CALL UIElementWrapperBase::getFastPropertyValue( com::sun::star::uno::A return(*pInfoHelper); } -com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException) +com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL UIElementWrapperBase::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 4a2b2b2422f9..3e66b5dc87b4 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -51,7 +51,7 @@ VCLStatusIndicator::~VCLStatusIndicator() void SAL_CALL VCLStatusIndicator::start(const OUString& sText , sal_Int32 nRange) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- ReadGuard aReadLock(m_aLock); @@ -91,7 +91,7 @@ void SAL_CALL VCLStatusIndicator::start(const OUString& sText , void SAL_CALL VCLStatusIndicator::reset() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SOLAR SAFE -> ---------------------------- SolarMutexGuard aSolarGuard; @@ -105,7 +105,7 @@ void SAL_CALL VCLStatusIndicator::reset() void SAL_CALL VCLStatusIndicator::end() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); @@ -132,7 +132,7 @@ void SAL_CALL VCLStatusIndicator::end() void SAL_CALL VCLStatusIndicator::setText(const OUString& sText) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); @@ -151,7 +151,7 @@ void SAL_CALL VCLStatusIndicator::setText(const OUString& sText) void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- WriteGuard aWriteLock(m_aLock); |