diff options
Diffstat (limited to 'stoc/source/defaultregistry/defaultregistry.cxx')
| -rw-r--r-- | stoc/source/defaultregistry/defaultregistry.cxx | 147 |
1 files changed, 54 insertions, 93 deletions
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index 75ee807f335b..4f3069904ce0 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -53,28 +53,27 @@ public: NestedRegistryImpl( ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) - throw(Exception, RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override; // XSimpleRegistry - virtual OUString SAL_CALL getURL() throw(RuntimeException, std::exception) override; - virtual void SAL_CALL open( const OUString& rURL, sal_Bool bReadOnly, sal_Bool bCreate ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isValid( ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL close( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual void SAL_CALL destroy( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Reference< XRegistryKey > SAL_CALL getRootKey( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual void SAL_CALL mergeKey( const OUString& aKeyName, const OUString& aUrl ) throw(InvalidRegistryException, MergeConflictException, RuntimeException, std::exception) override; + virtual OUString SAL_CALL getURL() override; + virtual void SAL_CALL open( const OUString& rURL, sal_Bool bReadOnly, sal_Bool bCreate ) override; + virtual sal_Bool SAL_CALL isValid( ) override; + virtual void SAL_CALL close( ) override; + virtual void SAL_CALL destroy( ) override; + virtual Reference< XRegistryKey > SAL_CALL getRootKey( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL mergeKey( const OUString& aKeyName, const OUString& aUrl ) override; // XEnumerationAccess - virtual Reference< XEnumeration > SAL_CALL createEnumeration( ) throw (RuntimeException, std::exception) override; - virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) override; + virtual Reference< XEnumeration > SAL_CALL createEnumeration( ) override; + virtual Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; friend class NestedKeyImpl; protected: @@ -99,35 +98,35 @@ public: NestedKeyImpl* pKey); // XRegistryKey - virtual OUString SAL_CALL getKeyName() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isValid( ) throw(RuntimeException, std::exception) override; - virtual RegistryKeyType SAL_CALL getKeyType( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual RegistryValueType SAL_CALL getValueType( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getLongValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setLongValue( sal_Int32 value ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Sequence< sal_Int32 > SAL_CALL getLongListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setLongListValue( const css::uno::Sequence< sal_Int32 >& seqValue ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAsciiValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setAsciiValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getAsciiListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setAsciiListValue( const css::uno::Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual OUString SAL_CALL getStringValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setStringValue( const OUString& value ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getStringListValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setStringListValue( const css::uno::Sequence< OUString >& seqValue ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Sequence< sal_Int8 > SAL_CALL getBinaryValue( ) throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryValue( const css::uno::Sequence< sal_Int8 >& value ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Reference< XRegistryKey > SAL_CALL openKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Reference< XRegistryKey > SAL_CALL createKey( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual void SAL_CALL closeKey( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual void SAL_CALL deleteKey( const OUString& rKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Sequence< Reference< XRegistryKey > > SAL_CALL openKeys( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getKeyNames( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL createLink( const OUString& aLinkName, const OUString& aLinkTarget ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual void SAL_CALL deleteLink( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLinkTarget( const OUString& rLinkName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; - virtual OUString SAL_CALL getResolvedName( const OUString& aKeyName ) throw(InvalidRegistryException, RuntimeException, std::exception) override; + virtual OUString SAL_CALL getKeyName() override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL isValid( ) override; + virtual RegistryKeyType SAL_CALL getKeyType( const OUString& rKeyName ) override; + virtual RegistryValueType SAL_CALL getValueType( ) override; + virtual sal_Int32 SAL_CALL getLongValue( ) override; + virtual void SAL_CALL setLongValue( sal_Int32 value ) override; + virtual Sequence< sal_Int32 > SAL_CALL getLongListValue( ) override; + virtual void SAL_CALL setLongListValue( const css::uno::Sequence< sal_Int32 >& seqValue ) override; + virtual OUString SAL_CALL getAsciiValue( ) override; + virtual void SAL_CALL setAsciiValue( const OUString& value ) override; + virtual Sequence< OUString > SAL_CALL getAsciiListValue( ) override; + virtual void SAL_CALL setAsciiListValue( const css::uno::Sequence< OUString >& seqValue ) override; + virtual OUString SAL_CALL getStringValue( ) override; + virtual void SAL_CALL setStringValue( const OUString& value ) override; + virtual Sequence< OUString > SAL_CALL getStringListValue( ) override; + virtual void SAL_CALL setStringListValue( const css::uno::Sequence< OUString >& seqValue ) override; + virtual Sequence< sal_Int8 > SAL_CALL getBinaryValue( ) override; + virtual void SAL_CALL setBinaryValue( const css::uno::Sequence< sal_Int8 >& value ) override; + virtual Reference< XRegistryKey > SAL_CALL openKey( const OUString& aKeyName ) override; + virtual Reference< XRegistryKey > SAL_CALL createKey( const OUString& aKeyName ) override; + virtual void SAL_CALL closeKey( ) override; + virtual void SAL_CALL deleteKey( const OUString& rKeyName ) override; + virtual Sequence< Reference< XRegistryKey > > SAL_CALL openKeys( ) override; + virtual Sequence< OUString > SAL_CALL getKeyNames( ) override; + virtual sal_Bool SAL_CALL createLink( const OUString& aLinkName, const OUString& aLinkTarget ) override; + virtual void SAL_CALL deleteLink( const OUString& rLinkName ) override; + virtual OUString SAL_CALL getLinkTarget( const OUString& rLinkName ) override; + virtual OUString SAL_CALL getResolvedName( const OUString& aKeyName ) override; protected: void computeChanges(); @@ -253,7 +252,7 @@ OUString NestedKeyImpl::computeName(const OUString& name) } -OUString SAL_CALL NestedKeyImpl::getKeyName() throw(RuntimeException, std::exception) +OUString SAL_CALL NestedKeyImpl::getKeyName() { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); return m_name; @@ -261,7 +260,6 @@ OUString SAL_CALL NestedKeyImpl::getKeyName() throw(RuntimeException, std::excep sal_Bool SAL_CALL NestedKeyImpl::isReadOnly( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -273,7 +271,7 @@ sal_Bool SAL_CALL NestedKeyImpl::isReadOnly( ) } -sal_Bool SAL_CALL NestedKeyImpl::isValid( ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL NestedKeyImpl::isValid( ) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); return ((m_localKey.is() && m_localKey->isValid()) || @@ -282,7 +280,6 @@ sal_Bool SAL_CALL NestedKeyImpl::isValid( ) throw(RuntimeException, std::except RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const OUString& rKeyName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -301,7 +298,6 @@ RegistryKeyType SAL_CALL NestedKeyImpl::getKeyType( const OUString& rKeyName ) RegistryValueType SAL_CALL NestedKeyImpl::getValueType( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -320,7 +316,6 @@ RegistryValueType SAL_CALL NestedKeyImpl::getValueType( ) sal_Int32 SAL_CALL NestedKeyImpl::getLongValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -341,7 +336,6 @@ sal_Int32 SAL_CALL NestedKeyImpl::getLongValue( ) void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32 value ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -365,7 +359,6 @@ void SAL_CALL NestedKeyImpl::setLongValue( sal_Int32 value ) Sequence< sal_Int32 > SAL_CALL NestedKeyImpl::getLongListValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -386,7 +379,6 @@ Sequence< sal_Int32 > SAL_CALL NestedKeyImpl::getLongListValue( ) void SAL_CALL NestedKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqValue ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -410,7 +402,6 @@ void SAL_CALL NestedKeyImpl::setLongListValue( const Sequence< sal_Int32 >& seqV OUString SAL_CALL NestedKeyImpl::getAsciiValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -431,7 +422,6 @@ OUString SAL_CALL NestedKeyImpl::getAsciiValue( ) void SAL_CALL NestedKeyImpl::setAsciiValue( const OUString& value ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -455,7 +445,6 @@ void SAL_CALL NestedKeyImpl::setAsciiValue( const OUString& value ) Sequence< OUString > SAL_CALL NestedKeyImpl::getAsciiListValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -476,7 +465,6 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getAsciiListValue( ) void SAL_CALL NestedKeyImpl::setAsciiListValue( const Sequence< OUString >& seqValue ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -500,7 +488,6 @@ void SAL_CALL NestedKeyImpl::setAsciiListValue( const Sequence< OUString >& seqV OUString SAL_CALL NestedKeyImpl::getStringValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -521,7 +508,6 @@ OUString SAL_CALL NestedKeyImpl::getStringValue( ) void SAL_CALL NestedKeyImpl::setStringValue( const OUString& value ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -545,7 +531,6 @@ void SAL_CALL NestedKeyImpl::setStringValue( const OUString& value ) Sequence< OUString > SAL_CALL NestedKeyImpl::getStringListValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -566,7 +551,6 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getStringListValue( ) void SAL_CALL NestedKeyImpl::setStringListValue( const Sequence< OUString >& seqValue ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -590,7 +574,6 @@ void SAL_CALL NestedKeyImpl::setStringListValue( const Sequence< OUString >& seq Sequence< sal_Int8 > SAL_CALL NestedKeyImpl::getBinaryValue( ) - throw(InvalidRegistryException, InvalidValueException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -611,7 +594,6 @@ Sequence< sal_Int8 > SAL_CALL NestedKeyImpl::getBinaryValue( ) void SAL_CALL NestedKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); computeChanges(); @@ -635,7 +617,6 @@ void SAL_CALL NestedKeyImpl::setBinaryValue( const Sequence< sal_Int8 >& value ) Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -671,7 +652,6 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::openKey( const OUString& aKeyN Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKeyName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( (!m_localKey.is() && !m_defaultKey.is()) || @@ -729,7 +709,6 @@ Reference< XRegistryKey > SAL_CALL NestedKeyImpl::createKey( const OUString& aKe void SAL_CALL NestedKeyImpl::closeKey( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( m_localKey.is() && m_localKey->isValid() ) @@ -744,7 +723,6 @@ void SAL_CALL NestedKeyImpl::closeKey( ) void SAL_CALL NestedKeyImpl::deleteKey( const OUString& rKeyName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( m_localKey.is() && m_localKey->isValid() && @@ -767,7 +745,6 @@ void SAL_CALL NestedKeyImpl::deleteKey( const OUString& rKeyName ) Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -846,7 +823,6 @@ Sequence< Reference< XRegistryKey > > SAL_CALL NestedKeyImpl::openKeys( ) Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -912,7 +888,6 @@ Sequence< OUString > SAL_CALL NestedKeyImpl::getKeyNames( ) sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OUString& aLinkTarget ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); @@ -970,7 +945,6 @@ sal_Bool SAL_CALL NestedKeyImpl::createLink( const OUString& aLinkName, const OU void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -1016,7 +990,6 @@ void SAL_CALL NestedKeyImpl::deleteLink( const OUString& rLinkName ) OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -1070,7 +1043,6 @@ OUString SAL_CALL NestedKeyImpl::getLinkTarget( const OUString& rLinkName ) OUString SAL_CALL NestedKeyImpl::getResolvedName( const OUString& aKeyName ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); if ( !m_localKey.is() && !m_defaultKey.is() ) @@ -1105,21 +1077,20 @@ public: : m_xReg1( r1 ) , m_xReg2( r2 ) {} public: - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements( ) override; + virtual Any SAL_CALL nextElement( ) override; private: Reference< XSimpleRegistry > m_xReg1; Reference< XSimpleRegistry > m_xReg2; }; -sal_Bool RegistryEnumueration::hasMoreElements( ) throw (RuntimeException, std::exception) +sal_Bool RegistryEnumueration::hasMoreElements( ) { return m_xReg1.is() || m_xReg2.is(); } Any RegistryEnumueration::nextElement( ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { Any a; if( m_xReg1.is() ) @@ -1140,18 +1111,18 @@ Any RegistryEnumueration::nextElement( ) } -Reference< XEnumeration > NestedRegistryImpl::createEnumeration( ) throw (RuntimeException, std::exception) +Reference< XEnumeration > NestedRegistryImpl::createEnumeration( ) { MutexGuard guard( m_mutex ); return new RegistryEnumueration( m_localReg, m_defaultReg ); } -Type NestedRegistryImpl::getElementType( ) throw (RuntimeException, std::exception) +Type NestedRegistryImpl::getElementType( ) { return cppu::UnoType<decltype(m_localReg)>::get(); } -sal_Bool SAL_CALL NestedRegistryImpl::hasElements( ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL NestedRegistryImpl::hasElements( ) { MutexGuard guard( m_mutex ); return m_localReg.is() || m_defaultReg.is(); @@ -1159,19 +1130,16 @@ sal_Bool SAL_CALL NestedRegistryImpl::hasElements( ) throw (RuntimeException, s OUString SAL_CALL NestedRegistryImpl::getImplementationName( ) - throw(RuntimeException, std::exception) { return OUString("com.sun.star.comp.stoc.NestedRegistry"); } sal_Bool SAL_CALL NestedRegistryImpl::supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence<OUString> SAL_CALL NestedRegistryImpl::getSupportedServiceNames( ) - throw(RuntimeException, std::exception) { Sequence< OUString > seqNames { "com.sun.star.registry.NestedRegistry" }; return seqNames; @@ -1179,7 +1147,6 @@ Sequence<OUString> SAL_CALL NestedRegistryImpl::getSupportedServiceNames( ) void SAL_CALL NestedRegistryImpl::initialize( const Sequence< Any >& aArguments ) - throw( Exception, RuntimeException, std::exception ) { Guard< Mutex > aGuard( m_mutex ); if ( (aArguments.getLength() == 2) && @@ -1194,7 +1161,7 @@ void SAL_CALL NestedRegistryImpl::initialize( const Sequence< Any >& aArguments } -OUString SAL_CALL NestedRegistryImpl::getURL() throw(RuntimeException, std::exception) +OUString SAL_CALL NestedRegistryImpl::getURL() { Guard< Mutex > aGuard( m_mutex ); try @@ -1211,14 +1178,13 @@ OUString SAL_CALL NestedRegistryImpl::getURL() throw(RuntimeException, std::exce void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool ) - throw(InvalidRegistryException, RuntimeException, std::exception) { throw InvalidRegistryException( "the 'open' method is not specified for a nested registry" ); } -sal_Bool SAL_CALL NestedRegistryImpl::isValid( ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL NestedRegistryImpl::isValid( ) { Guard< Mutex > aGuard( m_mutex ); try @@ -1236,7 +1202,6 @@ sal_Bool SAL_CALL NestedRegistryImpl::isValid( ) throw(RuntimeException, std::e void SAL_CALL NestedRegistryImpl::close( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_mutex ); if ( m_localReg.is() && m_localReg->isValid() ) @@ -1251,7 +1216,6 @@ void SAL_CALL NestedRegistryImpl::close( ) void SAL_CALL NestedRegistryImpl::destroy( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { throw InvalidRegistryException( "the 'destroy' method is not specified for a nested registry" ); @@ -1259,7 +1223,6 @@ void SAL_CALL NestedRegistryImpl::destroy( ) Reference< XRegistryKey > SAL_CALL NestedRegistryImpl::getRootKey( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Reference<XRegistryKey> tmpKey; @@ -1290,7 +1253,6 @@ Reference< XRegistryKey > SAL_CALL NestedRegistryImpl::getRootKey( ) sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly( ) - throw(InvalidRegistryException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_mutex ); try @@ -1307,7 +1269,6 @@ sal_Bool SAL_CALL NestedRegistryImpl::isReadOnly( ) void SAL_CALL NestedRegistryImpl::mergeKey( const OUString& aKeyName, const OUString& aUrl ) - throw(InvalidRegistryException, MergeConflictException, RuntimeException, std::exception) { Guard< Mutex > aGuard( m_mutex ); if ( m_localReg.is() && m_localReg->isValid() ) |