diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
| commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
| tree | d4451246461346a425ad6f796e08bf1514cdd942 /svl | |
| parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) | |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'svl')
22 files changed, 363 insertions, 363 deletions
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 2c672709137d..aef358d1dfe2 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -74,28 +74,28 @@ public: css::uno::Reference< css::ucb::XContentIdentifier > const & identifier); virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL - getIdentifier() throw (css::uno::RuntimeException) { + getIdentifier() throw (css::uno::RuntimeException, std::exception) { return m_identifier; } virtual OUString SAL_CALL getContentType() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return OUString(); } virtual void SAL_CALL addContentEventListener( css::uno::Reference< css::ucb::XContentEventListener > const &) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) {} virtual void SAL_CALL removeContentEventListener( css::uno::Reference< css::ucb::XContentEventListener > const &) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) {} virtual sal_Int32 SAL_CALL createCommandIdentifier() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return 0; } @@ -105,9 +105,9 @@ public: css::uno::Reference< css::ucb::XCommandEnvironment > const &) throw ( css::uno::Exception, css::ucb::CommandAbortedException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); - virtual void SAL_CALL abort(sal_Int32) throw (css::uno::RuntimeException) {} + virtual void SAL_CALL abort(sal_Int32) throw (css::uno::RuntimeException, std::exception) {} private: static char const m_prefix[]; @@ -135,7 +135,7 @@ css::uno::Any Content::execute( css::uno::Reference< css::ucb::XCommandEnvironment > const &) throw ( css::uno::Exception, css::ucb::CommandAbortedException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { if ( command.Name != "getCasePreservingURL" ) { @@ -173,7 +173,7 @@ class Provider: public cppu::WeakImplHelper1< css::ucb::XContentProvider > { public: virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( css::uno::Reference< css::ucb::XContentIdentifier > const & identifier) - throw (css::ucb::IllegalIdentifierException, css::uno::RuntimeException) + throw (css::ucb::IllegalIdentifierException, css::uno::RuntimeException, std::exception) { return new Content(identifier); } @@ -181,7 +181,7 @@ public: virtual sal_Int32 SAL_CALL compareContentIds( css::uno::Reference< css::ucb::XContentIdentifier > const & id1, css::uno::Reference< css::ucb::XContentIdentifier > const & id2) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(id1.is() && id2.is()); return diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index 129fecac6fdf..a6d75e454328 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -75,7 +75,7 @@ void ItemHolder2::holdConfigItem(EItem eItem) } void SAL_CALL ItemHolder2::disposing(const css::lang::EventObject&) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { impl_releaseAllItems(); } diff --git a/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx index 7e8c596acc02..ec124cf04b78 100644 --- a/svl/source/config/itemholder2.hxx +++ b/svl/source/config/itemholder2.hxx @@ -43,7 +43,7 @@ class ItemHolder2 : private ItemHolderMutexBase public: virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException); + throw(css::uno::RuntimeException, std::exception); // helper private: diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index 2790b6f58537..e38541dee738 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.cxx @@ -58,7 +58,7 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::impl_staticCreateSe uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance() throw ( uno::Exception, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { OUString aTempURL; @@ -82,7 +82,7 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance() uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithArguments( const uno::Sequence< uno::Any >& aArguments ) throw ( uno::Exception, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { // The request for storage can be done with up to three arguments @@ -161,19 +161,19 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA } OUString SAL_CALL FSStorageFactory::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return impl_staticGetImplementationName(); } sal_Bool SAL_CALL FSStorageFactory::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL FSStorageFactory::getSupportedServiceNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return impl_staticGetSupportedServiceNames(); } diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index 728820375152..81713ce12f43 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -288,7 +288,7 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const // XInterface uno::Any SAL_CALL FSStorage::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Any aReturn; aReturn <<= ::cppu::queryInterface @@ -320,7 +320,7 @@ void SAL_CALL FSStorage::release() throw() // XTypeProvider uno::Sequence< uno::Type > SAL_CALL FSStorage::getTypes() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( m_pImpl->m_pTypeCollection == NULL ) { @@ -340,7 +340,7 @@ uno::Sequence< uno::Type > SAL_CALL FSStorage::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL FSStorage::getImplementationId() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { static ::cppu::OImplementationId* pID = NULL ; @@ -366,7 +366,7 @@ void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >& io::IOException, lang::IllegalArgumentException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -419,7 +419,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement( packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -529,7 +529,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openEncryptedStreamElement( packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { throw packages::NoEncryptionException(); } @@ -540,7 +540,7 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement( lang::IllegalArgumentException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -633,7 +633,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const OUSt packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -708,7 +708,7 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneEncryptedStreamElement( packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { throw packages::NoEncryptionException(); } @@ -719,7 +719,7 @@ void SAL_CALL FSStorage::copyLastCommitTo( lang::IllegalArgumentException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { copyToStorage( xTargetStorage ); } @@ -731,7 +731,7 @@ void SAL_CALL FSStorage::copyStorageElementLastCommitTo( lang::IllegalArgumentException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -747,7 +747,7 @@ sal_Bool SAL_CALL FSStorage::isStreamElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -767,7 +767,7 @@ sal_Bool SAL_CALL FSStorage::isStorageElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -789,7 +789,7 @@ void SAL_CALL FSStorage::removeElement( const OUString& aElementName ) container::NoSuchElementException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -816,7 +816,7 @@ void SAL_CALL FSStorage::renameElement( const OUString& aElementName, const OUSt container::ElementExistException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -897,7 +897,7 @@ void SAL_CALL FSStorage::copyElementTo( const OUString& aElementName, container::ElementExistException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -981,7 +981,7 @@ void SAL_CALL FSStorage::moveElementTo( const OUString& aElementName, container::ElementExistException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); copyElementTo( aElementName, xDest, aNewName ); @@ -997,7 +997,7 @@ void SAL_CALL FSStorage::moveElementTo( const OUString& aElementName, uno::Any SAL_CALL FSStorage::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1053,7 +1053,7 @@ uno::Any SAL_CALL FSStorage::getByName( const OUString& aName ) uno::Sequence< OUString > SAL_CALL FSStorage::getElementNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1117,7 +1117,7 @@ uno::Sequence< OUString > SAL_CALL FSStorage::getElementNames() sal_Bool SAL_CALL FSStorage::hasByName( const OUString& aName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1153,7 +1153,7 @@ sal_Bool SAL_CALL FSStorage::hasByName( const OUString& aName ) } uno::Type SAL_CALL FSStorage::getElementType() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1165,7 +1165,7 @@ uno::Type SAL_CALL FSStorage::getElementType() } sal_Bool SAL_CALL FSStorage::hasElements() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1194,7 +1194,7 @@ sal_Bool SAL_CALL FSStorage::hasElements() // XDisposable void SAL_CALL FSStorage::dispose() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1213,7 +1213,7 @@ void SAL_CALL FSStorage::dispose() void SAL_CALL FSStorage::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1228,7 +1228,7 @@ void SAL_CALL FSStorage::addEventListener( void SAL_CALL FSStorage::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1242,7 +1242,7 @@ void SAL_CALL FSStorage::removeEventListener( // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL FSStorage::getPropertySetInfo() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1259,7 +1259,7 @@ void SAL_CALL FSStorage::setPropertyValue( const OUString& aPropertyName, const beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1276,7 +1276,7 @@ void SAL_CALL FSStorage::setPropertyValue( const OUString& aPropertyName, const uno::Any SAL_CALL FSStorage::getPropertyValue( const OUString& aPropertyName ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1297,7 +1297,7 @@ void SAL_CALL FSStorage::addPropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1313,7 +1313,7 @@ void SAL_CALL FSStorage::removePropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1329,7 +1329,7 @@ void SAL_CALL FSStorage::addVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1345,7 +1345,7 @@ void SAL_CALL FSStorage::removeVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1362,7 +1362,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1485,7 +1485,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openEncrypte packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { throw packages::NoEncryptionException(); } @@ -1496,7 +1496,7 @@ void SAL_CALL FSStorage::removeStreamElementByHierarchicalName( const OUString& container::NoSuchElementException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx index 48de36fa7831..d3ea08d25388 100644 --- a/svl/source/fsstor/fsstorage.hxx +++ b/svl/source/fsstor/fsstorage.hxx @@ -69,7 +69,7 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire() throw(); @@ -78,10 +78,10 @@ public: // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XStorage @@ -90,7 +90,7 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode ) @@ -99,7 +99,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass ) @@ -109,7 +109,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL openStorageElement( const OUString& aStorName, sal_Int32 nStorageMode ) @@ -117,7 +117,7 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneStreamElement( const OUString& aStreamName ) @@ -126,7 +126,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement( const OUString& aStreamName, const OUString& aPass ) @@ -136,7 +136,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL copyLastCommitTo( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xTargetStorage ) @@ -144,7 +144,7 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL copyStorageElementLastCommitTo( const OUString& aStorName, @@ -153,19 +153,19 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeElement( const OUString& aElementName ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -173,7 +173,7 @@ public: ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -182,7 +182,7 @@ public: ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL copyElementTo( const OUString& aElementName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, @@ -193,7 +193,7 @@ public: ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL moveElementTo( const OUString& aElementName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, @@ -204,82 +204,82 @@ public: ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasElements() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XComponent virtual void SAL_CALL dispose() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) 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 ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XHierarchicalStorageAccess @@ -289,7 +289,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -298,7 +298,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -306,7 +306,7 @@ public: ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); }; #endif diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx index 05be27884129..0b3384dd981e 100644 --- a/svl/source/fsstor/oinputstreamcontainer.cxx +++ b/svl/source/fsstor/oinputstreamcontainer.cxx @@ -43,7 +43,7 @@ OFSInputStreamContainer::~OFSInputStreamContainer() } uno::Sequence< uno::Type > SAL_CALL OFSInputStreamContainer::getTypes() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { static ::cppu::OTypeCollection* pTypeCollection = NULL ; @@ -78,7 +78,7 @@ uno::Sequence< uno::Type > SAL_CALL OFSInputStreamContainer::getTypes() } uno::Any SAL_CALL OFSInputStreamContainer::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -116,7 +116,7 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::readBytes( uno::Sequence< sal_Int8 > throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -133,7 +133,7 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::readSomeBytes( uno::Sequence< sal_In throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -150,7 +150,7 @@ void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -166,7 +166,7 @@ void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL OFSInputStreamContainer::available( ) throw ( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -182,7 +182,7 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::available( ) void SAL_CALL OFSInputStreamContainer::closeInput( ) throw ( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -196,7 +196,7 @@ void SAL_CALL OFSInputStreamContainer::closeInput( ) } uno::Reference< io::XInputStream > SAL_CALL OFSInputStreamContainer::getInputStream() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -210,7 +210,7 @@ uno::Reference< io::XInputStream > SAL_CALL OFSInputStreamContainer::getInputStr } uno::Reference< io::XOutputStream > SAL_CALL OFSInputStreamContainer::getOutputStream() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -223,7 +223,7 @@ uno::Reference< io::XOutputStream > SAL_CALL OFSInputStreamContainer::getOutputS void SAL_CALL OFSInputStreamContainer::seek( sal_Int64 location ) throw ( lang::IllegalArgumentException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -238,7 +238,7 @@ void SAL_CALL OFSInputStreamContainer::seek( sal_Int64 location ) sal_Int64 SAL_CALL OFSInputStreamContainer::getPosition() throw ( io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -253,7 +253,7 @@ sal_Int64 SAL_CALL OFSInputStreamContainer::getPosition() sal_Int64 SAL_CALL OFSInputStreamContainer::getLength() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -267,7 +267,7 @@ sal_Int64 SAL_CALL OFSInputStreamContainer::getLength() } void SAL_CALL OFSInputStreamContainer::dispose( ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -289,7 +289,7 @@ void SAL_CALL OFSInputStreamContainer::dispose( ) } void SAL_CALL OFSInputStreamContainer::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -303,7 +303,7 @@ void SAL_CALL OFSInputStreamContainer::addEventListener( const uno::Reference< l } void SAL_CALL OFSInputStreamContainer::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/svl/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx index 09b56452795f..1128d6407a86 100644 --- a/svl/source/fsstor/oinputstreamcontainer.hxx +++ b/svl/source/fsstor/oinputstreamcontainer.hxx @@ -50,36 +50,36 @@ public: virtual ~OFSInputStreamContainer(); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XInputStream virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL available( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL closeInput( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); //XStream - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception); //XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); //XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx index e7892528d72c..07c109838876 100644 --- a/svl/source/fsstor/ostreamcontainer.cxx +++ b/svl/source/fsstor/ostreamcontainer.cxx @@ -64,7 +64,7 @@ OFSStreamContainer::~OFSStreamContainer() // XInterface uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Any aReturn; @@ -142,7 +142,7 @@ void SAL_CALL OFSStreamContainer::release() // XTypeProvider uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( m_pTypeCollection == NULL ) { @@ -183,7 +183,7 @@ uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL OFSStreamContainer::getImplementationId() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { static ::cppu::OImplementationId* pID = NULL ; @@ -203,7 +203,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OFSStreamContainer::getImplementationId() // XStream uno::Reference< io::XInputStream > SAL_CALL OFSStreamContainer::getInputStream() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -220,7 +220,7 @@ uno::Reference< io::XInputStream > SAL_CALL OFSStreamContainer::getInputStream() } uno::Reference< io::XOutputStream > SAL_CALL OFSStreamContainer::getOutputStream() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -238,7 +238,7 @@ uno::Reference< io::XOutputStream > SAL_CALL OFSStreamContainer::getOutputStream // XComponent void SAL_CALL OFSStreamContainer::dispose() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -270,7 +270,7 @@ void SAL_CALL OFSStreamContainer::dispose() } void SAL_CALL OFSStreamContainer::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -284,7 +284,7 @@ void SAL_CALL OFSStreamContainer::addEventListener( const uno::Reference< lang:: } void SAL_CALL OFSStreamContainer::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -300,7 +300,7 @@ void SAL_CALL OFSStreamContainer::removeEventListener( const uno::Reference< lan void SAL_CALL OFSStreamContainer::seek( sal_Int64 location ) throw ( lang::IllegalArgumentException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -315,7 +315,7 @@ void SAL_CALL OFSStreamContainer::seek( sal_Int64 location ) sal_Int64 SAL_CALL OFSStreamContainer::getPosition() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -330,7 +330,7 @@ sal_Int64 SAL_CALL OFSStreamContainer::getPosition() sal_Int64 SAL_CALL OFSStreamContainer::getLength() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -349,7 +349,7 @@ sal_Int32 SAL_CALL OFSStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aDa throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -366,7 +366,7 @@ sal_Int32 SAL_CALL OFSStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >& throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -383,7 +383,7 @@ void SAL_CALL OFSStreamContainer::skipBytes( sal_Int32 nBytesToSkip ) throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -399,7 +399,7 @@ void SAL_CALL OFSStreamContainer::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL OFSStreamContainer::available() throw( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -415,7 +415,7 @@ sal_Int32 SAL_CALL OFSStreamContainer::available() void SAL_CALL OFSStreamContainer::closeInput() throw( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -440,7 +440,7 @@ void SAL_CALL OFSStreamContainer::writeBytes( const uno::Sequence< sal_Int8 >& a throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -457,7 +457,7 @@ void SAL_CALL OFSStreamContainer::flush() throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -474,7 +474,7 @@ void SAL_CALL OFSStreamContainer::closeOutput() throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -498,7 +498,7 @@ void SAL_CALL OFSStreamContainer::closeOutput() // XTruncate void SAL_CALL OFSStreamContainer::truncate() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -515,7 +515,7 @@ void SAL_CALL OFSStreamContainer::truncate() // XAsyncOutputMonitor void SAL_CALL OFSStreamContainer::waitForCompletion() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/svl/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx index 4009bc4f9fdd..373c28443457 100644 --- a/svl/source/fsstor/ostreamcontainer.hxx +++ b/svl/source/fsstor/ostreamcontainer.hxx @@ -65,51 +65,51 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XStream - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XInputStream virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL available( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL closeInput( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XOutputStream - virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XTruncate - virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XAsyncOutputMonitor - virtual void SAL_CALL waitForCompletion( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL waitForCompletion( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx index 09b198919e48..2687fb1eeb83 100644 --- a/svl/source/inc/fsfactory.hxx +++ b/svl/source/inc/fsfactory.hxx @@ -48,13 +48,13 @@ public: // XSingleServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index 9f901fcf6fdc..b2d00a86b4f5 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -302,37 +302,37 @@ public: const OUString& aUserName, const ::com::sun::star::uno::Sequence< OUString >& aPasswords, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addPersistent( const OUString& aUrl, const OUString& aUserName, const ::com::sun::star::uno::Sequence< OUString >& aPasswords, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::task::UrlRecord SAL_CALL find( const OUString& aUrl, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::task::UrlRecord SAL_CALL findForName( const OUString& aUrl, const OUString& aUserName, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL remove( const OUString& aUrl, const OUString& aUserName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removePersistent( const OUString& aUrl, const OUString& aUserName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeAllPersistent() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeAllPersistent() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::task::UrlRecord > SAL_CALL - getAllPersistent( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); + getAllPersistent( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException, std::exception); // provide factory @@ -345,34 +345,34 @@ public: impl_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XMasterPasswordHandling virtual ::sal_Bool SAL_CALL authorizateWithMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) - throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL changeMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeMasterPassword() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasMasterPassword( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL allowPersistentStoring( ::sal_Bool bAllow ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isPersistentStoringAllowed( ) throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL changeMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeMasterPassword() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasMasterPassword( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL allowPersistentStoring( ::sal_Bool bAllow ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isPersistentStoringAllowed( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XMasterPasswordHandling2 - virtual ::sal_Bool SAL_CALL useDefaultMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isDefaultMasterPasswordUsed( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL useDefaultMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isDefaultMasterPasswordUsed( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XUrlContainer - virtual void SAL_CALL addUrl( const OUString& Url, ::sal_Bool MakePersistent ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL findUrl( const OUString& Url ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeUrl( const OUString& Url ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUrls( ::sal_Bool OnlyPersistent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addUrl( const OUString& Url, ::sal_Bool MakePersistent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL findUrl( const OUString& Url ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeUrl( const OUString& Url ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUrls( ::sal_Bool OnlyPersistent ) throw (::com::sun::star::uno::RuntimeException, std::exception); void Notify(); }; diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index d7d3a81be093..aeb7c97771b2 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -355,7 +355,7 @@ SfxItemPropertySetInfo::SfxItemPropertySetInfo(const SfxItemPropertyMapEntry *pE } Sequence< Property > SAL_CALL SfxItemPropertySetInfo::getProperties( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return m_pImpl->m_pOwnMap->getProperties(); } @@ -367,13 +367,13 @@ SfxItemPropertySetInfo::~SfxItemPropertySetInfo() } Property SAL_CALL SfxItemPropertySetInfo::getPropertyByName( const OUString& rName ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { return m_pImpl->m_pOwnMap->getPropertyByName( rName ); } sal_Bool SAL_CALL SfxItemPropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return m_pImpl->m_pOwnMap->hasPropertyByName( rName ); } @@ -389,19 +389,19 @@ SfxExtItemPropertySetInfo::~SfxExtItemPropertySetInfo() { } -Sequence< Property > SAL_CALL SfxExtItemPropertySetInfo::getProperties( ) throw(RuntimeException) +Sequence< Property > SAL_CALL SfxExtItemPropertySetInfo::getProperties( ) throw(RuntimeException, std::exception) { return aExtMap.getProperties(); } Property SAL_CALL SfxExtItemPropertySetInfo::getPropertyByName( const OUString& rPropertyName ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { return aExtMap.getPropertyByName( rPropertyName ); } sal_Bool SAL_CALL SfxExtItemPropertySetInfo::hasPropertyByName( const OUString& rPropertyName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return aExtMap.hasPropertyByName( rPropertyName ); } diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 863d1dff7c06..4d65840eafb4 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -921,7 +921,7 @@ SfxUnoStyleSheet* SfxUnoStyleSheet::getUnoStyleSheet( const ::com::sun::star::un } // XUnoTunnel -::sal_Int64 SAL_CALL SfxUnoStyleSheet::getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& rId ) throw (::com::sun::star::uno::RuntimeException) +::sal_Int64 SAL_CALL SfxUnoStyleSheet::getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& rId ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getIdentifier().getConstArray(), rId.getConstArray(), 16 ) ) { diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index cb2187e817ae..d5820185d5f6 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -248,7 +248,7 @@ void SvOutputStreamOpenLockBytes::Terminate() // virtual uno::Any SAL_CALL SvLockBytesInputStream::queryInterface(uno::Type const & rType) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Any aReturn(cppu::queryInterface(rType, @@ -273,7 +273,7 @@ void SAL_CALL SvLockBytesInputStream::release() throw () sal_Int32 SAL_CALL SvLockBytesInputStream::readBytes(uno::Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead) - throw (io::IOException, uno::RuntimeException) + throw (io::IOException, uno::RuntimeException, std::exception) { OSL_ASSERT(m_nPosition >= 0); if (!m_xLockBytes.Is()) @@ -312,7 +312,7 @@ SvLockBytesInputStream::readBytes(uno::Sequence< sal_Int8 > & rData, sal_Int32 SAL_CALL SvLockBytesInputStream::readSomeBytes(uno::Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead) - throw (io::IOException, uno::RuntimeException) + throw (io::IOException, uno::RuntimeException, std::exception) { OSL_ASSERT(m_nPosition >= 0); if (!m_xLockBytes.Is()) @@ -344,7 +344,7 @@ SvLockBytesInputStream::readSomeBytes(uno::Sequence< sal_Int8 > & rData, // virtual void SAL_CALL SvLockBytesInputStream::skipBytes(sal_Int32 nBytesToSkip) - throw (io::IOException, uno::RuntimeException) + throw (io::IOException, uno::RuntimeException, std::exception) { if (!m_xLockBytes.Is()) throw io::NotConnectedException(); @@ -357,7 +357,7 @@ void SAL_CALL SvLockBytesInputStream::skipBytes(sal_Int32 nBytesToSkip) // virtual sal_Int32 SAL_CALL SvLockBytesInputStream::available() - throw (io::IOException, uno::RuntimeException) + throw (io::IOException, uno::RuntimeException, std::exception) { OSL_ASSERT(m_nPosition >= 0); if (!m_xLockBytes.Is()) @@ -375,7 +375,7 @@ sal_Int32 SAL_CALL SvLockBytesInputStream::available() // virtual void SAL_CALL SvLockBytesInputStream::closeInput() - throw (io::IOException, uno::RuntimeException) + throw (io::IOException, uno::RuntimeException, std::exception) { if (!m_xLockBytes.Is()) throw io::NotConnectedException(); @@ -385,7 +385,7 @@ void SAL_CALL SvLockBytesInputStream::closeInput() // virtual void SAL_CALL SvLockBytesInputStream::seek(sal_Int64 nLocation) throw (lang::IllegalArgumentException, io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if (nLocation < 0) throw lang::IllegalArgumentException(); @@ -396,7 +396,7 @@ void SAL_CALL SvLockBytesInputStream::seek(sal_Int64 nLocation) // virtual sal_Int64 SAL_CALL SvLockBytesInputStream::getPosition() - throw (io::IOException, uno::RuntimeException) + throw (io::IOException, uno::RuntimeException, std::exception) { if (!m_xLockBytes.Is()) throw io::NotConnectedException(); @@ -405,7 +405,7 @@ sal_Int64 SAL_CALL SvLockBytesInputStream::getPosition() // virtual sal_Int64 SAL_CALL SvLockBytesInputStream::getLength() - throw (io::IOException, uno::RuntimeException) + throw (io::IOException, uno::RuntimeException, std::exception) { if (!m_xLockBytes.Is()) throw io::NotConnectedException(); diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index 066ae284412e..35d6d73478bc 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -120,7 +120,7 @@ com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvN // XNumberFormatter void SAL_CALL SvNumberFormatterServiceObj::attachNumberFormatsSupplier( const uno::Reference<util::XNumberFormatsSupplier>& _xSupplier ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::rtl::Reference< SvNumberFormatsSupplierObj > xAutoReleaseOld; @@ -141,14 +141,14 @@ void SAL_CALL SvNumberFormatterServiceObj::attachNumberFormatsSupplier( const un } uno::Reference<util::XNumberFormatsSupplier> SAL_CALL SvNumberFormatterServiceObj::getNumberFormatsSupplier() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return xSupplier.get(); } sal_Int32 SAL_CALL SvNumberFormatterServiceObj::detectNumberFormat( sal_Int32 nKey, const OUString& aString ) - throw(util::NotNumericException, uno::RuntimeException) + throw(util::NotNumericException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -170,7 +170,7 @@ sal_Int32 SAL_CALL SvNumberFormatterServiceObj::detectNumberFormat( sal_Int32 nK } double SAL_CALL SvNumberFormatterServiceObj::convertStringToNumber( sal_Int32 nKey, const OUString& aString ) - throw(util::NotNumericException, uno::RuntimeException) + throw(util::NotNumericException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -192,7 +192,7 @@ double SAL_CALL SvNumberFormatterServiceObj::convertStringToNumber( sal_Int32 nK } OUString SAL_CALL SvNumberFormatterServiceObj::convertNumberToString( sal_Int32 nKey, double fValue ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -212,7 +212,7 @@ OUString SAL_CALL SvNumberFormatterServiceObj::convertNumberToString( sal_Int32 util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32 nKey, double fValue, util::Color aDefaultColor ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -235,7 +235,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32 OUString SAL_CALL SvNumberFormatterServiceObj::formatString( sal_Int32 nKey, const OUString& aString ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -256,7 +256,7 @@ OUString SAL_CALL SvNumberFormatterServiceObj::formatString( sal_Int32 nKey, util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForString( sal_Int32 nKey, const OUString& aString, util::Color aDefaultColor ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -282,7 +282,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForString( sal_Int32 } OUString SAL_CALL SvNumberFormatterServiceObj::getInputString( sal_Int32 nKey, double fValue ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -302,7 +302,7 @@ OUString SAL_CALL SvNumberFormatterServiceObj::convertNumberToPreviewString( con double fValue, const lang::Locale& nLocale, sal_Bool bAllowEnglish ) - throw(util::MalformedNumberFormatException, uno::RuntimeException) + throw(util::MalformedNumberFormatException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -333,7 +333,7 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( co const lang::Locale& nLocale, sal_Bool bAllowEnglish, util::Color aDefaultColor ) - throw(util::MalformedNumberFormatException, uno::RuntimeException) + throw(util::MalformedNumberFormatException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -369,19 +369,19 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( co // XServiceInfo OUString SAL_CALL SvNumberFormatterServiceObj::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString("com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject"); } sal_Bool SAL_CALL SvNumberFormatterServiceObj::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence<OUString> SAL_CALL SvNumberFormatterServiceObj::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); @@ -404,7 +404,7 @@ SvNumberFormatsObj::~SvNumberFormatsObj() // XNumberFormats uno::Reference<beans::XPropertySet> SAL_CALL SvNumberFormatsObj::getByKey( sal_Int32 nKey ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -419,7 +419,7 @@ uno::Reference<beans::XPropertySet> SAL_CALL SvNumberFormatsObj::getByKey( sal_I uno::Sequence<sal_Int32> SAL_CALL SvNumberFormatsObj::queryKeys( sal_Int16 nType, const lang::Locale& nLocale, sal_Bool bCreate ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -447,7 +447,7 @@ uno::Sequence<sal_Int32> SAL_CALL SvNumberFormatsObj::queryKeys( sal_Int16 nType sal_Int32 SAL_CALL SvNumberFormatsObj::queryKey( const OUString& aFormat, const lang::Locale& nLocale, sal_Bool bScan ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -470,7 +470,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::queryKey( const OUString& aFormat, sal_Int32 SAL_CALL SvNumberFormatsObj::addNew( const OUString& aFormat, const lang::Locale& nLocale ) - throw(util::MalformedNumberFormatException, uno::RuntimeException) + throw(util::MalformedNumberFormatException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -502,7 +502,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNew( const OUString& aFormat, sal_Int32 SAL_CALL SvNumberFormatsObj::addNewConverted( const OUString& aFormat, const lang::Locale& nLocale, const lang::Locale& nNewLocale ) - throw(util::MalformedNumberFormatException, uno::RuntimeException) + throw(util::MalformedNumberFormatException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -532,7 +532,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNewConverted( const OUString& aFormat, return nRet; } -void SAL_CALL SvNumberFormatsObj::removeByKey( sal_Int32 nKey ) throw(uno::RuntimeException) +void SAL_CALL SvNumberFormatsObj::removeByKey( sal_Int32 nKey ) throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); SvNumberFormatter* pFormatter = rSupplier.GetNumberFormatter(); @@ -549,7 +549,7 @@ OUString SAL_CALL SvNumberFormatsObj::generateFormat( sal_Int32 nBaseKey, sal_Bool bThousands, sal_Bool bRed, sal_Int16 nDecimals, sal_Int16 nLeading ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -569,7 +569,7 @@ OUString SAL_CALL SvNumberFormatsObj::generateFormat( sal_Int32 nBaseKey, // XNumberFormatTypes sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardIndex( const lang::Locale& nLocale ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -587,7 +587,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardIndex( const lang::Locale& nLo } sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardFormat( sal_Int16 nType, const lang::Locale& nLocale ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -608,7 +608,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardFormat( sal_Int16 nType, const } sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatIndex( sal_Int16 nIndex, const lang::Locale& nLocale ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -626,7 +626,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatIndex( sal_Int16 nIndex, const l } sal_Bool SAL_CALL SvNumberFormatsObj::isTypeCompatible( sal_Int16 nOldType, sal_Int16 nNewType ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -641,7 +641,7 @@ sal_Bool SAL_CALL SvNumberFormatsObj::isTypeCompatible( sal_Int16 nOldType, sal_ } sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatForLocale( sal_Int32 nKey, const lang::Locale& nLocale ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -661,19 +661,19 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatForLocale( sal_Int32 nKey, const // XServiceInfo OUString SAL_CALL SvNumberFormatsObj::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString("SvNumberFormatsObj"); } sal_Bool SAL_CALL SvNumberFormatsObj::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence<OUString> SAL_CALL SvNumberFormatsObj::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); @@ -697,7 +697,7 @@ SvNumberFormatObj::~SvNumberFormatObj() // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL SvNumberFormatObj::getPropertySetInfo() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); static uno::Reference<beans::XPropertySetInfo> aRef = @@ -709,14 +709,14 @@ void SAL_CALL SvNumberFormatObj::setPropertyValue( const OUString&, const uno::Any& ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { throw beans::UnknownPropertyException(); // Everything is read-only } uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -812,7 +812,7 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aProperty void SAL_CALL SvNumberFormatObj::addPropertyChangeListener( const OUString&, const uno::Reference<beans::XPropertyChangeListener>&) throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -820,7 +820,7 @@ void SAL_CALL SvNumberFormatObj::addPropertyChangeListener( const OUString&, void SAL_CALL SvNumberFormatObj::removePropertyChangeListener( const OUString&, const uno::Reference<beans::XPropertyChangeListener>&) throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -828,7 +828,7 @@ void SAL_CALL SvNumberFormatObj::removePropertyChangeListener( const OUString&, void SAL_CALL SvNumberFormatObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -836,7 +836,7 @@ void SAL_CALL SvNumberFormatObj::addVetoableChangeListener( const OUString&, void SAL_CALL SvNumberFormatObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -844,7 +844,7 @@ void SAL_CALL SvNumberFormatObj::removeVetoableChangeListener( const OUString&, // XPropertyAccess uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValues() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -910,7 +910,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::PropertyValue>& ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { throw beans::UnknownPropertyException(); // Everything is read-only } @@ -918,19 +918,19 @@ void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::P // XServiceInfo OUString SAL_CALL SvNumberFormatObj::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString("SvNumberFormatObj"); } sal_Bool SAL_CALL SvNumberFormatObj::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence<OUString> SAL_CALL SvNumberFormatObj::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); @@ -953,7 +953,7 @@ SvNumberFormatSettingsObj::~SvNumberFormatSettingsObj() // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL SvNumberFormatSettingsObj::getPropertySetInfo() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); static uno::Reference<beans::XPropertySetInfo> aRef = @@ -965,7 +965,7 @@ void SAL_CALL SvNumberFormatSettingsObj::setPropertyValue( const OUString& aProp const uno::Any& aValue ) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1007,7 +1007,7 @@ void SAL_CALL SvNumberFormatSettingsObj::setPropertyValue( const OUString& aProp uno::Any SAL_CALL SvNumberFormatSettingsObj::getPropertyValue( const OUString& aPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1045,7 +1045,7 @@ uno::Any SAL_CALL SvNumberFormatSettingsObj::getPropertyValue( const OUString& a void SAL_CALL SvNumberFormatSettingsObj::addPropertyChangeListener( const OUString&, const uno::Reference<beans::XPropertyChangeListener>&) throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -1053,7 +1053,7 @@ void SAL_CALL SvNumberFormatSettingsObj::addPropertyChangeListener( const OUStri void SAL_CALL SvNumberFormatSettingsObj::removePropertyChangeListener( const OUString&, const uno::Reference<beans::XPropertyChangeListener>&) throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -1061,7 +1061,7 @@ void SAL_CALL SvNumberFormatSettingsObj::removePropertyChangeListener( const OUS void SAL_CALL SvNumberFormatSettingsObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -1069,7 +1069,7 @@ void SAL_CALL SvNumberFormatSettingsObj::addVetoableChangeListener( const OUStri void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -1077,19 +1077,19 @@ void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const OUS // XServiceInfo OUString SAL_CALL SvNumberFormatSettingsObj::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString("SvNumberFormatSettingsObj"); } sal_Bool SAL_CALL SvNumberFormatSettingsObj::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence<OUString> SAL_CALL SvNumberFormatSettingsObj::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence<OUString> aRet(1); OUString* pArray = aRet.getArray(); diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx index 4e7223068c44..c8970e98fcf9 100644 --- a/svl/source/numbers/numfmuno.hxx +++ b/svl/source/numbers/numfmuno.hxx @@ -53,50 +53,50 @@ public: virtual void SAL_CALL attachNumberFormatsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > SAL_CALL getNumberFormatsSupplier() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL detectNumberFormat( sal_Int32 nKey, const OUString& aString ) throw(::com::sun::star::util::NotNumericException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual double SAL_CALL convertStringToNumber( sal_Int32 nKey, const OUString& aString ) throw(::com::sun::star::util::NotNumericException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL convertNumberToString( sal_Int32 nKey, double fValue ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::util::Color SAL_CALL queryColorForNumber( sal_Int32 nKey, double fValue, ::com::sun::star::util::Color aDefaultColor ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL formatString( sal_Int32 nKey, const OUString& aString ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::util::Color SAL_CALL queryColorForString( sal_Int32 nKey, const OUString& aString, ::com::sun::star::util::Color aDefaultColor ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getInputString( sal_Int32 nKey, double fValue ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XNumberFormatPreviewer virtual OUString SAL_CALL convertNumberToPreviewString( const OUString& aFormat, double fValue, const ::com::sun::star::lang::Locale& nLocale, sal_Bool bAllowEnglish ) throw(::com::sun::star::util::MalformedNumberFormatException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::util::Color SAL_CALL queryPreviewColorForNumber( const OUString& aFormat, double fValue, const ::com::sun::star::lang::Locale& nLocale, sal_Bool bAllowEnglish, ::com::sun::star::util::Color aDefaultColor ) throw(::com::sun::star::util::MalformedNumberFormatException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); }; @@ -116,50 +116,50 @@ public: // XNumberFormats virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - getByKey( sal_Int32 nKey ) throw(::com::sun::star::uno::RuntimeException); + getByKey( sal_Int32 nKey ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL queryKeys( sal_Int16 nType, const ::com::sun::star::lang::Locale& nLocale, sal_Bool bCreate ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL queryKey( const OUString& aFormat, const ::com::sun::star::lang::Locale& nLocale, sal_Bool bScan ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL addNew( const OUString& aFormat, const ::com::sun::star::lang::Locale& nLocale ) throw(::com::sun::star::util::MalformedNumberFormatException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL addNewConverted( const OUString& aFormat, const ::com::sun::star::lang::Locale& nLocale, const ::com::sun::star::lang::Locale& nNewLocale ) throw(::com::sun::star::util::MalformedNumberFormatException, - ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByKey( sal_Int32 nKey ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeByKey( sal_Int32 nKey ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL generateFormat( sal_Int32 nBaseKey, const ::com::sun::star::lang::Locale& nLocale, sal_Bool bThousands, sal_Bool bRed, sal_Int16 nDecimals, sal_Int16 nLeading ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XNumberFormatTypes virtual sal_Int32 SAL_CALL getStandardIndex( const ::com::sun::star::lang::Locale& nLocale ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getStandardFormat( sal_Int16 nType, const ::com::sun::star::lang::Locale& nLocale ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getFormatIndex( sal_Int16 nIndex, const ::com::sun::star::lang::Locale& nLocale ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isTypeCompatible( sal_Int16 nOldType, sal_Int16 nNewType ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getFormatForLocale( sal_Int32 nKey, const ::com::sun::star::lang::Locale& nLocale ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); private: SvNumberFormatsObj(); // never implemented @@ -183,62 +183,62 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) 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); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getPropertyValues() throw(::com::sun::star::uno::RuntimeException); + getPropertyValues() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) 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); + ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); }; @@ -258,51 +258,51 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) 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); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx index b2436c252808..931e5718c62a 100644 --- a/svl/source/numbers/numuno.cxx +++ b/svl/source/numbers/numuno.cxx @@ -83,7 +83,7 @@ void SvNumberFormatsSupplierObj::SettingsChanged() // XNumberFormatsSupplier uno::Reference<beans::XPropertySet> SAL_CALL SvNumberFormatsSupplierObj::getNumberFormatSettings() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( pImpl->aMutex ); @@ -91,7 +91,7 @@ uno::Reference<beans::XPropertySet> SAL_CALL SvNumberFormatsSupplierObj::getNumb } uno::Reference<util::XNumberFormats> SAL_CALL SvNumberFormatsSupplierObj::getNumberFormats() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( pImpl->aMutex ); @@ -101,7 +101,7 @@ uno::Reference<util::XNumberFormats> SAL_CALL SvNumberFormatsSupplierObj::getNum // XUnoTunnel sal_Int64 SAL_CALL SvNumberFormatsSupplierObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException) + const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index eb56ebc5c3ed..26b6e2daef99 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -57,7 +57,7 @@ SvNumberFormatsSupplierServiceObject::~SvNumberFormatsSupplierServiceObject() } } -Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type& _rType ) throw (RuntimeException) +Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception) { Any aReturn = ::cppu::queryInterface(_rType, static_cast< XInitialization* >(this), @@ -71,7 +71,7 @@ Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type& return aReturn; } -void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< Any >& _rArguments ) throw(Exception, RuntimeException) +void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< Any >& _rArguments ) throw(Exception, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getSharedMutex() ); @@ -112,29 +112,29 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< SetNumberFormatter(m_pOwnFormatter); } -OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName( ) throw(RuntimeException, std::exception) { return OUString("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject"); } -sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { Sequence< OUString > aSupported(1); aSupported.getArray()[0] = PERSISTENT_SERVICE_NAME; return aSupported; } -OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getServiceName( ) throw(RuntimeException) +OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getServiceName( ) throw(RuntimeException, std::exception) { return PERSISTENT_SERVICE_NAME; } -void SAL_CALL SvNumberFormatsSupplierServiceObject::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw(IOException, RuntimeException) +void SAL_CALL SvNumberFormatsSupplierServiceObject::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw(IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getSharedMutex() ); implEnsureFormatter(); @@ -146,7 +146,7 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::write( const Reference< XObj m_pOwnFormatter->Save(aSvOutputSteam); } -void SAL_CALL SvNumberFormatsSupplierServiceObject::read( const Reference< XObjectInputStream >& _rxInStream ) throw(IOException, RuntimeException) +void SAL_CALL SvNumberFormatsSupplierServiceObject::read( const Reference< XObjectInputStream >& _rxInStream ) throw(IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getSharedMutex() ); implEnsureFormatter(); @@ -157,21 +157,21 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::read( const Reference< XObje m_pOwnFormatter->Load(aSvInputSteam); } -Reference< XPropertySet > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormatSettings() throw(RuntimeException) +Reference< XPropertySet > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormatSettings() throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getSharedMutex() ); implEnsureFormatter(); return SvNumberFormatsSupplierObj::getNumberFormatSettings(); } -Reference< XNumberFormats > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormats() throw(RuntimeException) +Reference< XNumberFormats > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormats() throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getSharedMutex() ); implEnsureFormatter(); return SvNumberFormatsSupplierObj::getNumberFormats(); } -sal_Int64 SAL_CALL SvNumberFormatsSupplierServiceObject::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException) +sal_Int64 SAL_CALL SvNumberFormatsSupplierServiceObject::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException, std::exception) { sal_Int64 nReturn = SvNumberFormatsSupplierObj::getSomething( aIdentifier ); if ( nReturn ) diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx index 1209b9ee32fc..73936d92d9e9 100644 --- a/svl/source/numbers/supservs.hxx +++ b/svl/source/numbers/supservs.hxx @@ -57,33 +57,33 @@ public: // XInterface virtual void SAL_CALL acquire() throw() { SvNumberFormatsSupplierObj::acquire(); } virtual void SAL_CALL release() throw() { SvNumberFormatsSupplierObj::release(); } - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return SvNumberFormatsSupplierObj::queryInterface(_rType); } // XAggregation - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPersistObject - virtual OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XNumberFormatsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL - getNumberFormatSettings() throw(::com::sun::star::uno::RuntimeException); + getNumberFormatSettings() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL - getNumberFormats() throw(::com::sun::star::uno::RuntimeException); + getNumberFormats() throw(::com::sun::star::uno::RuntimeException, std::exception); // XUnoTunnler - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); protected: void implEnsureFormatter(); diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index f6fa804110b6..0538a240fbdb 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -423,7 +423,7 @@ PasswordContainer::~PasswordContainer() } -void SAL_CALL PasswordContainer::disposing( const EventObject& ) throw(RuntimeException) +void SAL_CALL PasswordContainer::disposing( const EventObject& ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( mMutex ); @@ -644,7 +644,7 @@ Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const list< } -void SAL_CALL PasswordContainer::add( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) +void SAL_CALL PasswordContainer::add( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( mMutex ); @@ -652,7 +652,7 @@ void SAL_CALL PasswordContainer::add( const OUString& Url, const OUString& UserN } -void SAL_CALL PasswordContainer::addPersistent( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) +void SAL_CALL PasswordContainer::addPersistent( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( mMutex ); @@ -696,13 +696,13 @@ void PasswordContainer::PrivateAdd( const OUString& Url, const OUString& UserNam -UrlRecord SAL_CALL PasswordContainer::find( const OUString& aURL, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) +UrlRecord SAL_CALL PasswordContainer::find( const OUString& aURL, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception) { return find( aURL, OUString(), false, aHandler ); } -UrlRecord SAL_CALL PasswordContainer::findForName( const OUString& aURL, const OUString& aName, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException) +UrlRecord SAL_CALL PasswordContainer::findForName( const OUString& aURL, const OUString& aName, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception) { return find( aURL, aName, true, aHandler ); } @@ -901,7 +901,7 @@ OUString PasswordContainer::GetMasterPassword( const Reference< XInteractionHand } -void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& aName ) throw(RuntimeException) +void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& aName ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( mMutex ); @@ -941,7 +941,7 @@ void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& a } -void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const OUString& aName ) throw(RuntimeException) +void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const OUString& aName ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( mMutex ); @@ -986,7 +986,7 @@ void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const O } } -void SAL_CALL PasswordContainer::removeAllPersistent() throw(RuntimeException) +void SAL_CALL PasswordContainer::removeAllPersistent() throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( mMutex ); @@ -1027,7 +1027,7 @@ void SAL_CALL PasswordContainer::removeAllPersistent() throw(RuntimeException) } } -Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Reference< XInteractionHandler >& xHandler ) throw(RuntimeException) +Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Reference< XInteractionHandler >& xHandler ) throw(RuntimeException, std::exception) { Sequence< UrlRecord > aResult; @@ -1055,7 +1055,7 @@ Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Refere } sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { bool bResult = false; OUString aEncodedMP; @@ -1109,7 +1109,7 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R } sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { bool bResult = false; uno::Reference< task::XInteractionHandler > xTmpHandler = xHandler; @@ -1166,7 +1166,7 @@ sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference< } void SAL_CALL PasswordContainer::removeMasterPassword() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // remove all the stored passwords and the master password removeAllPersistent(); @@ -1180,7 +1180,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword() } ::sal_Bool SAL_CALL PasswordContainer::hasMasterPassword( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( mMutex ); @@ -1192,7 +1192,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword() } ::sal_Bool SAL_CALL PasswordContainer::allowPersistentStoring( ::sal_Bool bAllow ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( mMutex ); @@ -1210,7 +1210,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword() } ::sal_Bool SAL_CALL PasswordContainer::isPersistentStoringAllowed() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( mMutex ); @@ -1221,7 +1221,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword() } ::sal_Bool SAL_CALL PasswordContainer::useDefaultMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { bool bResult = false; uno::Reference< task::XInteractionHandler > xTmpHandler = xHandler; @@ -1276,7 +1276,7 @@ void SAL_CALL PasswordContainer::removeMasterPassword() } ::sal_Bool SAL_CALL PasswordContainer::isDefaultMasterPasswordUsed() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( mMutex ); @@ -1289,25 +1289,25 @@ void SAL_CALL PasswordContainer::removeMasterPassword() void SAL_CALL PasswordContainer::addUrl( const OUString& Url, ::sal_Bool MakePersistent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { mUrlContainer.add( Url, MakePersistent ); } OUString SAL_CALL PasswordContainer::findUrl( const OUString& Url ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return mUrlContainer.find( Url ); } void SAL_CALL PasswordContainer::removeUrl( const OUString& Url ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { mUrlContainer.remove( Url ); } uno::Sequence< OUString > SAL_CALL PasswordContainer::getUrls( ::sal_Bool OnlyPersistent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return mUrlContainer.list( OnlyPersistent ); } @@ -1358,17 +1358,17 @@ void PasswordContainer::Notify() } } -OUString SAL_CALL PasswordContainer::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL PasswordContainer::getImplementationName( ) throw(uno::RuntimeException, std::exception) { return impl_getStaticImplementationName(); } -sal_Bool SAL_CALL PasswordContainer::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL PasswordContainer::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } -Sequence< OUString > SAL_CALL PasswordContainer::getSupportedServiceNames( ) throw(uno::RuntimeException) +Sequence< OUString > SAL_CALL PasswordContainer::getSupportedServiceNames( ) throw(uno::RuntimeException, std::exception) { return impl_getStaticSupportedServiceNames(); } diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index a3b704697eab..d6e7d2029da2 100644 --- a/svl/source/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.cxx @@ -37,20 +37,20 @@ public: {} virtual OUString SAL_CALL getImplementationName() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { return OUString("com.sun.star.comp.svl.PathService"); } virtual sal_Bool SAL_CALL supportsService ( const OUString & rName) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { return rName.equalsAscii("com.sun.star.config.SpecialConfigManager"); } virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > aRet(1); aRet.getArray()[0] = "com.sun.star.config.SpecialConfigManager"; @@ -59,23 +59,23 @@ public: virtual OUString SAL_CALL substituteVariables ( const OUString& sText) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) { return m_aOptions.SubstituteVariable( sText ); } virtual void SAL_CALL addPropertyChangeListener ( const OUString &, const css::uno::Reference< css::beans::XPropertyChangeListener > &) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) {} virtual void SAL_CALL removePropertyChangeListener ( const OUString &, const css::uno::Reference< css::beans::XPropertyChangeListener > &) - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) {} virtual void SAL_CALL flush() - throw(css::uno::RuntimeException) + throw(css::uno::RuntimeException, std::exception) {} }; |