From 5e21a413c788f839a66d9e4c14e745ed18058db8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 25 Feb 2014 21:31:58 +0100 Subject: cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3 --- stoc/source/defaultregistry/defaultregistry.cxx | 184 ++++++++++++------------ 1 file changed, 92 insertions(+), 92 deletions(-) (limited to 'stoc/source/defaultregistry') diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index a1cb23112b42..2fae85a80f99 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -56,28 +56,28 @@ public: ~NestedRegistryImpl(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception); // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) - throw(Exception, RuntimeException); + throw(Exception, RuntimeException, std::exception); // XSimpleRegistry - virtual OUString SAL_CALL getURL() throw(RuntimeException); - virtual void SAL_CALL open( const OUString& rURL, sal_Bool bReadOnly, sal_Bool bCreate ) throw(InvalidRegistryException, RuntimeException); - virtual sal_Bool SAL_CALL isValid( ) throw(RuntimeException); - virtual void SAL_CALL close( ) throw(InvalidRegistryException, RuntimeException); - virtual void SAL_CALL destroy( ) throw(InvalidRegistryException, RuntimeException); - virtual Reference< XRegistryKey > SAL_CALL getRootKey( ) throw(InvalidRegistryException, RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw(InvalidRegistryException, RuntimeException); - virtual void SAL_CALL mergeKey( const OUString& aKeyName, const OUString& aUrl ) throw(InvalidRegistryException, MergeConflictException, RuntimeException); + virtual OUString SAL_CALL getURL() throw(RuntimeException, std::exception); + virtual void SAL_CALL open( const OUString& rURL, sal_Bool bReadOnly, sal_Bool bCreate ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isValid( ) throw(RuntimeException, std::exception); + virtual void SAL_CALL close( ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual void SAL_CALL destroy( ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual Reference< XRegistryKey > SAL_CALL getRootKey( ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual void SAL_CALL mergeKey( const OUString& aKeyName, const OUString& aUrl ) throw(InvalidRegistryException, MergeConflictException, RuntimeException, std::exception); // XEnumerationAccess - virtual Reference< XEnumeration > SAL_CALL createEnumeration( ) throw (RuntimeException); - virtual Type SAL_CALL getElementType( ) throw (RuntimeException); - virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException); + virtual Reference< XEnumeration > SAL_CALL createEnumeration( ) throw (RuntimeException, std::exception); + virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception); friend class NestedKeyImpl; protected: @@ -104,35 +104,35 @@ public: ~NestedKeyImpl(); // XRegistryKey - virtual OUString SAL_CALL getKeyName() throw(RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw(InvalidRegistryException, RuntimeException); - virtual sal_Bool SAL_CALL isValid( ) throw(RuntimeException); - virtual RegistryKeyType SAL_CALL getKeyType( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException); - virtual RegistryValueType SAL_CALL getValueType( ) throw(InvalidRegistryException, RuntimeException); - virtual sal_Int32 SAL_CALL getLongValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException); - virtual void SAL_CALL setLongValue( sal_Int32 value ) throw(InvalidRegistryException, RuntimeException); - virtual Sequence< sal_Int32 > SAL_CALL getLongListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException); - virtual void SAL_CALL setLongListValue( const ::com::sun::star::uno::Sequence< sal_Int32 >& seqValue ) throw(InvalidRegistryException, RuntimeException); - virtual OUString SAL_CALL getAsciiValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException); - virtual void SAL_CALL setAsciiValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException); - virtual Sequence< OUString > SAL_CALL getAsciiListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException); - virtual void SAL_CALL setAsciiListValue( const ::com::sun::star::uno::Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException); - virtual OUString SAL_CALL getStringValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException); - virtual void SAL_CALL setStringValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException); - virtual Sequence< OUString > SAL_CALL getStringListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException); - virtual void SAL_CALL setStringListValue( const ::com::sun::star::uno::Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException); - virtual Sequence< sal_Int8 > SAL_CALL getBinaryValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException); - virtual void SAL_CALL setBinaryValue( const ::com::sun::star::uno::Sequence< sal_Int8 >& value ) throw(InvalidRegistryException, RuntimeException); - virtual Reference< XRegistryKey > SAL_CALL openKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException); - virtual Reference< XRegistryKey > SAL_CALL createKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException); - virtual void SAL_CALL closeKey( ) throw(InvalidRegistryException, RuntimeException); - virtual void SAL_CALL deleteKey( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException); - virtual Sequence< Reference< XRegistryKey > > SAL_CALL openKeys( ) throw(InvalidRegistryException, RuntimeException); - virtual Sequence< OUString > SAL_CALL getKeyNames( ) throw(InvalidRegistryException, RuntimeException); - virtual sal_Bool SAL_CALL createLink( const OUString& aLinkName, const OUString& aLinkTarget ) throw(InvalidRegistryException, RuntimeException); - virtual void SAL_CALL deleteLink( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException); - virtual OUString SAL_CALL getLinkTarget( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException); - virtual OUString SAL_CALL getResolvedName( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException); + virtual OUString SAL_CALL getKeyName() throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isValid( ) throw(RuntimeException, std::exception); + virtual RegistryKeyType SAL_CALL getKeyType( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual RegistryValueType SAL_CALL getValueType( ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getLongValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception); + virtual void SAL_CALL setLongValue( sal_Int32 value ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual Sequence< sal_Int32 > SAL_CALL getLongListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception); + virtual void SAL_CALL setLongListValue( const ::com::sun::star::uno::Sequence< sal_Int32 >& seqValue ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual OUString SAL_CALL getAsciiValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception); + virtual void SAL_CALL setAsciiValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getAsciiListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception); + virtual void SAL_CALL setAsciiListValue( const ::com::sun::star::uno::Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual OUString SAL_CALL getStringValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception); + virtual void SAL_CALL setStringValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getStringListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception); + virtual void SAL_CALL setStringListValue( const ::com::sun::star::uno::Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual Sequence< sal_Int8 > SAL_CALL getBinaryValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception); + virtual void SAL_CALL setBinaryValue( const ::com::sun::star::uno::Sequence< sal_Int8 >& value ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual Reference< XRegistryKey > SAL_CALL openKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual Reference< XRegistryKey > SAL_CALL createKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual void SAL_CALL closeKey( ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual void SAL_CALL deleteKey( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual Sequence< Reference< XRegistryKey > > SAL_CALL openKeys( ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getKeyNames( ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual sal_Bool SAL_CALL createLink( const OUString& aLinkName, const OUString& aLinkTarget ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual void SAL_CALL deleteLink( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual OUString SAL_CALL getLinkTarget( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException, std::exception); + virtual OUString SAL_CALL getResolvedName( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception); protected: void computeChanges(); @@ -271,7 +271,7 @@ OUString NestedKeyImpl::computeName(const OUString& name) } -OUString SAL_CALL NestedKeyImpl::getKeyName() throw(RuntimeException) +OUString SAL_CALL NestedKeyImpl::getKeyName() throw(RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); return m_name; @@ -279,7 +279,7 @@ OUString SAL_CALL NestedKeyImpl::getKeyName() throw(RuntimeException) sal_Bool SAL_CALL NestedKeyImpl::isReadOnly( ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -291,7 +291,7 @@ sal_Bool SAL_CALL NestedKeyImpl::isReadOnly( ) } -sal_Bool SAL_CALL NestedKeyImpl::isValid( ) throw(RuntimeException) +sal_Bool SAL_CALL NestedKeyImpl::isValid( ) throw(RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); return ((m_localKey.is() && m_localKey->isValid()) || @@ -300,7 +300,7 @@ sal_Bool SAL_CALL NestedKeyImpl::isValid( ) throw(RuntimeException) RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const OUString& rKeyName ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -319,7 +319,7 @@ RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const OUString& rKeyName ) RegistryValueType SAL_CALL NestedKeyImpl::getValueType( ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -338,7 +338,7 @@ RegistryValueType SAL_CALL NestedKeyImpl::getValueType( ) sal_Int32 SAL_CALL NestedKeyImpl::getLongValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException) + throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -359,7 +359,7 @@ sal_Int32 SAL_CALL NestedKeyImpl::getLongValue( ) void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32 value ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -383,7 +383,7 @@ void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32 value ) Sequence< sal_Int32 > SAL_CALL NestedKeyImpl::getLongListValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException) + throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -404,7 +404,7 @@ Sequence< sal_Int32 > SAL_CALL NestedKeyImpl::getLongListValue( ) void SAL_CALL NestedKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqValue ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -428,7 +428,7 @@ void SAL_CALL NestedKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqV OUString SAL_CALL NestedKeyImpl::getAsciiValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException) + throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -449,7 +449,7 @@ OUString SAL_CALL NestedKeyImpl::getAsciiValue( ) void SAL_CALL NestedKeyImpl::setAsciiValue( const OUString& value ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -473,7 +473,7 @@ void SAL_CALL NestedKeyImpl::setAsciiValue( const OUString& value ) Sequence< OUString > SAL_CALL NestedKeyImpl::getAsciiListValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException) + throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -494,7 +494,7 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getAsciiListValue( ) void SAL_CALL NestedKeyImpl::setAsciiListValue( const Sequence< OUString >& seqValue ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -518,7 +518,7 @@ void SAL_CALL NestedKeyImpl::setAsciiListValue( const Sequence< OUString >& seqV OUString SAL_CALL NestedKeyImpl::getStringValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException) + throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -539,7 +539,7 @@ OUString SAL_CALL NestedKeyImpl::getStringValue( ) void SAL_CALL NestedKeyImpl::setStringValue( const OUString& value ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -563,7 +563,7 @@ void SAL_CALL NestedKeyImpl::setStringValue( const OUString& value ) Sequence< OUString > SAL_CALL NestedKeyImpl::getStringListValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException) + throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -584,7 +584,7 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getStringListValue( ) void SAL_CALL NestedKeyImpl::setStringListValue( const Sequence< OUString >& seqValue ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -608,7 +608,7 @@ void SAL_CALL NestedKeyImpl::setStringListValue( const Sequence< OUString >& seq Sequence< sal_Int8 > SAL_CALL NestedKeyImpl::getBinaryValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException) + throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -629,7 +629,7 @@ Sequence< sal_Int8 > SAL_CALL NestedKeyImpl::getBinaryValue( ) void SAL_CALL NestedKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); computeChanges(); @@ -653,7 +653,7 @@ void SAL_CALL NestedKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value ) Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyName ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -689,7 +689,7 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyN Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKeyName ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); if ( (!m_localKey.is() && !m_defaultKey.is()) || @@ -747,7 +747,7 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKe void SAL_CALL NestedKeyImpl::closeKey( ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); if ( m_localKey.is() && m_localKey->isValid() ) @@ -762,7 +762,7 @@ void SAL_CALL NestedKeyImpl::closeKey( ) void SAL_CALL NestedKeyImpl::deleteKey( const OUString& rKeyName ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); if ( m_localKey.is() && m_localKey->isValid() && @@ -785,7 +785,7 @@ void SAL_CALL NestedKeyImpl::deleteKey( const OUString& rKeyName ) Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys( ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -865,7 +865,7 @@ Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys( ) Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames( ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -932,7 +932,7 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames( ) sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OUString& aLinkTarget ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); @@ -990,7 +990,7 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OU void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -1036,7 +1036,7 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName ) OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -1090,7 +1090,7 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName ) OUString SAL_CALL NestedKeyImpl::getResolvedName( const OUString& aKeyName ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_pRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -1129,21 +1129,21 @@ public: : m_xReg1( r1 ) , m_xReg2( r2 ) {} public: - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (RuntimeException); - virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException); + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception); private: Reference< XSimpleRegistry > m_xReg1; Reference< XSimpleRegistry > m_xReg2; }; -sal_Bool RegistryEnumueration::hasMoreElements( ) throw (RuntimeException) +sal_Bool RegistryEnumueration::hasMoreElements( ) throw (RuntimeException, std::exception) { return m_xReg1.is() || m_xReg2.is(); } Any RegistryEnumueration::nextElement( ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException) + throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { Any a; if( m_xReg1.is() ) @@ -1165,18 +1165,18 @@ Any RegistryEnumueration::nextElement( ) } -Reference< XEnumeration > NestedRegistryImpl::createEnumeration( ) throw (RuntimeException) +Reference< XEnumeration > NestedRegistryImpl::createEnumeration( ) throw (RuntimeException, std::exception) { MutexGuard guard( m_mutex ); return new RegistryEnumueration( m_localReg, m_defaultReg ); } -Type NestedRegistryImpl::getElementType( ) throw (RuntimeException) +Type NestedRegistryImpl::getElementType( ) throw (RuntimeException, std::exception) { return getCppuType( &m_localReg ); } -sal_Bool SAL_CALL NestedRegistryImpl::hasElements( ) throw (RuntimeException) +sal_Bool SAL_CALL NestedRegistryImpl::hasElements( ) throw (RuntimeException, std::exception) { MutexGuard guard( m_mutex ); return m_localReg.is() || m_defaultReg.is(); @@ -1186,19 +1186,19 @@ sal_Bool SAL_CALL NestedRegistryImpl::hasElements( ) throw (RuntimeException) OUString SAL_CALL NestedRegistryImpl::getImplementationName( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return OUString("com.sun.star.comp.stoc.NestedRegistry"); } sal_Bool SAL_CALL NestedRegistryImpl::supportsService( const OUString& ServiceName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence SAL_CALL NestedRegistryImpl::getSupportedServiceNames( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { Sequence< OUString > seqNames(1); seqNames[0] = "com.sun.star.registry.NestedRegistry"; @@ -1207,7 +1207,7 @@ Sequence SAL_CALL NestedRegistryImpl::getSupportedServiceNames( ) void SAL_CALL NestedRegistryImpl::initialize( const Sequence< Any >& aArguments ) - throw( Exception, RuntimeException ) + throw( Exception, RuntimeException, std::exception ) { Guard< Mutex > aGuard( m_mutex ); if ( (aArguments.getLength() == 2) && @@ -1222,7 +1222,7 @@ void SAL_CALL NestedRegistryImpl::initialize( const Sequence< Any >& aArguments } -OUString SAL_CALL NestedRegistryImpl::getURL() throw(RuntimeException) +OUString SAL_CALL NestedRegistryImpl::getURL() throw(RuntimeException, std::exception) { Guard< Mutex > aGuard( m_mutex ); try @@ -1239,7 +1239,7 @@ OUString SAL_CALL NestedRegistryImpl::getURL() throw(RuntimeException) void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { throw InvalidRegistryException( OUString("the 'open' method is not specified for a nested registry"), @@ -1247,7 +1247,7 @@ void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool ) } -sal_Bool SAL_CALL NestedRegistryImpl::isValid( ) throw(RuntimeException) +sal_Bool SAL_CALL NestedRegistryImpl::isValid( ) throw(RuntimeException, std::exception) { Guard< Mutex > aGuard( m_mutex ); try @@ -1265,7 +1265,7 @@ sal_Bool SAL_CALL NestedRegistryImpl::isValid( ) throw(RuntimeException) void SAL_CALL NestedRegistryImpl::close( ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_mutex ); if ( m_localReg.is() && m_localReg->isValid() ) @@ -1280,7 +1280,7 @@ void SAL_CALL NestedRegistryImpl::close( ) void SAL_CALL NestedRegistryImpl::destroy( ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { throw InvalidRegistryException( OUString("the 'destroy' method is not specified for a nested registry"), @@ -1289,7 +1289,7 @@ void SAL_CALL NestedRegistryImpl::destroy( ) Reference< XRegistryKey > SAL_CALL NestedRegistryImpl::getRootKey( ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Reference tmpKey; @@ -1320,7 +1320,7 @@ Reference< XRegistryKey > SAL_CALL NestedRegistryImpl::getRootKey( ) sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly( ) - throw(InvalidRegistryException, RuntimeException) + throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_mutex ); try @@ -1337,7 +1337,7 @@ sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly( ) void SAL_CALL NestedRegistryImpl::mergeKey( const OUString& aKeyName, const OUString& aUrl ) - throw(InvalidRegistryException, MergeConflictException, RuntimeException) + throw(InvalidRegistryException, MergeConflictException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_mutex ); if ( m_localReg.is() && m_localReg->isValid() ) -- cgit