diff options
Diffstat (limited to 'framework/source/fwi')
-rw-r--r-- | framework/source/fwi/classes/propertysethelper.cxx | 20 | ||||
-rw-r--r-- | framework/source/fwi/uielement/constitemcontainer.cxx | 38 | ||||
-rw-r--r-- | framework/source/fwi/uielement/itemcontainer.cxx | 12 | ||||
-rw-r--r-- | framework/source/fwi/uielement/rootitemcontainer.cxx | 26 |
4 files changed, 48 insertions, 48 deletions
diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx index c0805ffd7274..dc11383da943 100644 --- a/framework/source/fwi/classes/propertysethelper.cxx +++ b/framework/source/fwi/classes/propertysethelper.cxx @@ -173,7 +173,7 @@ void PropertySetHelper::impl_notifyChangeListener(const css::beans::PropertyChan css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); @@ -188,7 +188,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, css::beans::PropertyVetoException , css::lang::IllegalArgumentException , css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { // TODO look for e.g. readonly props and reject setProp() call! @@ -251,7 +251,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty, css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProperty) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); @@ -275,7 +275,7 @@ void SAL_CALL PropertySetHelper::addPropertyChangeListener(const OUString& const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); @@ -297,7 +297,7 @@ void SAL_CALL PropertySetHelper::removePropertyChangeListener(const OUString& const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS); @@ -319,7 +319,7 @@ void SAL_CALL PropertySetHelper::addVetoableChangeListener(const OUString& const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); @@ -341,7 +341,7 @@ void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString& const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException , - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS); @@ -360,7 +360,7 @@ void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString& css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProperties() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); @@ -385,7 +385,7 @@ css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProper css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUString& sName) throw(css::beans::UnknownPropertyException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); @@ -402,7 +402,7 @@ css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUStrin sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const OUString& sName) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { TransactionGuard aTransaction(m_rTransactionManager, E_HARDEXCEPTIONS); diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 4d471325ede8..2c758ab172a7 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -62,9 +62,9 @@ public: OPropertySetHelperInfo_Impl( IPropertyArrayHelper & rHelper_ ) SAL_THROW(()); // XPropertySetInfo-Methoden - virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException); - virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException); + virtual Sequence< Property > SAL_CALL getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual Property SAL_CALL getPropertyByName(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& PropertyName) throw(::com::sun::star::uno::RuntimeException, std::exception); }; @@ -81,7 +81,7 @@ OPropertySetHelperInfo_Impl::OPropertySetHelperInfo_Impl( /** * Return the sequence of properties, which are provided throug the constructor. */ -Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::com::sun::star::uno::RuntimeException) +Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::com::sun::star::uno::RuntimeException, std::exception) { return aInfos; } @@ -89,7 +89,7 @@ Sequence< Property > OPropertySetHelperInfo_Impl::getProperties(void) throw(::co /** * Return the sequence of properties, which are provided throug the constructor. */ -Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { Property * pR; pR = (Property *)bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(), @@ -105,7 +105,7 @@ Property OPropertySetHelperInfo_Impl::getPropertyByName( const OUString & Proper /** * Return the sequence of properties, which are provided throug the constructor. */ -sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool OPropertySetHelperInfo_Impl::hasPropertyByName( const OUString & PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) { Property * pR; pR = (Property *)bsearch( &PropertyName, aInfos.getConstArray(), aInfos.getLength(), @@ -235,7 +235,7 @@ Reference< XIndexAccess > ConstItemContainer::deepCopyContainer( const Reference } // XUnoTunnel -sal_Int64 ConstItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException) +sal_Int64 ConstItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) { if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( ConstItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) { @@ -263,20 +263,20 @@ ConstItemContainer* ConstItemContainer::GetImplementation( const ::com::sun::sta // XElementAccess sal_Bool SAL_CALL ConstItemContainer::hasElements() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return ( !m_aItemVector.empty() ); } // XIndexAccess sal_Int32 SAL_CALL ConstItemContainer::getCount() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { return m_aItemVector.size(); } Any SAL_CALL ConstItemContainer::getByIndex( sal_Int32 Index ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { if ( sal_Int32( m_aItemVector.size()) > Index ) return makeAny( m_aItemVector[Index] ); @@ -286,7 +286,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) // XPropertySet Reference< XPropertySetInfo > SAL_CALL ConstItemContainer::getPropertySetInfo() -throw (::com::sun::star::uno::RuntimeException) +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! @@ -311,12 +311,12 @@ throw (::com::sun::star::uno::RuntimeException) } void SAL_CALL ConstItemContainer::setPropertyValue( const OUString&, const Any& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } Any SAL_CALL ConstItemContainer::getPropertyValue( const OUString& PropertyName ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { if ( PropertyName == PROPNAME_UINAME ) return makeAny( m_aUIName ); @@ -325,36 +325,36 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang } void SAL_CALL ConstItemContainer::addPropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } void SAL_CALL ConstItemContainer::removePropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { // Only read-only properties - do nothing } void SAL_CALL ConstItemContainer::addVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { // Only read-only properties - do nothing } void SAL_CALL ConstItemContainer::removeVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { // Only read-only properties - do nothing } // XFastPropertySet void SAL_CALL ConstItemContainer::setFastPropertyValue( sal_Int32, const ::com::sun::star::uno::Any& ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } Any SAL_CALL ConstItemContainer::getFastPropertyValue( sal_Int32 nHandle ) -throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { if ( nHandle == PROPHANDLE_UINAME ) return makeAny( m_aUIName ); diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx index 2f9cce58a671..154c2432cf91 100644 --- a/framework/source/fwi/uielement/itemcontainer.cxx +++ b/framework/source/fwi/uielement/itemcontainer.cxx @@ -152,7 +152,7 @@ ItemContainer* ItemContainer::GetImplementation( const ::com::sun::star::uno::Re // XElementAccess sal_Bool SAL_CALL ItemContainer::hasElements() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); return ( !m_aItemVector.empty() ); @@ -160,14 +160,14 @@ throw ( RuntimeException ) // XIndexAccess sal_Int32 SAL_CALL ItemContainer::getCount() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); return m_aItemVector.size(); } Any SAL_CALL ItemContainer::getByIndex( sal_Int32 Index ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); if ( sal_Int32( m_aItemVector.size()) > Index ) @@ -178,7 +178,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) // XIndexContainer void SAL_CALL ItemContainer::insertByIndex( sal_Int32 Index, const Any& aItem ) -throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { Sequence< PropertyValue > aSeq; if ( aItem >>= aSeq ) @@ -201,7 +201,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept } void SAL_CALL ItemContainer::removeByIndex( sal_Int32 nIndex ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); if ( (sal_Int32)m_aItemVector.size() > nIndex ) @@ -213,7 +213,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) } void SAL_CALL ItemContainer::replaceByIndex( sal_Int32 Index, const Any& aItem ) -throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { Sequence< PropertyValue > aSeq; if ( aItem >>= aSeq ) diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index 1b64c385501d..275b68d4c287 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -109,7 +109,7 @@ RootItemContainer::~RootItemContainer() { } -Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType ) throw(RuntimeException) +Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) { Any aRet = RootItemContainer_BASE::queryInterface( _rType ); if ( !aRet.hasValue() ) @@ -117,7 +117,7 @@ Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType ) throw(Runti return aRet; } -Sequence< Type > SAL_CALL RootItemContainer::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL RootItemContainer::getTypes( ) throw(RuntimeException, std::exception) { return comphelper::concatSequences( RootItemContainer_BASE::getTypes(), @@ -143,7 +143,7 @@ Reference< XIndexAccess > RootItemContainer::deepCopyContainer( const Reference< } // XUnoTunnel -sal_Int64 RootItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException) +sal_Int64 RootItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) { if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( RootItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this )); @@ -169,7 +169,7 @@ RootItemContainer* RootItemContainer::GetImplementation( const ::com::sun::star: // XElementAccess sal_Bool SAL_CALL RootItemContainer::hasElements() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); return ( !m_aItemVector.empty() ); @@ -177,14 +177,14 @@ throw ( RuntimeException ) // XIndexAccess sal_Int32 SAL_CALL RootItemContainer::getCount() -throw ( RuntimeException ) +throw ( RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); return m_aItemVector.size(); } Any SAL_CALL RootItemContainer::getByIndex( sal_Int32 Index ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); if ( sal_Int32( m_aItemVector.size()) > Index ) @@ -195,7 +195,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) // XIndexContainer void SAL_CALL RootItemContainer::insertByIndex( sal_Int32 Index, const Any& aItem ) -throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { Sequence< PropertyValue > aSeq; if ( aItem >>= aSeq ) @@ -218,7 +218,7 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept } void SAL_CALL RootItemContainer::removeByIndex( sal_Int32 nIndex ) -throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ShareGuard aLock( m_aShareMutex ); if ( (sal_Int32)m_aItemVector.size() > nIndex ) @@ -230,7 +230,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) } void SAL_CALL RootItemContainer::replaceByIndex( sal_Int32 Index, const Any& aItem ) -throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { Sequence< PropertyValue > aSeq; if ( aItem >>= aSeq ) @@ -247,13 +247,13 @@ throw ( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetExcept } Reference< XInterface > SAL_CALL RootItemContainer::createInstanceWithContext( const Reference< XComponentContext >& ) -throw ( Exception, RuntimeException) +throw ( Exception, RuntimeException, std::exception) { return (OWeakObject *)(new ItemContainer( m_aShareMutex )); } Reference< XInterface > SAL_CALL RootItemContainer::createInstanceWithArgumentsAndContext( const Sequence< Any >&, const Reference< XComponentContext >& ) -throw (Exception, RuntimeException) +throw (Exception, RuntimeException, std::exception) { return (OWeakObject *)(new ItemContainer( m_aShareMutex )); } @@ -286,7 +286,7 @@ throw( com::sun::star::lang::IllegalArgumentException ) void SAL_CALL RootItemContainer::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const com::sun::star::uno::Any& aValue ) -throw( com::sun::star::uno::Exception ) +throw( com::sun::star::uno::Exception, std::exception ) { switch( nHandle ) { @@ -334,7 +334,7 @@ void SAL_CALL RootItemContainer::getFastPropertyValue( com::sun::star::uno::Any& } com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL RootItemContainer::getPropertySetInfo() -throw (::com::sun::star::uno::RuntimeException) +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! |