diff options
Diffstat (limited to 'package/source')
48 files changed, 266 insertions, 1315 deletions
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index 1b171bc6ffe3..ebf93bff36f0 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -96,17 +96,14 @@ ManifestImport::~ManifestImport() } void SAL_CALL ManifestImport::startDocument( ) -throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } void SAL_CALL ManifestImport::endDocument( ) -throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } void ManifestImport::doFileEntry(StringHashMap &rConvertedAttribs) -throw( uno::RuntimeException ) { aSequence.resize(PKG_SIZE_ENCR_MNFST); @@ -130,7 +127,6 @@ throw( uno::RuntimeException ) } void ManifestImport::doEncryptionData(StringHashMap &rConvertedAttribs) -throw( uno::RuntimeException ) { // If this element exists, then this stream is encrypted and we need // to import the initialisation vector, salt and iteration count used @@ -157,7 +153,6 @@ throw( uno::RuntimeException ) } void ManifestImport::doAlgorithm(StringHashMap &rConvertedAttribs) -throw( uno::RuntimeException ) { if ( !bIgnoreEncryptData ) { OUString aString = rConvertedAttribs[sAlgorithmNameAttribute]; @@ -193,7 +188,6 @@ throw( uno::RuntimeException ) } void ManifestImport::doKeyDerivation(StringHashMap &rConvertedAttribs) -throw( uno::RuntimeException ) { if ( !bIgnoreEncryptData ) { OUString aString = rConvertedAttribs[sKeyDerivationNameAttribute]; @@ -226,7 +220,6 @@ throw( uno::RuntimeException ) } void ManifestImport::doStartKeyAlg(StringHashMap &rConvertedAttribs) -throw( uno::RuntimeException ) { OUString aString = rConvertedAttribs[sStartKeyAlgNameAttribute]; if (aString.equals(sSHA256_URL) || aString.equals(sSHA256_URL_ODF12)) { @@ -240,7 +233,6 @@ throw( uno::RuntimeException ) } void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) -throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { StringHashMap aConvertedAttribs; OUString aConvertedName = PushNameAndNamespaces( aName, xAttribs, aConvertedAttribs ); @@ -305,7 +297,6 @@ bool isEmpty(const css::beans::PropertyValue &rProp) } void SAL_CALL ManifestImport::endElement( const OUString& aName ) -throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { OUString aConvertedName = ConvertName( aName ); if ( !aStack.empty() && aStack.rbegin()->m_aConvertedName.equals( aConvertedName ) ) { @@ -325,22 +316,18 @@ throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) } void SAL_CALL ManifestImport::characters( const OUString& /*aChars*/ ) -throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } void SAL_CALL ManifestImport::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) -throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } void SAL_CALL ManifestImport::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) -throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) -throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 1263af34a577..094e7d70d103 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -117,33 +117,25 @@ protected: public: ManifestImport( std::vector < css::uno::Sequence < css::beans::PropertyValue > > & rNewVector ); virtual ~ManifestImport() override; - virtual void SAL_CALL startDocument( ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument( ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement( const OUString& aName ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( const OUString& aChars ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) - throw(css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument( ) override; + virtual void SAL_CALL endDocument( ) override; + virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override; + virtual void SAL_CALL endElement( const OUString& aName ) override; + virtual void SAL_CALL characters( const OUString& aChars ) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override; + virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override; private: /// @throws css::uno::RuntimeException - void doFileEntry(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException); + void doFileEntry(StringHashMap &rConvertedAttribs); /// @throws css::uno::RuntimeException - void doEncryptionData(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException); + void doEncryptionData(StringHashMap &rConvertedAttribs); /// @throws css::uno::RuntimeException - void doAlgorithm(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException); + void doAlgorithm(StringHashMap &rConvertedAttribs); /// @throws css::uno::RuntimeException - void doKeyDerivation(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException); + void doKeyDerivation(StringHashMap &rConvertedAttribs); /// @throws css::uno::RuntimeException - void doStartKeyAlg(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException); + void doStartKeyAlg(StringHashMap &rConvertedAttribs); }; #endif diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx index 7ca27786d194..f1661d12a6dc 100644 --- a/package/source/manifest/ManifestReader.cxx +++ b/package/source/manifest/ManifestReader.cxx @@ -47,7 +47,6 @@ ManifestReader::~ManifestReader() { } Sequence< Sequence< PropertyValue > > SAL_CALL ManifestReader::readManifestSequence( const Reference< XInputStream >& rStream ) - throw (css::uno::RuntimeException, std::exception) { Sequence < Sequence < PropertyValue > > aManifestSequence; Reference < XParser > xParser = Parser::create(m_xContext); @@ -95,19 +94,16 @@ Sequence < OUString > ManifestReader::static_getSupportedServiceNames() } OUString ManifestReader::getImplementationName() - throw (RuntimeException, std::exception) { return static_getImplementationName(); } sal_Bool SAL_CALL ManifestReader::supportsService(OUString const & rServiceName) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName ); } Sequence < OUString > ManifestReader::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return static_getSupportedServiceNames(); } diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx index ba9221d5a77e..ba3ad1a1bef2 100644 --- a/package/source/manifest/ManifestReader.hxx +++ b/package/source/manifest/ManifestReader.hxx @@ -43,16 +43,12 @@ public: virtual ~ManifestReader() override; // XManifestReader - virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL readManifestSequence( const css::uno::Reference< css::io::XInputStream >& rStream ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL readManifestSequence( const css::uno::Reference< css::io::XInputStream >& rStream ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // Component constructor static OUString static_getImplementationName(); diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/manifest/ManifestWriter.cxx index 0e40d999356f..aa73e2c9e092 100644 --- a/package/source/manifest/ManifestWriter.cxx +++ b/package/source/manifest/ManifestWriter.cxx @@ -55,7 +55,6 @@ ManifestWriter::~ManifestWriter() // XManifestWriter methods void SAL_CALL ManifestWriter::writeManifestSequence( const Reference< XOutputStream >& rStream, const Sequence< Sequence< PropertyValue > >& rSequence ) - throw (RuntimeException, std::exception) { Reference < XWriter > xSource = Writer::create( m_xContext ); xSource->setOutputStream ( rStream ); @@ -86,18 +85,15 @@ Sequence < OUString > ManifestWriter::static_getSupportedServiceNames() } OUString ManifestWriter::getImplementationName() - throw (RuntimeException, std::exception) { return static_getImplementationName(); } sal_Bool SAL_CALL ManifestWriter::supportsService(OUString const & rServiceName) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence < OUString > ManifestWriter::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return static_getSupportedServiceNames(); } diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx index 0a63befb89f5..ef16d311b6ba 100644 --- a/package/source/manifest/ManifestWriter.hxx +++ b/package/source/manifest/ManifestWriter.hxx @@ -43,16 +43,12 @@ public: virtual ~ManifestWriter() override; // XManifestWriter - virtual void SAL_CALL writeManifestSequence( const css::uno::Reference< css::io::XOutputStream >& rStream, const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL writeManifestSequence( const css::uno::Reference< css::io::XOutputStream >& rStream, const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // Component constructor static OUString static_getImplementationName(); diff --git a/package/source/xstor/disposelistener.cxx b/package/source/xstor/disposelistener.cxx index 6ffafe946d7a..f8436971ada8 100644 --- a/package/source/xstor/disposelistener.cxx +++ b/package/source/xstor/disposelistener.cxx @@ -36,7 +36,6 @@ void OChildDispListener_Impl::OwnerIsDisposed() } void SAL_CALL OChildDispListener_Impl::disposing( const lang::EventObject& Source ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); // ObjectIsDisposed must not contain any locking! diff --git a/package/source/xstor/disposelistener.hxx b/package/source/xstor/disposelistener.hxx index 75d81c8913c3..5abb727cdbff 100644 --- a/package/source/xstor/disposelistener.hxx +++ b/package/source/xstor/disposelistener.hxx @@ -36,7 +36,7 @@ public: void OwnerIsDisposed(); - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; }; #endif diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx index c94d16c277b9..63bc7dc6eca4 100644 --- a/package/source/xstor/ocompinstream.cxx +++ b/package/source/xstor/ocompinstream.cxx @@ -75,7 +75,6 @@ OInputCompStream::~OInputCompStream() } uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aReturn; @@ -105,10 +104,6 @@ uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType ) } sal_Int32 SAL_CALL OInputCompStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -121,10 +116,6 @@ sal_Int32 SAL_CALL OInputCompStream::readBytes( uno::Sequence< sal_Int8 >& aData } sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -138,10 +129,6 @@ sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( uno::Sequence< sal_Int8 >& a } void SAL_CALL OInputCompStream::skipBytes( sal_Int32 nBytesToSkip ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -155,9 +142,6 @@ void SAL_CALL OInputCompStream::skipBytes( sal_Int32 nBytesToSkip ) } sal_Int32 SAL_CALL OInputCompStream::available( ) - throw ( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -171,15 +155,11 @@ sal_Int32 SAL_CALL OInputCompStream::available( ) } void SAL_CALL OInputCompStream::closeInput( ) - throw ( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { dispose(); } uno::Reference< io::XInputStream > SAL_CALL OInputCompStream::getInputStream() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -192,7 +172,6 @@ uno::Reference< io::XInputStream > SAL_CALL OInputCompStream::getInputStream() } uno::Reference< io::XOutputStream > SAL_CALL OInputCompStream::getOutputStream() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -233,7 +212,6 @@ void OInputCompStream::InternalDispose() } void SAL_CALL OInputCompStream::dispose( ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -260,7 +238,6 @@ void SAL_CALL OInputCompStream::dispose( ) } void SAL_CALL OInputCompStream::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -276,7 +253,6 @@ void SAL_CALL OInputCompStream::addEventListener( const uno::Reference< lang::XE } void SAL_CALL OInputCompStream::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -290,8 +266,6 @@ void SAL_CALL OInputCompStream::removeEventListener( const uno::Reference< lang: } sal_Bool SAL_CALL OInputCompStream::hasByID( const OUString& sID ) - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -316,9 +290,6 @@ sal_Bool SAL_CALL OInputCompStream::hasByID( const OUString& sID ) } OUString SAL_CALL OInputCompStream::getTargetByID( const OUString& sID ) - throw ( container::NoSuchElementException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -340,9 +311,6 @@ OUString SAL_CALL OInputCompStream::getTargetByID( const OUString& sID ) } OUString SAL_CALL OInputCompStream::getTypeByID( const OUString& sID ) - throw ( container::NoSuchElementException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -364,9 +332,6 @@ OUString SAL_CALL OInputCompStream::getTypeByID( const OUString& sID ) } uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByID( const OUString& sID ) - throw ( container::NoSuchElementException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -394,8 +359,6 @@ uno::Sequence< beans::StringPair > SAL_CALL OInputCompStream::getRelationshipByI } uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::getRelationshipsByType( const OUString& sType ) - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -429,7 +392,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::g } uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::getAllRelationships() - throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -457,9 +419,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OInputCompStream::g } void SAL_CALL OInputCompStream::insertRelationshipByID( const OUString& /*sID*/, const uno::Sequence< beans::StringPair >& /*aEntry*/, sal_Bool /*bReplace*/ ) - throw ( container::ElementExistException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -476,9 +435,6 @@ void SAL_CALL OInputCompStream::insertRelationshipByID( const OUString& /*sID*/ } void SAL_CALL OInputCompStream::removeRelationshipByID( const OUString& /*sID*/ ) - throw ( container::NoSuchElementException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -495,9 +451,6 @@ void SAL_CALL OInputCompStream::removeRelationshipByID( const OUString& /*sID*/ } void SAL_CALL OInputCompStream::insertRelationships( const uno::Sequence< uno::Sequence< beans::StringPair > >& /*aEntries*/, sal_Bool /*bReplace*/ ) - throw ( container::ElementExistException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -514,8 +467,6 @@ void SAL_CALL OInputCompStream::insertRelationships( const uno::Sequence< uno:: } void SAL_CALL OInputCompStream::clearRelationships() - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -532,7 +483,6 @@ void SAL_CALL OInputCompStream::clearRelationships() } uno::Reference< beans::XPropertySetInfo > SAL_CALL OInputCompStream::getPropertySetInfo() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -547,11 +497,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OInputCompStream::getProperty } void SAL_CALL OInputCompStream::setPropertyValue( const OUString& aPropertyName, const uno::Any& /*aValue*/ ) - throw ( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -574,9 +519,6 @@ void SAL_CALL OInputCompStream::setPropertyValue( const OUString& aPropertyName, } uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -610,9 +552,6 @@ uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp ) void SAL_CALL OInputCompStream::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -628,9 +567,6 @@ void SAL_CALL OInputCompStream::addPropertyChangeListener( void SAL_CALL OInputCompStream::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -646,9 +582,6 @@ void SAL_CALL OInputCompStream::removePropertyChangeListener( void SAL_CALL OInputCompStream::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -664,9 +597,6 @@ void SAL_CALL OInputCompStream::addVetoableChangeListener( void SAL_CALL OInputCompStream::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx index 36c91a54c190..3c37aaf0975e 100644 --- a/package/source/xstor/ocompinstream.hxx +++ b/package/source/xstor/ocompinstream.hxx @@ -63,50 +63,44 @@ public: void InternalDispose(); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; // XInputStream - virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available( ) - throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput( ) - throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override; + virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override; + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override; + virtual sal_Int32 SAL_CALL available( ) override; + virtual void SAL_CALL closeInput( ) override; //XStream - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) override; + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) override; //XComponent - virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; //XRelationshipAccess - virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) throw (css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) throw (css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearRelationships( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) override; + virtual OUString SAL_CALL getTargetByID( const OUString& sID ) override; + virtual OUString SAL_CALL getTypeByID( const OUString& sID ) override; + virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) override; + virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) override; + virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships( ) override; + virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) override; + virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) override; + virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) override; + virtual void SAL_CALL clearRelationships( ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; }; diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx index a173f7990406..d3730a90c670 100644 --- a/package/source/xstor/ohierarchyholder.cxx +++ b/package/source/xstor/ohierarchyholder.cxx @@ -259,7 +259,6 @@ void OHierarchyElement_Impl::TestForClosing() } void SAL_CALL OHierarchyElement_Impl::disposing( const lang::EventObject& Source ) - throw ( uno::RuntimeException, std::exception ) { try { @@ -303,12 +302,10 @@ void OHierarchyElement_Impl::RemoveElement( const ::rtl::Reference< OHierarchyEl // XTransactionListener void SAL_CALL OHierarchyElement_Impl::preCommit( const css::lang::EventObject& /*aEvent*/ ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { } void SAL_CALL OHierarchyElement_Impl::commited( const css::lang::EventObject& /*aEvent*/ ) - throw (css::uno::RuntimeException, std::exception) { try { @@ -324,12 +321,10 @@ void SAL_CALL OHierarchyElement_Impl::commited( const css::lang::EventObject& /* } void SAL_CALL OHierarchyElement_Impl::preRevert( const css::lang::EventObject& /*aEvent*/ ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { } void SAL_CALL OHierarchyElement_Impl::reverted( const css::lang::EventObject& /*aEvent*/ ) - throw (css::uno::RuntimeException, std::exception) { } diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx index 4887d49438cc..219391311ae8 100644 --- a/package/source/xstor/ohierarchyholder.hxx +++ b/package/source/xstor/ohierarchyholder.hxx @@ -92,18 +92,13 @@ public: void RemoveStreamHierarchically( OStringList_Impl& aListPath ); // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XTransactionListener - virtual void SAL_CALL preCommit( const css::lang::EventObject& aEvent ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commited( const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL preRevert( const css::lang::EventObject& aEvent ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reverted( const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL preCommit( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL commited( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL preRevert( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL reverted( const css::lang::EventObject& aEvent ) override; }; diff --git a/package/source/xstor/oseekinstream.cxx b/package/source/xstor/oseekinstream.cxx index 95137f4d836b..8ded31612130 100644 --- a/package/source/xstor/oseekinstream.cxx +++ b/package/source/xstor/oseekinstream.cxx @@ -51,7 +51,6 @@ OInputSeekStream::~OInputSeekStream() } uno::Sequence< uno::Type > SAL_CALL OInputSeekStream::getTypes() - throw ( uno::RuntimeException, std::exception ) { static ::cppu::OTypeCollection* pTypeCollection = nullptr ; @@ -73,7 +72,6 @@ uno::Sequence< uno::Type > SAL_CALL OInputSeekStream::getTypes() } uno::Any SAL_CALL OInputSeekStream::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -102,9 +100,6 @@ void SAL_CALL OInputSeekStream::release() } void SAL_CALL OInputSeekStream::seek( sal_Int64 location ) - throw ( lang::IllegalArgumentException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -123,8 +118,6 @@ void SAL_CALL OInputSeekStream::seek( sal_Int64 location ) } sal_Int64 SAL_CALL OInputSeekStream::getPosition() - throw ( io::IOException, - uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -143,8 +136,6 @@ sal_Int64 SAL_CALL OInputSeekStream::getPosition() } sal_Int64 SAL_CALL OInputSeekStream::getLength() - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) diff --git a/package/source/xstor/oseekinstream.hxx b/package/source/xstor/oseekinstream.hxx index 803f4c7fc783..b8de87c29579 100644 --- a/package/source/xstor/oseekinstream.hxx +++ b/package/source/xstor/oseekinstream.hxx @@ -42,17 +42,17 @@ public: virtual ~OInputSeekStream() override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL seek( sal_Int64 location ) override; + virtual sal_Int64 SAL_CALL getPosition() override; + virtual sal_Int64 SAL_CALL getLength() override; }; diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 8506f7e352a7..c4e5822c493e 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -1422,7 +1422,6 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetRawInStream() } ::comphelper::SequenceAsHashMap OWriteStream_Impl::GetCommonRootEncryptionData() - throw ( packages::NoEncryptionException ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ; @@ -1861,7 +1860,6 @@ void OWriteStream::ModifyParentUnlockMutex_Impl( ::osl::ResettableMutexGuard& aG } uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aReturn; @@ -1923,7 +1921,6 @@ void SAL_CALL OWriteStream::release() throw() } uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes() - throw( uno::RuntimeException, std::exception ) { if (! m_pData->m_pTypeCollection) { @@ -2036,16 +2033,11 @@ uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes() namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; } uno::Sequence< sal_Int8 > SAL_CALL OWriteStream::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } sal_Int32 SAL_CALL OWriteStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2064,10 +2056,6 @@ sal_Int32 SAL_CALL OWriteStream::readBytes( uno::Sequence< sal_Int8 >& aData, sa } sal_Int32 SAL_CALL OWriteStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2086,10 +2074,6 @@ sal_Int32 SAL_CALL OWriteStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData } void SAL_CALL OWriteStream::skipBytes( sal_Int32 nBytesToSkip ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2108,9 +2092,6 @@ void SAL_CALL OWriteStream::skipBytes( sal_Int32 nBytesToSkip ) } sal_Int32 SAL_CALL OWriteStream::available( ) - throw ( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2130,9 +2111,6 @@ sal_Int32 SAL_CALL OWriteStream::available( ) } void SAL_CALL OWriteStream::closeInput( ) - throw ( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2156,7 +2134,6 @@ void SAL_CALL OWriteStream::closeInput( ) } uno::Reference< io::XInputStream > SAL_CALL OWriteStream::getInputStream() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2173,7 +2150,6 @@ uno::Reference< io::XInputStream > SAL_CALL OWriteStream::getInputStream() } uno::Reference< io::XOutputStream > SAL_CALL OWriteStream::getOutputStream() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2200,10 +2176,6 @@ uno::Reference< io::XOutputStream > SAL_CALL OWriteStream::getOutputStream() } void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2267,10 +2239,6 @@ void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) } void SAL_CALL OWriteStream::flush() - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { // In case stream is flushed its current version becomes visible // to the parent storage. Usually parent storage flushes the stream @@ -2318,10 +2286,6 @@ void OWriteStream::CloseOutput_Impl() } void SAL_CALL OWriteStream::closeOutput() - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2343,9 +2307,6 @@ void SAL_CALL OWriteStream::closeOutput() } void SAL_CALL OWriteStream::seek( sal_Int64 location ) - throw ( lang::IllegalArgumentException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2364,8 +2325,6 @@ void SAL_CALL OWriteStream::seek( sal_Int64 location ) } sal_Int64 SAL_CALL OWriteStream::getPosition() - throw ( io::IOException, - uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2384,8 +2343,6 @@ sal_Int64 SAL_CALL OWriteStream::getPosition() } sal_Int64 SAL_CALL OWriteStream::getLength() - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2404,8 +2361,6 @@ sal_Int64 SAL_CALL OWriteStream::getLength() } void SAL_CALL OWriteStream::truncate() - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2436,7 +2391,6 @@ void SAL_CALL OWriteStream::truncate() } void SAL_CALL OWriteStream::dispose() - throw ( uno::RuntimeException, std::exception ) { // should be an internal method since it can be called only from parent storage { @@ -2500,7 +2454,6 @@ void SAL_CALL OWriteStream::dispose() void SAL_CALL OWriteStream::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2516,7 +2469,6 @@ void SAL_CALL OWriteStream::addEventListener( void SAL_CALL OWriteStream::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2531,8 +2483,6 @@ void SAL_CALL OWriteStream::removeEventListener( } void SAL_CALL OWriteStream::setEncryptionPassword( const OUString& aPass ) - throw ( uno::RuntimeException, - io::IOException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2552,8 +2502,6 @@ void SAL_CALL OWriteStream::setEncryptionPassword( const OUString& aPass ) } void SAL_CALL OWriteStream::removeEncryption() - throw ( uno::RuntimeException, - io::IOException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2573,7 +2521,6 @@ void SAL_CALL OWriteStream::removeEncryption() } void SAL_CALL OWriteStream::setEncryptionData( const uno::Sequence< beans::NamedValue >& aEncryptionData ) - throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2593,7 +2540,6 @@ void SAL_CALL OWriteStream::setEncryptionData( const uno::Sequence< beans::Named } sal_Bool SAL_CALL OWriteStream::hasEncryptionData() - throw (uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2630,8 +2576,6 @@ sal_Bool SAL_CALL OWriteStream::hasEncryptionData() } sal_Bool SAL_CALL OWriteStream::hasByID( const OUString& sID ) - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2659,9 +2603,6 @@ sal_Bool SAL_CALL OWriteStream::hasByID( const OUString& sID ) } OUString SAL_CALL OWriteStream::getTargetByID( const OUString& sID ) - throw ( container::NoSuchElementException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2683,9 +2624,6 @@ OUString SAL_CALL OWriteStream::getTargetByID( const OUString& sID ) } OUString SAL_CALL OWriteStream::getTypeByID( const OUString& sID ) - throw ( container::NoSuchElementException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2707,9 +2645,6 @@ OUString SAL_CALL OWriteStream::getTypeByID( const OUString& sID ) } uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID( const OUString& sID ) - throw ( container::NoSuchElementException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2737,8 +2672,6 @@ uno::Sequence< beans::StringPair > SAL_CALL OWriteStream::getRelationshipByID( } uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getRelationshipsByType( const OUString& sType ) - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2772,7 +2705,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getRe } uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getAllRelationships() - throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2789,9 +2721,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OWriteStream::getAl } void SAL_CALL OWriteStream::insertRelationshipByID( const OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, sal_Bool bReplace ) - throw ( container::ElementExistException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2852,9 +2781,6 @@ void SAL_CALL OWriteStream::insertRelationshipByID( const OUString& sID, const } void SAL_CALL OWriteStream::removeRelationshipByID( const OUString& sID ) - throw ( container::NoSuchElementException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2893,9 +2819,6 @@ void SAL_CALL OWriteStream::removeRelationshipByID( const OUString& sID ) } void SAL_CALL OWriteStream::insertRelationships( const uno::Sequence< uno::Sequence< beans::StringPair > >& aEntries, sal_Bool bReplace ) - throw ( container::ElementExistException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2975,8 +2898,6 @@ void SAL_CALL OWriteStream::insertRelationships( const uno::Sequence< uno::Sequ } void SAL_CALL OWriteStream::clearRelationships() - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2995,7 +2916,6 @@ void SAL_CALL OWriteStream::clearRelationships() } uno::Reference< beans::XPropertySetInfo > SAL_CALL OWriteStream::getPropertySetInfo() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3004,11 +2924,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OWriteStream::getPropertySetI } void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw ( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3131,9 +3046,6 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con } uno::Any SAL_CALL OWriteStream::getPropertyValue( const OUString& aProp ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3193,9 +3105,6 @@ uno::Any SAL_CALL OWriteStream::getPropertyValue( const OUString& aProp ) void SAL_CALL OWriteStream::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3211,9 +3120,6 @@ void SAL_CALL OWriteStream::addPropertyChangeListener( void SAL_CALL OWriteStream::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3229,9 +3135,6 @@ void SAL_CALL OWriteStream::removePropertyChangeListener( void SAL_CALL OWriteStream::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3247,9 +3150,6 @@ void SAL_CALL OWriteStream::addVetoableChangeListener( void SAL_CALL OWriteStream::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3310,9 +3210,6 @@ void OWriteStream::BroadcastTransaction( sal_Int8 nMessage ) } } void SAL_CALL OWriteStream::commit() - throw ( io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::commit" ); @@ -3374,9 +3271,6 @@ void SAL_CALL OWriteStream::commit() } void SAL_CALL OWriteStream::revert() - throw ( io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::revert" ); @@ -3441,7 +3335,6 @@ void SAL_CALL OWriteStream::revert() // XTransactionBroadcaster void SAL_CALL OWriteStream::addTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3459,7 +3352,6 @@ void SAL_CALL OWriteStream::addTransactionListener( const uno::Reference< embed: } void SAL_CALL OWriteStream::removeTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx index dd6fd0471df9..fab951b32c69 100644 --- a/package/source/xstor/owriteablestream.hxx +++ b/package/source/xstor/owriteablestream.hxx @@ -133,7 +133,7 @@ private: bool bHierarchyAccess ); /// @throws css::packages::NoEncryptionException - ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData() throw ( css::packages::NoEncryptionException ); + ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData(); css::uno::Sequence< css::beans::PropertyValue > ReadPackageStreamProperties(); css::uno::Sequence< css::beans::PropertyValue > InsertOwnProps( @@ -279,100 +279,81 @@ public: void DeInit(); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XInputStream - virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available( ) - throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput( ) - throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override; + virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override; + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override; + virtual sal_Int32 SAL_CALL available( ) override; + virtual void SAL_CALL closeInput( ) override; // XOutputStream - virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL flush( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeOutput( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override; + virtual void SAL_CALL flush( ) override; + virtual void SAL_CALL closeOutput( ) override; //XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL seek( sal_Int64 location ) override; + virtual sal_Int64 SAL_CALL getPosition() override; + virtual sal_Int64 SAL_CALL getLength() override; //XStream - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) override; + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) override; // XTruncate - virtual void SAL_CALL truncate() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL truncate() override; //XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; //XEncryptionProtectedSource - virtual void SAL_CALL setEncryptionPassword( const OUString& aPass ) - throw ( css::uno::RuntimeException, - css::io::IOException, std::exception ) override; - virtual void SAL_CALL removeEncryption() - throw ( css::uno::RuntimeException, - css::io::IOException, std::exception ) override; + virtual void SAL_CALL setEncryptionPassword( const OUString& aPass ) override; + virtual void SAL_CALL removeEncryption() override; //XEncryptionProtectedSource2 - virtual void SAL_CALL setEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasEncryptionData() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEncryptionData( const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) override; + virtual sal_Bool SAL_CALL hasEncryptionData() override; //XRelationshipAccess - virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) throw (css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (css::container::NoSuchElementException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) throw (css::container::ElementExistException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearRelationships( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) override; + virtual OUString SAL_CALL getTargetByID( const OUString& sID ) override; + virtual OUString SAL_CALL getTypeByID( const OUString& sID ) override; + virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) override; + virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) override; + virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships( ) override; + virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) override; + virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) override; + virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) override; + virtual void SAL_CALL clearRelationships( ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XTransactedObject - virtual void SAL_CALL commit() - throw ( css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL revert() - throw ( css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL commit() override; + virtual void SAL_CALL revert() override; // XTransactionBroadcaster virtual void SAL_CALL addTransactionListener( - const css::uno::Reference< css::embed::XTransactionListener >& aListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XTransactionListener >& aListener ) override; virtual void SAL_CALL removeTransactionListener( - const css::uno::Reference< css::embed::XTransactionListener >& aListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XTransactionListener >& aListener ) override; }; diff --git a/package/source/xstor/selfterminatefilestream.cxx b/package/source/xstor/selfterminatefilestream.cxx index 7575a18988cd..9ee3673ffd10 100644 --- a/package/source/xstor/selfterminatefilestream.cxx +++ b/package/source/xstor/selfterminatefilestream.cxx @@ -63,66 +63,41 @@ void OSelfTerminateFileStream::CloseStreamDeleteFile() } sal_Int32 SAL_CALL OSelfTerminateFileStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { return m_xInputStream->readBytes( aData, nBytesToRead ); } sal_Int32 SAL_CALL OSelfTerminateFileStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { return m_xInputStream->readSomeBytes( aData, nMaxBytesToRead ); } void SAL_CALL OSelfTerminateFileStream::skipBytes( sal_Int32 nBytesToSkip ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { return m_xInputStream->skipBytes( nBytesToSkip ); } sal_Int32 SAL_CALL OSelfTerminateFileStream::available( ) - throw ( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { return m_xInputStream->available(); } void SAL_CALL OSelfTerminateFileStream::closeInput( ) - throw ( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { CloseStreamDeleteFile(); } void SAL_CALL OSelfTerminateFileStream::seek( sal_Int64 location ) - throw ( lang::IllegalArgumentException, - io::IOException, - uno::RuntimeException, std::exception ) { m_xSeekable->seek( location ); } sal_Int64 SAL_CALL OSelfTerminateFileStream::getPosition() - throw ( io::IOException, - uno::RuntimeException, std::exception) { return m_xSeekable->getPosition(); } sal_Int64 SAL_CALL OSelfTerminateFileStream::getLength() - throw ( io::IOException, - uno::RuntimeException, std::exception ) { return m_xSeekable->getLength(); } diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx index abd60c4676d1..661cbcf2fc68 100644 --- a/package/source/xstor/selfterminatefilestream.hxx +++ b/package/source/xstor/selfterminatefilestream.hxx @@ -46,21 +46,16 @@ public: void CloseStreamDeleteFile(); // XInputStream - virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available() - throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput() - throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override; + virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override; + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override; + virtual sal_Int32 SAL_CALL available() override; + virtual void SAL_CALL closeInput() override; //XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL seek( sal_Int64 location ) override; + virtual sal_Int64 SAL_CALL getPosition() override; + virtual sal_Int64 SAL_CALL getLength() override; }; diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx index fbada20a77f5..cd325742016c 100644 --- a/package/source/xstor/switchpersistencestream.cxx +++ b/package/source/xstor/switchpersistencestream.cxx @@ -206,7 +206,6 @@ void SwitchablePersistenceStream::CloseAll_Impl() // css::io::XStream uno::Reference< io::XInputStream > SAL_CALL SwitchablePersistenceStream::getInputStream( ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -216,7 +215,6 @@ uno::Reference< io::XInputStream > SAL_CALL SwitchablePersistenceStream::getInpu } uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOutputStream( ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -227,7 +225,6 @@ uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOut // css::io::XInputStream ::sal_Int32 SAL_CALL SwitchablePersistenceStream::readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -242,7 +239,6 @@ uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOut } ::sal_Int32 SAL_CALL SwitchablePersistenceStream::readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -257,7 +253,6 @@ uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOut } void SAL_CALL SwitchablePersistenceStream::skipBytes( ::sal_Int32 nBytesToSkip ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -272,7 +267,6 @@ void SAL_CALL SwitchablePersistenceStream::skipBytes( ::sal_Int32 nBytesToSkip ) } ::sal_Int32 SAL_CALL SwitchablePersistenceStream::available( ) - throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -287,7 +281,6 @@ void SAL_CALL SwitchablePersistenceStream::skipBytes( ::sal_Int32 nBytesToSkip ) } void SAL_CALL SwitchablePersistenceStream::closeInput() - throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -301,7 +294,6 @@ void SAL_CALL SwitchablePersistenceStream::closeInput() // css::io::XOutputStream void SAL_CALL SwitchablePersistenceStream::writeBytes( const uno::Sequence< ::sal_Int8 >& aData ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -319,7 +311,6 @@ void SAL_CALL SwitchablePersistenceStream::writeBytes( const uno::Sequence< ::sa } void SAL_CALL SwitchablePersistenceStream::flush( ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -340,7 +331,6 @@ void SAL_CALL SwitchablePersistenceStream::flush( ) } void SAL_CALL SwitchablePersistenceStream::closeOutput( ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -354,7 +344,6 @@ void SAL_CALL SwitchablePersistenceStream::closeOutput( ) // css::io::XTruncate void SAL_CALL SwitchablePersistenceStream::truncate( ) - throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -373,7 +362,6 @@ void SAL_CALL SwitchablePersistenceStream::truncate( ) // css::io::XSeekable void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location ) - throw (lang::IllegalArgumentException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -388,7 +376,6 @@ void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location ) } ::sal_Int64 SAL_CALL SwitchablePersistenceStream::getPosition( ) - throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -403,7 +390,6 @@ void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location ) } ::sal_Int64 SAL_CALL SwitchablePersistenceStream::getLength( ) - throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -418,7 +404,6 @@ void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location ) } void SAL_CALL SwitchablePersistenceStream::waitForCompletion() - throw (css::io::IOException, css::uno::RuntimeException, std::exception) { if ( !m_pStreamData ) throw io::NotConnectedException(); diff --git a/package/source/xstor/switchpersistencestream.hxx b/package/source/xstor/switchpersistencestream.hxx index dacb28ad805d..a42ca023e227 100644 --- a/package/source/xstor/switchpersistencestream.hxx +++ b/package/source/xstor/switchpersistencestream.hxx @@ -77,31 +77,31 @@ public: void CopyAndSwitchPersistenceTo( const css::uno::Reference< css::io::XStream >& xStream ); // css::io::XStream - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) override; + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) override; // css::io::XInputStream - virtual ::sal_Int32 SAL_CALL readBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL available( ) throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput( ) throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL readBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) override; + virtual ::sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) override; + virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) override; + virtual ::sal_Int32 SAL_CALL available( ) override; + virtual void SAL_CALL closeInput( ) override; // css::io::XOutputStream - virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL flush( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeOutput( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) override; + virtual void SAL_CALL flush( ) override; + virtual void SAL_CALL closeOutput( ) override; // css::io::XTruncate - virtual void SAL_CALL truncate( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL truncate( ) override; // css::io::XSeekable - virtual void SAL_CALL seek( ::sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int64 SAL_CALL getPosition( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int64 SAL_CALL getLength( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL seek( ::sal_Int64 location ) override; + virtual ::sal_Int64 SAL_CALL getPosition( ) override; + virtual ::sal_Int64 SAL_CALL getLength( ) override; // css::io::XAsyncOutputMonitor - virtual void SAL_CALL waitForCompletion( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL waitForCompletion( ) override; }; diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx index d5031b4dbc03..a7b5c462167d 100644 --- a/package/source/xstor/xfactory.cxx +++ b/package/source/xstor/xfactory.cxx @@ -84,8 +84,6 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::impl_staticCreateSel } uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstance() - throw ( uno::Exception, - uno::RuntimeException, std::exception ) { // TODO: reimplement TempStream service to support XStream interface uno::Reference < io::XStream > xTempStream( @@ -103,8 +101,6 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstance() uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithArguments( const uno::Sequence< uno::Any >& aArguments ) - throw ( uno::Exception, - uno::RuntimeException, std::exception ) { // The request for storage can be done with up to three arguments @@ -285,19 +281,16 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr } OUString SAL_CALL OStorageFactory::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return impl_staticGetImplementationName(); } sal_Bool SAL_CALL OStorageFactory::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL OStorageFactory::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { return impl_staticGetSupportedServiceNames(); } diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx index 13c55e85003d..1e07f4e492af 100644 --- a/package/source/xstor/xfactory.hxx +++ b/package/source/xstor/xfactory.hxx @@ -47,13 +47,13 @@ public: const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); // XSingleServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index e43241b40b95..98b6ac22c229 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -1324,7 +1324,6 @@ void OStorage_Impl::Revert() } ::comphelper::SequenceAsHashMap OStorage_Impl::GetCommonRootEncryptionData() - throw ( packages::NoEncryptionException ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ; @@ -1631,14 +1630,6 @@ void OStorage_Impl::CloneStreamElement( const OUString& aStreamName, bool bEncryptionDataProvided, const ::comphelper::SequenceAsHashMap& aEncryptionData, uno::Reference< io::XStream >& xTargetStream ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::WrongPasswordException, - packages::NoEncryptionException, - container::NoSuchElementException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException ) { SotElement_Impl *pElement = FindElement( aStreamName ); if ( !pElement ) @@ -2149,7 +2140,6 @@ void OStorage::MakeLinkToSubComponent_Impl( const uno::Reference< lang::XCompone // XInterface uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aReturn; @@ -2222,7 +2212,6 @@ void SAL_CALL OStorage::release() throw() // XTypeProvider uno::Sequence< uno::Type > SAL_CALL OStorage::getTypes() - throw( uno::RuntimeException, std::exception ) { if (! m_pData->m_pTypeCollection) { @@ -2290,18 +2279,12 @@ uno::Sequence< uno::Type > SAL_CALL OStorage::getTypes() namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; } uno::Sequence< sal_Int8 > SAL_CALL OStorage::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } // XStorage void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >& xDest ) - throw ( embed::InvalidStorageException, - io::IOException, - lang::IllegalArgumentException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2361,12 +2344,6 @@ void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >& uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::WrongPasswordException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2460,24 +2437,12 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement( uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::NoEncryptionException, - packages::WrongPasswordException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { return openEncryptedStream( aStreamName, nOpenMode, ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) ); } uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement( const OUString& aStorName, sal_Int32 nStorageMode ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2623,12 +2588,6 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement( } uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const OUString& aStreamName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::WrongPasswordException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2703,24 +2662,12 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const OUStr uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStreamElement( const OUString& aStreamName, const OUString& aPass ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::NoEncryptionException, - packages::WrongPasswordException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { return cloneEncryptedStream( aStreamName, ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) ); } void SAL_CALL OStorage::copyLastCommitTo( const uno::Reference< embed::XStorage >& xTargetStorage ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2780,11 +2727,6 @@ void SAL_CALL OStorage::copyLastCommitTo( void SAL_CALL OStorage::copyStorageElementLastCommitTo( const OUString& aStorName, const uno::Reference< embed::XStorage >& xTargetStorage ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2873,10 +2815,6 @@ void SAL_CALL OStorage::copyStorageElementLastCommitTo( } sal_Bool SAL_CALL OStorage::isStreamElement( const OUString& aElementName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2940,10 +2878,6 @@ sal_Bool SAL_CALL OStorage::isStreamElement( const OUString& aElementName ) } sal_Bool SAL_CALL OStorage::isStorageElement( const OUString& aElementName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3007,12 +2941,6 @@ sal_Bool SAL_CALL OStorage::isStorageElement( const OUString& aElementName ) } void SAL_CALL OStorage::removeElement( const OUString& aElementName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3096,13 +3024,6 @@ void SAL_CALL OStorage::removeElement( const OUString& aElementName ) } void SAL_CALL OStorage::renameElement( const OUString& aElementName, const OUString& aNewName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - container::ElementExistException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3198,13 +3119,6 @@ void SAL_CALL OStorage::renameElement( const OUString& aElementName, const OUStr void SAL_CALL OStorage::copyElementTo( const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, const OUString& aNewName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - container::ElementExistException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3297,13 +3211,6 @@ void SAL_CALL OStorage::copyElementTo( const OUString& aElementName, void SAL_CALL OStorage::moveElementTo( const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, const OUString& aNewName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - container::ElementExistException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3407,13 +3314,6 @@ void SAL_CALL OStorage::moveElementTo( const OUString& aElementName, // XStorage2 uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream( const OUString& aStreamName, sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::NoEncryptionException, - packages::WrongPasswordException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3514,13 +3414,6 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream( uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream( const OUString& aStreamName, const uno::Sequence< beans::NamedValue >& aEncryptionData ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::NoEncryptionException, - packages::WrongPasswordException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3601,12 +3494,6 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream( // XStorageRawAccess uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement( const OUString& sStreamName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3705,13 +3592,6 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement( uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement( const OUString& sStreamName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::NoEncryptionException, - container::NoSuchElementException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3820,13 +3700,6 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement( void SAL_CALL OStorage::insertRawEncrStreamElement( const OUString& aStreamName, const uno::Reference< io::XInputStream >& xInStream ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::NoRawFormatException, - container::ElementExistException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3912,9 +3785,6 @@ void SAL_CALL OStorage::insertRawEncrStreamElement( const OUString& aStreamName, // XTransactedObject void SAL_CALL OStorage::commit() - throw ( io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { uno::Reference< util::XModifiable > xParentModif; @@ -3975,9 +3845,6 @@ void SAL_CALL OStorage::commit() } void SAL_CALL OStorage::revert() - throw ( io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { // the method removes all the changes done after last commit @@ -4046,7 +3913,6 @@ void SAL_CALL OStorage::revert() // XTransactionBroadcaster void SAL_CALL OStorage::addTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4061,7 +3927,6 @@ void SAL_CALL OStorage::addTransactionListener( const uno::Reference< embed::XTr } void SAL_CALL OStorage::removeTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4081,7 +3946,6 @@ void SAL_CALL OStorage::removeTransactionListener( const uno::Reference< embed:: // to the service back. sal_Bool SAL_CALL OStorage::isModified() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4095,8 +3959,6 @@ sal_Bool SAL_CALL OStorage::isModified() } void SAL_CALL OStorage::setModified( sal_Bool bModified ) - throw ( beans::PropertyVetoException, - uno::RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4122,7 +3984,6 @@ void SAL_CALL OStorage::setModified( sal_Bool bModified ) void SAL_CALL OStorage::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4139,7 +4000,6 @@ void SAL_CALL OStorage::addModifyListener( void SAL_CALL OStorage::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4157,9 +4017,6 @@ void SAL_CALL OStorage::removeModifyListener( // XNameAccess uno::Any SAL_CALL OStorage::getByName( const OUString& aName ) - throw ( container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4220,7 +4077,6 @@ uno::Any SAL_CALL OStorage::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL OStorage::getElementNames() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4253,7 +4109,6 @@ uno::Sequence< OUString > SAL_CALL OStorage::getElementNames() } sal_Bool SAL_CALL OStorage::hasByName( const OUString& aName ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4295,7 +4150,6 @@ sal_Bool SAL_CALL OStorage::hasByName( const OUString& aName ) } uno::Type SAL_CALL OStorage::getElementType() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4310,7 +4164,6 @@ uno::Type SAL_CALL OStorage::getElementType() } sal_Bool SAL_CALL OStorage::hasElements() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4344,7 +4197,6 @@ sal_Bool SAL_CALL OStorage::hasElements() // XComponent void SAL_CALL OStorage::dispose() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4378,7 +4230,6 @@ void SAL_CALL OStorage::dispose() void SAL_CALL OStorage::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4394,7 +4245,6 @@ void SAL_CALL OStorage::addEventListener( void SAL_CALL OStorage::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4411,15 +4261,11 @@ void SAL_CALL OStorage::removeEventListener( // XEncryptionProtectedSource void SAL_CALL OStorage::setEncryptionPassword( const OUString& aPass ) - throw ( uno::RuntimeException, - io::IOException, std::exception ) { setEncryptionData( ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) ); } void SAL_CALL OStorage::removeEncryption() - throw ( uno::RuntimeException, - io::IOException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4489,8 +4335,6 @@ void SAL_CALL OStorage::removeEncryption() // XEncryptionProtectedSource2 void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValue >& aEncryptionData ) - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4550,7 +4394,6 @@ void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValu } sal_Bool SAL_CALL OStorage::hasEncryptionData() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4560,7 +4403,6 @@ sal_Bool SAL_CALL OStorage::hasEncryptionData() // XEncryptionProtectedStorage void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::NamedValue >& aAlgorithms ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4625,7 +4467,6 @@ void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::Nam } uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4691,7 +4532,6 @@ uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms() // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL OStorage::getPropertySetInfo() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4706,11 +4546,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL OStorage::getPropertySetInfo( } void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw ( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4813,9 +4648,6 @@ void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const u } uno::Any SAL_CALL OStorage::getPropertyValue( const OUString& aPropertyName ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4919,9 +4751,6 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const OUString& aPropertyName ) void SAL_CALL OStorage::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4937,9 +4766,6 @@ void SAL_CALL OStorage::addPropertyChangeListener( void SAL_CALL OStorage::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4955,9 +4781,6 @@ void SAL_CALL OStorage::removePropertyChangeListener( void SAL_CALL OStorage::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4973,9 +4796,6 @@ void SAL_CALL OStorage::addVetoableChangeListener( void SAL_CALL OStorage::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw ( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4993,8 +4813,6 @@ void SAL_CALL OStorage::removeVetoableChangeListener( // TODO/LATER: the storage and stream implementations of this interface are very similar, they could use a helper class sal_Bool SAL_CALL OStorage::hasByID( const OUString& sID ) - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5022,9 +4840,6 @@ sal_Bool SAL_CALL OStorage::hasByID( const OUString& sID ) } OUString SAL_CALL OStorage::getTargetByID( const OUString& sID ) - throw ( container::NoSuchElementException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5046,9 +4861,6 @@ OUString SAL_CALL OStorage::getTargetByID( const OUString& sID ) } OUString SAL_CALL OStorage::getTypeByID( const OUString& sID ) - throw ( container::NoSuchElementException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5070,9 +4882,6 @@ OUString SAL_CALL OStorage::getTypeByID( const OUString& sID ) } uno::Sequence< beans::StringPair > SAL_CALL OStorage::getRelationshipByID( const OUString& sID ) - throw ( container::NoSuchElementException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5100,8 +4909,6 @@ uno::Sequence< beans::StringPair > SAL_CALL OStorage::getRelationshipByID( cons } uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getRelationshipsByType( const OUString& sType ) - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5136,7 +4943,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getRelati } uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getAllRelationships() - throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5174,9 +4980,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getAllRel } void SAL_CALL OStorage::insertRelationshipByID( const OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, sal_Bool bReplace ) - throw ( container::ElementExistException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5237,9 +5040,6 @@ void SAL_CALL OStorage::insertRelationshipByID( const OUString& sID, const uno: } void SAL_CALL OStorage::removeRelationshipByID( const OUString& sID ) - throw ( container::NoSuchElementException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5278,9 +5078,6 @@ void SAL_CALL OStorage::removeRelationshipByID( const OUString& sID ) } void SAL_CALL OStorage::insertRelationships( const uno::Sequence< uno::Sequence< beans::StringPair > >& aEntries, sal_Bool bReplace ) - throw ( container::ElementExistException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5360,8 +5157,6 @@ void SAL_CALL OStorage::insertRelationships( const uno::Sequence< uno::Sequence } void SAL_CALL OStorage::clearRelationships() - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5383,13 +5178,6 @@ void SAL_CALL OStorage::clearRelationships() void SAL_CALL OStorage::insertRawNonEncrStreamElementDirect( const OUString& /*sStreamName*/, const uno::Reference< io::XInputStream >& /*xInStream*/ ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::NoRawFormatException, - container::ElementExistException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { // not implemented currently because there is still no demand // might need to be implemented if direct copying of compressed streams is used @@ -5400,12 +5188,6 @@ void SAL_CALL OStorage::insertStreamElementDirect( const OUString& aStreamName, const uno::Reference< io::XInputStream >& xInStream, const uno::Sequence< beans::PropertyValue >& aProps ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::ElementExistException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5488,13 +5270,6 @@ void SAL_CALL OStorage::copyElementDirectlyTo( const OUString& aElementName, const uno::Reference< embed::XOptimizedStorage >& xDest, const OUString& aNewName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - container::ElementExistException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5586,11 +5361,6 @@ void SAL_CALL OStorage::copyElementDirectlyTo( } void SAL_CALL OStorage::writeAndAttachToStream( const uno::Reference< io::XStream >& xStream ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5655,11 +5425,6 @@ void SAL_CALL OStorage::writeAndAttachToStream( const uno::Reference< io::XStrea void SAL_CALL OStorage::attachToURL( const OUString& sURL, sal_Bool bReadOnly ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5734,14 +5499,6 @@ void SAL_CALL OStorage::attachToURL( const OUString& sURL, } uno::Any SAL_CALL OStorage::getElementPropertyValue( const OUString& aElementName, const OUString& aPropertyName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - io::IOException, - beans::UnknownPropertyException, - beans::PropertyVetoException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5837,12 +5594,6 @@ uno::Any SAL_CALL OStorage::getElementPropertyValue( const OUString& aElementNam } void SAL_CALL OStorage::copyStreamElementData( const OUString& aStreamName, const uno::Reference< io::XStream >& xTargetStream ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::WrongPasswordException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5921,12 +5672,6 @@ void SAL_CALL OStorage::copyStreamElementData( const OUString& aStreamName, cons // XHierarchicalStorageAccess uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamElementByHierarchicalName( const OUString& aStreamPath, ::sal_Int32 nOpenMode ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::WrongPasswordException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5985,24 +5730,11 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamEle } uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamElementByHierarchicalName( const OUString& aStreamPath, ::sal_Int32 nOpenMode, const OUString& sPassword ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::NoEncryptionException, - packages::WrongPasswordException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { return openEncryptedStreamByHierarchicalName( aStreamPath, nOpenMode, ::comphelper::OStorageHelper::CreatePackageEncryptionData( sPassword ) ); } void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const OUString& aStreamPath ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -6030,14 +5762,6 @@ void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const OUString& a // XHierarchicalStorageAccess2 uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncryptedStreamByHierarchicalName( const OUString& aStreamPath, ::sal_Int32 nOpenMode, const uno::Sequence< beans::NamedValue >& aEncryptionData ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::NoEncryptionException, - packages::WrongPasswordException, - container::NoSuchElementException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx index a8a84ecdff60..6bb5bc65919b 100644 --- a/package/source/xstor/xstorage.hxx +++ b/package/source/xstor/xstorage.hxx @@ -222,7 +222,7 @@ struct OStorage_Impl void Revert(); /// @throws css::packages::NoEncryptionException - ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData() throw ( css::packages::NoEncryptionException ); + ::comphelper::SequenceAsHashMap GetCommonRootEncryptionData(); void CopyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest, bool bDirect ); @@ -260,15 +260,7 @@ struct OStorage_Impl const OUString& aStreamName, bool bPassProvided, const ::comphelper::SequenceAsHashMap& aEncryptionData, - css::uno::Reference< css::io::XStream >& xTargetStream ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::WrongPasswordException, - css::packages::NoEncryptionException, - css::container::NoSuchElementException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException ); + css::uno::Reference< css::io::XStream >& xTargetStream ); void RemoveStreamRelInfo( const OUString& aOriginalName ); void CreateRelStorage(); @@ -337,8 +329,7 @@ public: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire() throw() override; @@ -346,466 +337,201 @@ public: // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XStorage - virtual void SAL_CALL copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest ) override; virtual css::uno::Reference< css::io::XStream > SAL_CALL openStreamElement( - const OUString& aStreamName, sal_Int32 nOpenMode ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::WrongPasswordException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& aStreamName, sal_Int32 nOpenMode ) override; virtual css::uno::Reference< css::io::XStream > SAL_CALL openEncryptedStreamElement( - const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::NoEncryptionException, - css::packages::WrongPasswordException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass ) override; virtual css::uno::Reference< css::embed::XStorage > SAL_CALL openStorageElement( - const OUString& aStorName, sal_Int32 nStorageMode ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& aStorName, sal_Int32 nStorageMode ) override; virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneStreamElement( - const OUString& aStreamName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::WrongPasswordException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& aStreamName ) override; virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneEncryptedStreamElement( - const OUString& aStreamName, const OUString& aPass ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::NoEncryptionException, - css::packages::WrongPasswordException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& aStreamName, const OUString& aPass ) override; virtual void SAL_CALL copyLastCommitTo( - const css::uno::Reference< css::embed::XStorage >& xTargetStorage ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XStorage >& xTargetStorage ) override; virtual void SAL_CALL copyStorageElementLastCommitTo( const OUString& aStorName, - const css::uno::Reference< css::embed::XStorage >& xTargetStorage ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; - - virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) - throw ( css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - css::embed::InvalidStorageException, - css::uno::RuntimeException, std::exception ) override; - - virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) - throw ( css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - css::embed::InvalidStorageException, - css::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL removeElement( const OUString& aElementName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::container::ElementExistException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XStorage >& xTargetStorage ) override; + + virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) override; + + virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) override; + + virtual void SAL_CALL removeElement( const OUString& aElementName ) override; + + virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName ) override; virtual void SAL_CALL copyElementTo( const OUString& aElementName, const css::uno::Reference< css::embed::XStorage >& xDest, - const OUString& aNewName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::container::ElementExistException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& aNewName ) override; virtual void SAL_CALL moveElementTo( const OUString& aElementName, const css::uno::Reference< css::embed::XStorage >& xDest, - const OUString& rNewName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::container::ElementExistException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& rNewName ) override; // XStorage2 - virtual css::uno::Reference< css::io::XStream > SAL_CALL openEncryptedStream( const OUString& sStreamName, ::sal_Int32 nOpenMode, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::NoEncryptionException, - css::packages::WrongPasswordException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneEncryptedStream( const OUString& sStreamName, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::NoEncryptionException, - css::packages::WrongPasswordException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::io::XStream > SAL_CALL openEncryptedStream( const OUString& sStreamName, ::sal_Int32 nOpenMode, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) override; + + virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneEncryptedStream( const OUString& sStreamName, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) override; // XStorageRawAccess virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getPlainRawStreamElement( - const OUString& sStreamName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& sStreamName ) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getRawEncrStreamElement( - const OUString& sStreamName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::NoEncryptionException, - css::container::NoSuchElementException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& sStreamName ) override; virtual void SAL_CALL insertRawEncrStreamElement( const OUString& aStreamName, - const css::uno::Reference< css::io::XInputStream >& xInStream ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::NoRawFormatException, - css::container::ElementExistException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::io::XInputStream >& xInStream ) override; // XTransactedObject - virtual void SAL_CALL commit() - throw ( css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL commit() override; - virtual void SAL_CALL revert() - throw ( css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL revert() override; // XTransactionBroadcaster virtual void SAL_CALL addTransactionListener( - const css::uno::Reference< css::embed::XTransactionListener >& aListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XTransactionListener >& aListener ) override; virtual void SAL_CALL removeTransactionListener( - const css::uno::Reference< css::embed::XTransactionListener >& aListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::embed::XTransactionListener >& aListener ) override; // XModifiable - virtual sal_Bool SAL_CALL isModified() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isModified() override; - virtual void SAL_CALL setModified( sal_Bool bModified ) - throw ( css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setModified( sal_Bool bModified ) override; virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw ( css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; - virtual css::uno::Type SAL_CALL getElementType() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Type SAL_CALL getElementType() override; - virtual sal_Bool SAL_CALL hasElements() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasElements() override; // XComponent - virtual void SAL_CALL dispose() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( - const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( - const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::lang::XEventListener >& xListener ) override; // XEncryptionProtectedSource - virtual void SAL_CALL setEncryptionPassword( const OUString& aPass ) - throw ( css::uno::RuntimeException, - css::io::IOException, std::exception ) override; + virtual void SAL_CALL setEncryptionPassword( const OUString& aPass ) override; - virtual void SAL_CALL removeEncryption() - throw ( css::uno::RuntimeException, - css::io::IOException, std::exception ) override; + virtual void SAL_CALL removeEncryption() override; // XEncryptionProtectedSource2 virtual void SAL_CALL setEncryptionData( - const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) - throw ( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) override; - virtual sal_Bool SAL_CALL hasEncryptionData() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasEncryptionData() override; // XEncryptionProtectedStorage - virtual void SAL_CALL setEncryptionAlgorithms( const css::uno::Sequence< css::beans::NamedValue >& aAlgorithms ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEncryptionAlgorithms( const css::uno::Sequence< css::beans::NamedValue >& aAlgorithms ) override; - virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getEncryptionAlgorithms() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL getEncryptionAlgorithms() override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) - throw ( css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) - throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) - throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XOptimizedStorage - virtual void SAL_CALL insertRawNonEncrStreamElementDirect( const OUString& sStreamName, const css::uno::Reference< css::io::XInputStream >& xInStream ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::NoRawFormatException, - css::container::ElementExistException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL insertStreamElementDirect( const OUString& sStreamName, const css::uno::Reference< css::io::XInputStream >& xInStream, const css::uno::Sequence< css::beans::PropertyValue >& aProps ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::container::ElementExistException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL copyElementDirectlyTo( const OUString& sSourceName, const css::uno::Reference< css::embed::XOptimizedStorage >& xTargetStorage, const OUString& sTargetName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::container::ElementExistException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL writeAndAttachToStream( const css::uno::Reference< css::io::XStream >& xStream ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL attachToURL( const OUString& sURL, sal_Bool bReadOnly ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; - - virtual css::uno::Any SAL_CALL getElementPropertyValue( const OUString& sElementName, const OUString& sPropertyName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::io::IOException, - css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL copyStreamElementData( const OUString& sStreamName, const css::uno::Reference< css::io::XStream >& xTargetStream ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::WrongPasswordException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL insertRawNonEncrStreamElementDirect( const OUString& sStreamName, const css::uno::Reference< css::io::XInputStream >& xInStream ) override; + + virtual void SAL_CALL insertStreamElementDirect( const OUString& sStreamName, const css::uno::Reference< css::io::XInputStream >& xInStream, const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override; + + virtual void SAL_CALL copyElementDirectlyTo( const OUString& sSourceName, const css::uno::Reference< css::embed::XOptimizedStorage >& xTargetStorage, const OUString& sTargetName ) override; + + virtual void SAL_CALL writeAndAttachToStream( const css::uno::Reference< css::io::XStream >& xStream ) override; + + virtual void SAL_CALL attachToURL( const OUString& sURL, sal_Bool bReadOnly ) override; + + virtual css::uno::Any SAL_CALL getElementPropertyValue( const OUString& sElementName, const OUString& sPropertyName ) override; + + virtual void SAL_CALL copyStreamElementData( const OUString& sStreamName, const css::uno::Reference< css::io::XStream >& xTargetStream ) override; // XRelationshipAccess - virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) - throw ( css::io::IOException, - css::uno::RuntimeException, std::exception) override; - - virtual OUString SAL_CALL getTargetByID( const OUString& sID ) - throw ( css::container::NoSuchElementException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; - - virtual OUString SAL_CALL getTypeByID( const OUString& sID ) - throw ( css::container::NoSuchElementException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) - throw ( css::container::NoSuchElementException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) - throw ( css::io::IOException, - css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships( ) - throw ( css::io::IOException, - css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) - throw ( css::container::ElementExistException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) - throw ( css::container::NoSuchElementException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) - throw ( css::container::ElementExistException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL clearRelationships( ) - throw ( css::io::IOException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByID( const OUString& sID ) override; + + virtual OUString SAL_CALL getTargetByID( const OUString& sID ) override; + + virtual OUString SAL_CALL getTypeByID( const OUString& sID ) override; + + virtual css::uno::Sequence< css::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) override; + + virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) override; + + virtual css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > SAL_CALL getAllRelationships( ) override; + + virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const css::uno::Sequence< css::beans::StringPair >& aEntry, sal_Bool bReplace ) override; + + virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) override; + + virtual void SAL_CALL insertRelationships( const css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > >& aEntries, sal_Bool bReplace ) override; + + virtual void SAL_CALL clearRelationships( ) override; // XHierarchicalStorageAccess - virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::WrongPasswordException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::NoEncryptionException, - css::packages::WrongPasswordException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) override; + + virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword ) override; + + virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath ) override; // XHierarchicalStorageAccess2 - virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::NoEncryptionException, - css::packages::WrongPasswordException, - css::container::NoSuchElementException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const css::uno::Sequence< css::beans::NamedValue >& aEncryptionData ) override; }; StorageHolder_Impl::StorageHolder_Impl( OStorage* pStorage ) diff --git a/package/source/zipapi/ByteChucker.cxx b/package/source/zipapi/ByteChucker.cxx index 5fc449529b78..bc7443b68968 100644 --- a/package/source/zipapi/ByteChucker.cxx +++ b/package/source/zipapi/ByteChucker.cxx @@ -43,13 +43,11 @@ ByteChucker::~ByteChucker() } void ByteChucker::WriteBytes( const Sequence< sal_Int8 >& aData ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) { xStream->writeBytes(aData); } sal_Int64 ByteChucker::GetPosition( ) - throw(IOException, RuntimeException) { return xSeek->getPosition(); } diff --git a/package/source/zipapi/ByteGrabber.cxx b/package/source/zipapi/ByteGrabber.cxx index ba0dd42b7728..0818f1ecd09e 100644 --- a/package/source/zipapi/ByteGrabber.cxx +++ b/package/source/zipapi/ByteGrabber.cxx @@ -55,7 +55,6 @@ void ByteGrabber::setInputStream (const uno::Reference < io::XInputStream >& xNe // XInputStream chained sal_Int32 SAL_CALL ByteGrabber::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return xStream->readBytes(aData, nBytesToRead ); @@ -63,7 +62,6 @@ sal_Int32 SAL_CALL ByteGrabber::readBytes( uno::Sequence< sal_Int8 >& aData, // XSeekable chained... void SAL_CALL ByteGrabber::seek( sal_Int64 location ) - throw(lang::IllegalArgumentException, io::IOException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if (xSeek.is() ) @@ -80,7 +78,6 @@ void SAL_CALL ByteGrabber::seek( sal_Int64 location ) } sal_Int64 SAL_CALL ByteGrabber::getPosition( ) - throw(io::IOException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if (xSeek.is() ) @@ -90,7 +87,6 @@ sal_Int64 SAL_CALL ByteGrabber::getPosition( ) } sal_Int64 SAL_CALL ByteGrabber::getLength( ) - throw(io::IOException, uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if (xSeek.is() ) diff --git a/package/source/zipapi/CRC32.cxx b/package/source/zipapi/CRC32.cxx index 39b4f4cccbdc..c121b220de0d 100644 --- a/package/source/zipapi/CRC32.cxx +++ b/package/source/zipapi/CRC32.cxx @@ -36,32 +36,27 @@ CRC32::~CRC32() { } void SAL_CALL CRC32::reset() - throw(RuntimeException) { nCRC=0; } sal_Int32 SAL_CALL CRC32::getValue() - throw(RuntimeException) { return nCRC & 0xFFFFFFFFL; } /** Update CRC32 with specified sequence of bytes */ void SAL_CALL CRC32::updateSegment(const Sequence< sal_Int8 > &b, sal_Int32 len) - throw(RuntimeException) { nCRC = rtl_crc32(nCRC, b.getConstArray(), len ); } /** Update CRC32 with specified sequence of bytes */ void SAL_CALL CRC32::update(const Sequence< sal_Int8 > &b) - throw(RuntimeException) { nCRC = rtl_crc32(nCRC, b.getConstArray(),b.getLength()); } sal_Int64 SAL_CALL CRC32::updateStream( Reference < XInputStream > & xStream ) - throw ( RuntimeException ) { sal_Int32 nLength; sal_Int64 nTotal = 0; diff --git a/package/source/zipapi/MemoryByteGrabber.hxx b/package/source/zipapi/MemoryByteGrabber.hxx index 548f7f635896..c5436c2a34f0 100644 --- a/package/source/zipapi/MemoryByteGrabber.hxx +++ b/package/source/zipapi/MemoryByteGrabber.hxx @@ -46,7 +46,6 @@ public: /// @throws css::io::IOException /// @throws css::uno::RuntimeException void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException) { mnCurrent += nBytesToSkip; } diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx index e04bfc1b40ba..527238d0a23f 100644 --- a/package/source/zipapi/XUnbufferedStream.cxx +++ b/package/source/zipapi/XUnbufferedStream.cxx @@ -151,7 +151,6 @@ XUnbufferedStream::~XUnbufferedStream() } sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutexHolder->GetMutex() ); @@ -295,12 +294,10 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa } sal_Int32 SAL_CALL XUnbufferedStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { return readBytes ( aData, nMaxBytesToRead ); } void SAL_CALL XUnbufferedStream::skipBytes( sal_Int32 nBytesToSkip ) - throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { if ( nBytesToSkip ) { @@ -310,13 +307,11 @@ void SAL_CALL XUnbufferedStream::skipBytes( sal_Int32 nBytesToSkip ) } sal_Int32 SAL_CALL XUnbufferedStream::available( ) - throw( NotConnectedException, IOException, RuntimeException, std::exception) { return static_cast < sal_Int32 > ( mnZipSize - mnMyCurrent ); } void SAL_CALL XUnbufferedStream::closeInput( ) - throw( NotConnectedException, IOException, RuntimeException, std::exception) { } diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx index a22124a5cd02..02fe87f598de 100644 --- a/package/source/zipapi/XUnbufferedStream.hxx +++ b/package/source/zipapi/XUnbufferedStream.hxx @@ -83,16 +83,11 @@ public: virtual ~XUnbufferedStream() override; // XInputStream - virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available( ) - throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput( ) - throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override; + virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override; + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override; + virtual sal_Int32 SAL_CALL available( ) override; + virtual void SAL_CALL closeInput( ) override; }; #endif diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 76eea853f7c4..695caff3ee10 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -554,8 +554,7 @@ public: readAndCopy(nRemaining); } - virtual sal_Int32 SAL_CALL readBytes( uno::Sequence<sal_Int8>& rData, sal_Int32 nBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL readBytes( uno::Sequence<sal_Int8>& rData, sal_Int32 nBytesToRead ) override { if (!hasBytes()) return 0; @@ -572,14 +571,12 @@ public: return nReadSize; } - virtual sal_Int32 SAL_CALL readSomeBytes( ::css::uno::Sequence<sal_Int8>& rData, sal_Int32 nMaxBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL readSomeBytes( ::css::uno::Sequence<sal_Int8>& rData, sal_Int32 nMaxBytesToRead ) override { return readBytes(rData, nMaxBytesToRead); } - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override { if (!hasBytes()) return; @@ -587,8 +584,7 @@ public: mnPos += nBytesToSkip; } - virtual sal_Int32 SAL_CALL available() - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL available() override { if (!hasBytes()) return 0; @@ -596,8 +592,7 @@ public: return remainingSize(); } - virtual void SAL_CALL closeInput() - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override + virtual void SAL_CALL closeInput() override { } }; diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index d0fce8951ed9..29dca80b6e92 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -76,13 +76,11 @@ void ZipOutputStream::addDeflatingThread( ZipOutputEntry *pEntry, comphelper::Th } void ZipOutputStream::rawWrite( const Sequence< sal_Int8 >& rBuffer ) - throw(IOException, RuntimeException) { m_aChucker.WriteBytes( rBuffer ); } void ZipOutputStream::rawCloseEntry( bool bEncrypt ) - throw(IOException, RuntimeException) { assert(m_pCurrentEntry && "Forgot to call writeLOC()?"); if ( m_pCurrentEntry->nMethod == DEFLATED && ( m_pCurrentEntry->nFlag & 8 ) ) @@ -164,7 +162,6 @@ void ZipOutputStream::reduceScheduledThreadsToGivenNumberOrLess(sal_Int32 nThrea } void ZipOutputStream::finish() - throw(IOException, RuntimeException, std::exception) { assert(!m_aZipList.empty() && "Zip file must have at least one entry!"); @@ -201,7 +198,6 @@ const css::uno::Reference< css::io::XOutputStream >& ZipOutputStream::getStream( } void ZipOutputStream::writeEND(sal_uInt32 nOffset, sal_uInt32 nLength) - throw(IOException, RuntimeException) { m_aChucker.WriteInt32( ENDSIG ); m_aChucker.WriteInt16( 0 ); @@ -225,7 +221,6 @@ static sal_uInt32 getTruncated( sal_Int64 nNum, bool *pIsTruncated ) } void ZipOutputStream::writeCEN( const ZipEntry &rEntry ) - throw(IOException, RuntimeException) { if ( !::comphelper::OStorageHelper::IsValidZipEntryFileName( rEntry.sPath, true ) ) throw IOException("Unexpected character is used in file name." ); @@ -265,7 +260,6 @@ void ZipOutputStream::writeCEN( const ZipEntry &rEntry ) } void ZipOutputStream::writeEXT( const ZipEntry &rEntry ) - throw(IOException, RuntimeException) { bool bWrite64Header = false; @@ -284,7 +278,6 @@ void ZipOutputStream::writeEXT( const ZipEntry &rEntry ) } void ZipOutputStream::writeLOC( ZipEntry *pEntry, bool bEncrypt ) - throw(IOException, RuntimeException) { assert(!m_pCurrentEntry && "Forgot to close an entry with rawCloseEntry()?"); m_pCurrentEntry = pEntry; diff --git a/package/source/zipapi/blowfishcontext.cxx b/package/source/zipapi/blowfishcontext.cxx index fd45712fce7e..f572692c0366 100644 --- a/package/source/zipapi/blowfishcontext.cxx +++ b/package/source/zipapi/blowfishcontext.cxx @@ -58,7 +58,6 @@ BlowfishCFB8CipherContext::~BlowfishCFB8CipherContext() } uno::Sequence< sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::convertWithCipherContext( const uno::Sequence< ::sal_Int8 >& aData ) - throw( lang::IllegalArgumentException, lang::DisposedException, uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pCipher ) @@ -93,7 +92,6 @@ uno::Sequence< sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::convertWithCipherC } uno::Sequence< ::sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::finalizeCipherContextAndDispose() - throw( lang::DisposedException, uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pCipher ) diff --git a/package/source/zipapi/blowfishcontext.hxx b/package/source/zipapi/blowfishcontext.hxx index 9f368a5cc117..11f44eed10ba 100644 --- a/package/source/zipapi/blowfishcontext.hxx +++ b/package/source/zipapi/blowfishcontext.hxx @@ -42,8 +42,8 @@ public: static css::uno::Reference< css::xml::crypto::XCipherContext > Create( const css::uno::Sequence< sal_Int8 >& aDerivedKey, const css::uno::Sequence< sal_Int8 >& aInitVector, bool bEncrypt ); - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::lang::IllegalArgumentException, css::lang::DisposedException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const css::uno::Sequence< ::sal_Int8 >& aData ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) override; }; #endif // INCLUDED_PACKAGE_SOURCE_ZIPAPI_BLOWFISHCONTEXT_HXX diff --git a/package/source/zipapi/sha1context.cxx b/package/source/zipapi/sha1context.cxx index 58bda903a5ee..c7bc6312c669 100644 --- a/package/source/zipapi/sha1context.cxx +++ b/package/source/zipapi/sha1context.cxx @@ -45,7 +45,6 @@ SHA1DigestContext::~SHA1DigestContext() } void SAL_CALL SHA1DigestContext::updateDigest( const uno::Sequence< ::sal_Int8 >& aData ) - throw( lang::DisposedException, uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pDigest ) @@ -61,7 +60,6 @@ void SAL_CALL SHA1DigestContext::updateDigest( const uno::Sequence< ::sal_Int8 > } uno::Sequence< ::sal_Int8 > SAL_CALL SHA1DigestContext::finalizeDigestAndDispose() - throw( lang::DisposedException, uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pDigest ) diff --git a/package/source/zipapi/sha1context.hxx b/package/source/zipapi/sha1context.hxx index 3be983d31913..ef9c433082d3 100644 --- a/package/source/zipapi/sha1context.hxx +++ b/package/source/zipapi/sha1context.hxx @@ -39,8 +39,8 @@ public: static css::uno::Reference< css::xml::crypto::XDigestContext > Create(); - virtual void SAL_CALL updateDigest( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (css::lang::DisposedException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateDigest( const css::uno::Sequence< ::sal_Int8 >& aData ) override; + virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() override; }; diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 83b3a82c37c1..a28507852493 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -110,35 +110,28 @@ class ActiveDataStreamer : public ::cppu::WeakImplHelper< XActiveDataStreamer > uno::Reference< XStream > mStream; public: - virtual uno::Reference< XStream > SAL_CALL getStream() - throw( RuntimeException, std::exception ) override + virtual uno::Reference< XStream > SAL_CALL getStream() override { return mStream; } - virtual void SAL_CALL setStream( const uno::Reference< XStream >& stream ) - throw( RuntimeException, std::exception ) override + virtual void SAL_CALL setStream( const uno::Reference< XStream >& stream ) override { mStream = stream; } }; class DummyInputStream : public ::cppu::WeakImplHelper< XInputStream > { - virtual sal_Int32 SAL_CALL readBytes( uno::Sequence< sal_Int8 >&, sal_Int32 ) - throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override + virtual sal_Int32 SAL_CALL readBytes( uno::Sequence< sal_Int8 >&, sal_Int32 ) override { return 0; } - virtual sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< sal_Int8 >&, sal_Int32 ) - throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override + virtual sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< sal_Int8 >&, sal_Int32 ) override { return 0; } - virtual void SAL_CALL skipBytes( sal_Int32 ) - throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override + virtual void SAL_CALL skipBytes( sal_Int32 ) override {} - virtual sal_Int32 SAL_CALL available() - throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override + virtual sal_Int32 SAL_CALL available() override { return 0; } - virtual void SAL_CALL closeInput() - throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) override + virtual void SAL_CALL closeInput() override {} }; @@ -555,7 +548,6 @@ void ZipPackage::getZipFileContents() } void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) - throw( Exception, RuntimeException, std::exception ) { uno::Reference< XProgressHandler > xProgressHandler; beans::NamedValue aNamedValue; @@ -771,7 +763,6 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) } Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName ) - throw( NoSuchElementException, RuntimeException, std::exception ) { OUString sTemp, sDirName; sal_Int32 nOldIndex, nStreamIndex; @@ -865,7 +856,6 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName ) } sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName ) - throw( RuntimeException, std::exception ) { OUString sTemp, sDirName; sal_Int32 nOldIndex, nStreamIndex; @@ -959,14 +949,12 @@ sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName ) } uno::Reference< XInterface > SAL_CALL ZipPackage::createInstance() - throw( Exception, RuntimeException, std::exception ) { uno::Reference < XInterface > xRef = *( new ZipPackageStream( *this, m_xContext, m_nFormat, m_bAllowRemoveOnInsert ) ); return xRef; } uno::Reference< XInterface > SAL_CALL ZipPackage::createInstanceWithArguments( const uno::Sequence< Any >& aArguments ) - throw( Exception, RuntimeException, std::exception ) { bool bArg = false; uno::Reference < XInterface > xRef; @@ -1372,7 +1360,6 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput() } void SAL_CALL ZipPackage::commitChanges() - throw( WrappedTargetException, RuntimeException, std::exception ) { // lock the component for the time of committing ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -1610,12 +1597,10 @@ const uno::Sequence< sal_Int8 > ZipPackage::GetEncryptionKey() } sal_Bool SAL_CALL ZipPackage::hasPendingChanges() - throw( RuntimeException, std::exception ) { return false; } Sequence< ElementChange > SAL_CALL ZipPackage::getPendingChanges() - throw( RuntimeException, std::exception ) { return uno::Sequence < ElementChange > (); } @@ -1642,19 +1627,16 @@ Sequence< OUString > ZipPackage::static_getSupportedServiceNames() } OUString ZipPackage::getImplementationName() - throw ( RuntimeException, std::exception ) { return static_getImplementationName(); } Sequence< OUString > ZipPackage::getSupportedServiceNames() - throw ( RuntimeException, std::exception ) { return static_getSupportedServiceNames(); } sal_Bool SAL_CALL ZipPackage::supportsService( OUString const & rServiceName ) - throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } @@ -1670,14 +1652,12 @@ uno::Reference < XSingleServiceFactory > ZipPackage::createServiceFactory( uno:: namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; } Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId() - throw ( RuntimeException ) { ::cppu::OImplementationId &rId = lcl_ImplId::get(); return rId.getImplementationId(); } sal_Int64 SAL_CALL ZipPackage::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier ) - throw( RuntimeException, std::exception ) { if ( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelImplementationId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) return reinterpret_cast < sal_Int64 > ( this ); @@ -1685,13 +1665,11 @@ sal_Int64 SAL_CALL ZipPackage::getSomething( const uno::Sequence< sal_Int8 >& aI } uno::Reference< XPropertySetInfo > SAL_CALL ZipPackage::getPropertySetInfo() - throw( RuntimeException, std::exception ) { return uno::Reference < XPropertySetInfo > (); } void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) - throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { if ( m_nFormat != embed::StorageFormats::PACKAGE ) throw UnknownPropertyException(THROW_WHERE ); @@ -1787,7 +1765,6 @@ void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const } Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName ) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { // TODO/LATER: Activate the check when zip-ucp is ready // if ( m_nFormat != embed::StorageFormats::PACKAGE ) @@ -1828,19 +1805,15 @@ Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName ) throw UnknownPropertyException(THROW_WHERE ); } void SAL_CALL ZipPackage::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { } void SAL_CALL ZipPackage::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*aListener*/ ) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { } void SAL_CALL ZipPackage::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ ) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { } void SAL_CALL ZipPackage::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ ) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { } diff --git a/package/source/zippackage/ZipPackageBuffer.cxx b/package/source/zippackage/ZipPackageBuffer.cxx index 904c3957a916..cb5f80c1c052 100644 --- a/package/source/zippackage/ZipPackageBuffer.cxx +++ b/package/source/zippackage/ZipPackageBuffer.cxx @@ -44,7 +44,6 @@ ZipPackageBuffer::~ZipPackageBuffer() } sal_Int32 SAL_CALL ZipPackageBuffer::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { if (nBytesToRead < 0) throw BufferSizeExceededException(THROW_WHERE, *this ); @@ -59,12 +58,10 @@ sal_Int32 SAL_CALL ZipPackageBuffer::readBytes( Sequence< sal_Int8 >& aData, sal } sal_Int32 SAL_CALL ZipPackageBuffer::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { return readBytes(aData, nMaxBytesToRead); } void SAL_CALL ZipPackageBuffer::skipBytes( sal_Int32 nBytesToSkip ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { if (nBytesToSkip < 0) throw BufferSizeExceededException(THROW_WHERE, *this ); @@ -75,16 +72,13 @@ void SAL_CALL ZipPackageBuffer::skipBytes( sal_Int32 nBytesToSkip ) m_nCurrent+=nBytesToSkip; } sal_Int32 SAL_CALL ZipPackageBuffer::available( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception) { return static_cast < sal_Int32 > (m_nEnd - m_nCurrent); } void SAL_CALL ZipPackageBuffer::closeInput( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception) { } void SAL_CALL ZipPackageBuffer::writeBytes( const Sequence< sal_Int8 >& aData ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { sal_Int64 nDataLen = aData.getLength(), nCombined = m_nEnd + nDataLen; @@ -107,27 +101,22 @@ void SAL_CALL ZipPackageBuffer::writeBytes( const Sequence< sal_Int8 >& aData ) m_nEnd = m_nCurrent; } void SAL_CALL ZipPackageBuffer::flush( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { } void SAL_CALL ZipPackageBuffer::closeOutput( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { } void SAL_CALL ZipPackageBuffer::seek( sal_Int64 location ) - throw( IllegalArgumentException, IOException, RuntimeException, std::exception) { if ( location > m_nEnd || location < 0 ) throw IllegalArgumentException(THROW_WHERE, uno::Reference< uno::XInterface >(), 1 ); m_nCurrent = location; } sal_Int64 SAL_CALL ZipPackageBuffer::getPosition( ) - throw(IOException, RuntimeException, std::exception) { return m_nCurrent; } sal_Int64 SAL_CALL ZipPackageBuffer::getLength( ) - throw(IOException, RuntimeException, std::exception) { return m_nEnd; } diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx index 327292f8b894..727add5b07a3 100644 --- a/package/source/zippackage/ZipPackageEntry.cxx +++ b/package/source/zippackage/ZipPackageEntry.cxx @@ -56,12 +56,10 @@ ZipPackageEntry::~ZipPackageEntry() // XChild OUString SAL_CALL ZipPackageEntry::getName( ) - throw(RuntimeException, std::exception) { return msName; } void SAL_CALL ZipPackageEntry::setName( const OUString& aName ) - throw(RuntimeException, std::exception) { if ( mpParent && !msName.isEmpty() && mpParent->hasByName ( msName ) ) mpParent->removeByName ( msName ); @@ -77,7 +75,6 @@ void SAL_CALL ZipPackageEntry::setName( const OUString& aName ) mpParent->doInsertByName ( this, false ); } uno::Reference< XInterface > SAL_CALL ZipPackageEntry::getParent( ) - throw(RuntimeException, std::exception) { // return uno::Reference< XInterface >( xParent, UNO_QUERY ); return uno::Reference< XInterface >( static_cast< ::cppu::OWeakObject* >( mpParent ), UNO_QUERY ); @@ -92,7 +89,6 @@ void ZipPackageEntry::doSetParent ( ZipPackageFolder * pNewParent ) } void SAL_CALL ZipPackageEntry::setParent( const uno::Reference< XInterface >& xNewParent ) - throw(NoSupportException, RuntimeException, std::exception) { sal_Int64 nTest(0); uno::Reference < XUnoTunnel > xTunnel ( xNewParent, UNO_QUERY ); @@ -110,24 +106,19 @@ void SAL_CALL ZipPackageEntry::setParent( const uno::Reference< XInterface >& xN } //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL ZipPackageEntry::getPropertySetInfo( ) - throw(RuntimeException, std::exception) { return uno::Reference < beans::XPropertySetInfo > (); } void SAL_CALL ZipPackageEntry::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ZipPackageEntry::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) - throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ZipPackageEntry::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ZipPackageEntry::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 22d18ce42839..8bf0a8885d82 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -181,7 +181,6 @@ css::uno::Sequence < sal_Int8 > ZipPackageFolder::static_getImplementationId() // XNameContainer void SAL_CALL ZipPackageFolder::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, uno::RuntimeException, std::exception) { if (hasByName(aName)) throw ElementExistException(THROW_WHERE ); @@ -215,7 +214,6 @@ void SAL_CALL ZipPackageFolder::insertByName( const OUString& aName, const uno:: } } void SAL_CALL ZipPackageFolder::removeByName( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception) { ContentHash::iterator aIter = maContents.find ( Name ); if ( aIter == maContents.end() ) @@ -224,18 +222,15 @@ void SAL_CALL ZipPackageFolder::removeByName( const OUString& Name ) } // XEnumerationAccess uno::Reference< XEnumeration > SAL_CALL ZipPackageFolder::createEnumeration( ) - throw(uno::RuntimeException, std::exception) { return uno::Reference < XEnumeration> (new ZipPackageFolderEnumeration(maContents)); } // XElementAccess uno::Type SAL_CALL ZipPackageFolder::getElementType( ) - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<XUnoTunnel>::get(); } sal_Bool SAL_CALL ZipPackageFolder::hasElements( ) - throw(uno::RuntimeException, std::exception) { return maContents.size() > 0; } @@ -249,12 +244,10 @@ ZipContentInfo& ZipPackageFolder::doGetByName( const OUString& aName ) } uno::Any SAL_CALL ZipPackageFolder::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception) { return uno::makeAny ( doGetByName ( aName ).xTunnel ); } uno::Sequence< OUString > SAL_CALL ZipPackageFolder::getElementNames( ) - throw(uno::RuntimeException, std::exception) { sal_uInt32 i=0, nSize = maContents.size(); uno::Sequence < OUString > aSequence ( nSize ); @@ -265,13 +258,11 @@ uno::Sequence< OUString > SAL_CALL ZipPackageFolder::getElementNames( ) return aSequence; } sal_Bool SAL_CALL ZipPackageFolder::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { return maContents.find ( aName ) != maContents.end (); } // XNameReplace void SAL_CALL ZipPackageFolder::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception) { if ( hasByName( aName ) ) removeByName( aName ); @@ -323,7 +314,6 @@ void ZipPackageFolder::saveContents( ZipOutputStream & rZipOut, const uno::Sequence < sal_Int8 >& rEncryptionKey, const rtlRandomPool &rRandomPool ) const - throw( uno::RuntimeException ) { bool bWritingFailed = false; @@ -393,7 +383,6 @@ void ZipPackageFolder::saveContents( } sal_Int64 SAL_CALL ZipPackageFolder::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier ) - throw(uno::RuntimeException, std::exception) { sal_Int64 nMe = 0; if ( aIdentifier.getLength() == 16 && @@ -402,7 +391,6 @@ sal_Int64 SAL_CALL ZipPackageFolder::getSomething( const uno::Sequence< sal_Int8 return nMe; } void SAL_CALL ZipPackageFolder::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, uno::RuntimeException, std::exception) { if ( aPropertyName == "MediaType" ) { @@ -420,7 +408,6 @@ void SAL_CALL ZipPackageFolder::setPropertyValue( const OUString& aPropertyName, throw UnknownPropertyException(THROW_WHERE ); } uno::Any SAL_CALL ZipPackageFolder::getPropertyValue( const OUString& PropertyName ) - throw(UnknownPropertyException, WrappedTargetException, uno::RuntimeException, std::exception) { if ( PropertyName == "MediaType" ) { @@ -439,7 +426,6 @@ uno::Any SAL_CALL ZipPackageFolder::getPropertyValue( const OUString& PropertyNa } void ZipPackageFolder::doInsertByName ( ZipPackageEntry *pEntry, bool bSetParent ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, uno::RuntimeException) { try { @@ -457,20 +443,17 @@ void ZipPackageFolder::doInsertByName ( ZipPackageEntry *pEntry, bool bSetParent pEntry->setParent ( *this ); } OUString ZipPackageFolder::getImplementationName() - throw (uno::RuntimeException, std::exception) { return OUString("ZipPackageFolder"); } uno::Sequence< OUString > ZipPackageFolder::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aNames { "com.sun.star.packages.PackageFolder" }; return aNames; } sal_Bool SAL_CALL ZipPackageFolder::supportsService( OUString const & rServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.cxx b/package/source/zippackage/ZipPackageFolderEnumeration.cxx index a759793dbaa2..adcbb9296dd5 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.cxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.cxx @@ -40,12 +40,10 @@ ZipPackageFolderEnumeration::~ZipPackageFolderEnumeration() } sal_Bool SAL_CALL ZipPackageFolderEnumeration::hasMoreElements( ) - throw(uno::RuntimeException, std::exception) { return (aIterator != rContents.end() ); } uno::Any SAL_CALL ZipPackageFolderEnumeration::nextElement( ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aAny; if (aIterator == rContents.end() ) @@ -56,20 +54,17 @@ uno::Any SAL_CALL ZipPackageFolderEnumeration::nextElement( ) } OUString ZipPackageFolderEnumeration::getImplementationName() - throw (uno::RuntimeException, std::exception) { return OUString ("ZipPackageFolderEnumeration"); } uno::Sequence< OUString > ZipPackageFolderEnumeration::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aNames { "com.sun.star.packages.PackageFolderEnumeration" }; return aNames; } sal_Bool SAL_CALL ZipPackageFolderEnumeration::supportsService( OUString const & rServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx index 6befe8c6f18f..d4f8b8b1cdba 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx @@ -39,18 +39,13 @@ public: virtual ~ZipPackageFolderEnumeration() override; // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL nextElement( ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements( ) override; + virtual css::uno::Any SAL_CALL nextElement( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; #endif diff --git a/package/source/zippackage/ZipPackageSink.cxx b/package/source/zippackage/ZipPackageSink.cxx index b3db349c59a7..6725c8aa2802 100644 --- a/package/source/zippackage/ZipPackageSink.cxx +++ b/package/source/zippackage/ZipPackageSink.cxx @@ -27,12 +27,10 @@ ZipPackageSink::~ZipPackageSink() { } void SAL_CALL ZipPackageSink::setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream ) - throw(css::uno::RuntimeException, std::exception) { xStream = aStream; } css::uno::Reference< css::io::XInputStream > SAL_CALL ZipPackageSink::getInputStream( ) - throw(css::uno::RuntimeException, std::exception) { return xStream; } diff --git a/package/source/zippackage/ZipPackageSink.hxx b/package/source/zippackage/ZipPackageSink.hxx index 6ece3eb528f7..e7e4cdbef192 100644 --- a/package/source/zippackage/ZipPackageSink.hxx +++ b/package/source/zippackage/ZipPackageSink.hxx @@ -29,10 +29,8 @@ protected: public: ZipPackageSink(); virtual ~ZipPackageSink() override; - virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInputStream( const css::uno::Reference< css::io::XInputStream >& aStream ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) override; }; #endif diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 2222f7b1f166..971263859fd5 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -935,7 +935,6 @@ void ZipPackageStream::SetPackageMember( bool bNewValue ) // XActiveDataSink void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInputStream >& aStream ) - throw( RuntimeException, std::exception ) { // if seekable access is required the wrapping will be done on demand m_xStream = aStream; @@ -947,7 +946,6 @@ void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInput } uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData() - throw( RuntimeException ) { try { @@ -975,7 +973,6 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData() } uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream() - throw( RuntimeException, std::exception ) { try { @@ -1006,9 +1003,6 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream() // XDataSinkEncrSupport uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getDataStream() - throw ( packages::WrongPasswordException, ZipException, - io::IOException, - RuntimeException, std::exception ) { // There is no stream attached to this object if ( m_nStreamMode == PACKAGE_STREAM_NOTSET ) @@ -1073,9 +1067,6 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getDataStream() } uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream() - throw ( packages::NoEncryptionException, - io::IOException, - uno::RuntimeException, std::exception ) { // There is no stream attached to this object if ( m_nStreamMode == PACKAGE_STREAM_NOTSET ) @@ -1106,18 +1097,12 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream() } void SAL_CALL ZipPackageStream::setDataStream( const uno::Reference< io::XInputStream >& aStream ) - throw ( io::IOException, - RuntimeException, std::exception ) { setInputStream( aStream ); m_nStreamMode = PACKAGE_STREAM_DATA; } void SAL_CALL ZipPackageStream::setRawStream( const uno::Reference< io::XInputStream >& aStream ) - throw ( packages::EncryptionNotAllowedException, - packages::NoRawFormatException, - io::IOException, - RuntimeException, std::exception ) { // wrap the stream in case it is not seekable uno::Reference< io::XInputStream > xNewStream = ::comphelper::OSeekableInputWrapper::CheckSeekableCanWrap( aStream, m_xContext ); @@ -1143,8 +1128,6 @@ void SAL_CALL ZipPackageStream::setRawStream( const uno::Reference< io::XInputSt } uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getPlainRawStream() - throw ( io::IOException, packages::NoEncryptionException, - uno::RuntimeException, std::exception ) { // There is no stream attached to this object if ( m_nStreamMode == PACKAGE_STREAM_NOTSET ) @@ -1175,7 +1158,6 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getPlainRawStream( // XUnoTunnel sal_Int64 SAL_CALL ZipPackageStream::getSomething( const Sequence< sal_Int8 >& aIdentifier ) - throw( RuntimeException, std::exception ) { sal_Int64 nMe = 0; if ( aIdentifier.getLength() == 16 && @@ -1186,7 +1168,6 @@ sal_Int64 SAL_CALL ZipPackageStream::getSomething( const Sequence< sal_Int8 >& a // XPropertySet void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { if ( aPropertyName == "MediaType" ) { @@ -1344,7 +1325,6 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName, } Any SAL_CALL ZipPackageStream::getPropertyValue( const OUString& PropertyName ) - throw( beans::UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { if ( PropertyName == "MediaType" ) { @@ -1385,20 +1365,17 @@ void ZipPackageStream::setSize ( const sal_Int64 nNewSize ) aEntry.nSize = nNewSize; } OUString ZipPackageStream::getImplementationName() - throw ( RuntimeException, std::exception ) { return OUString ("ZipPackageStream"); } Sequence< OUString > ZipPackageStream::getSupportedServiceNames() - throw ( RuntimeException, std::exception ) { Sequence<OUString> aNames { "com.sun.star.packages.PackageStream" }; return aNames; } sal_Bool SAL_CALL ZipPackageStream::supportsService( OUString const & rServiceName ) - throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } diff --git a/package/source/zippackage/wrapstreamforshare.cxx b/package/source/zippackage/wrapstreamforshare.cxx index f97c213b4709..2065454c78c7 100644 --- a/package/source/zippackage/wrapstreamforshare.cxx +++ b/package/source/zippackage/wrapstreamforshare.cxx @@ -49,10 +49,6 @@ WrapStreamForShare::~WrapStreamForShare() // XInputStream sal_Int32 SAL_CALL WrapStreamForShare::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { if ( !m_xInStream.is() ) throw io::IOException(THROW_WHERE ); @@ -66,10 +62,6 @@ sal_Int32 SAL_CALL WrapStreamForShare::readBytes( uno::Sequence< sal_Int8 >& aDa } sal_Int32 SAL_CALL WrapStreamForShare::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { if ( !m_xInStream.is() ) throw io::IOException(THROW_WHERE ); @@ -83,10 +75,6 @@ sal_Int32 SAL_CALL WrapStreamForShare::readSomeBytes( uno::Sequence< sal_Int8 >& } void SAL_CALL WrapStreamForShare::skipBytes( sal_Int32 nBytesToSkip ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -100,9 +88,6 @@ void SAL_CALL WrapStreamForShare::skipBytes( sal_Int32 nBytesToSkip ) } sal_Int32 SAL_CALL WrapStreamForShare::available() - throw ( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -113,9 +98,6 @@ sal_Int32 SAL_CALL WrapStreamForShare::available() } void SAL_CALL WrapStreamForShare::closeInput() - throw ( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -130,9 +112,6 @@ void SAL_CALL WrapStreamForShare::closeInput() // XSeekable void SAL_CALL WrapStreamForShare::seek( sal_Int64 location ) - throw ( lang::IllegalArgumentException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -146,8 +125,6 @@ void SAL_CALL WrapStreamForShare::seek( sal_Int64 location ) } sal_Int64 SAL_CALL WrapStreamForShare::getPosition() - throw ( io::IOException, - uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -158,8 +135,6 @@ sal_Int64 SAL_CALL WrapStreamForShare::getPosition() } sal_Int64 SAL_CALL WrapStreamForShare::getLength() - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); diff --git a/package/source/zippackage/wrapstreamforshare.hxx b/package/source/zippackage/wrapstreamforshare.hxx index 8fc51001755e..d96c6ffeb696 100644 --- a/package/source/zippackage/wrapstreamforshare.hxx +++ b/package/source/zippackage/wrapstreamforshare.hxx @@ -42,21 +42,16 @@ public: virtual ~WrapStreamForShare() override; // XInputStream - virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available( ) - throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput( ) - throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override; + virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override; + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override; + virtual sal_Int32 SAL_CALL available( ) override; + virtual void SAL_CALL closeInput( ) override; //XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL seek( sal_Int64 location ) override; + virtual sal_Int64 SAL_CALL getPosition() override; + virtual sal_Int64 SAL_CALL getLength() override; }; diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index b6875eee9e23..f7c40f29a012 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -164,8 +164,6 @@ bool OZipFileAccess::StringGoodForPattern_Impl( const OUString& aString, // XInitialization void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArguments ) - throw ( uno::Exception, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -258,9 +256,6 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu // XNameAccess uno::Any SAL_CALL OZipFileAccess::getByName( const OUString& aName ) - throw ( container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -308,7 +303,6 @@ uno::Any SAL_CALL OZipFileAccess::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL OZipFileAccess::getElementNames() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -342,7 +336,6 @@ uno::Sequence< OUString > SAL_CALL OZipFileAccess::getElementNames() } sal_Bool SAL_CALL OZipFileAccess::hasByName( const OUString& aName ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -358,7 +351,6 @@ sal_Bool SAL_CALL OZipFileAccess::hasByName( const OUString& aName ) } uno::Type SAL_CALL OZipFileAccess::getElementType() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -372,7 +364,6 @@ uno::Type SAL_CALL OZipFileAccess::getElementType() } sal_Bool SAL_CALL OZipFileAccess::hasElements() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -387,9 +378,6 @@ sal_Bool SAL_CALL OZipFileAccess::hasElements() // XZipFileAccess uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern( const OUString& aPatternString ) - throw ( container::NoSuchElementException, - io::IOException, packages::WrongPasswordException, packages::zip::ZipException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -422,7 +410,6 @@ uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern( // XComponent void SAL_CALL OZipFileAccess::dispose() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -449,7 +436,6 @@ void SAL_CALL OZipFileAccess::dispose() } void SAL_CALL OZipFileAccess::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -462,7 +448,6 @@ void SAL_CALL OZipFileAccess::addEventListener( const uno::Reference< lang::XEve } void SAL_CALL OZipFileAccess::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -493,19 +478,16 @@ uno::Reference< uno::XInterface > SAL_CALL OZipFileAccess::impl_staticCreateSelf } OUString SAL_CALL OZipFileAccess::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return impl_staticGetImplementationName(); } sal_Bool SAL_CALL OZipFileAccess::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL OZipFileAccess::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { return impl_staticGetSupportedServiceNames(); } |