diff options
Diffstat (limited to 'package/source')
42 files changed, 535 insertions, 535 deletions
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index b90ad7237bd8..da2333af7582 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -98,12 +98,12 @@ ManifestImport::~ManifestImport ( void ) } void SAL_CALL ManifestImport::startDocument( ) - throw( xml::sax::SAXException, uno::RuntimeException ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } void SAL_CALL ManifestImport::endDocument( ) - throw( xml::sax::SAXException, uno::RuntimeException ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } @@ -269,7 +269,7 @@ void ManifestImport::doStartKeyAlg(StringHashMap &rConvertedAttribs) } void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) - throw( xml::sax::SAXException, uno::RuntimeException ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { StringHashMap aConvertedAttribs; OUString aConvertedName = PushNameAndNamespaces( aName, xAttribs, aConvertedAttribs ); @@ -339,7 +339,7 @@ namespace } void SAL_CALL ManifestImport::endElement( const OUString& aName ) - throw( xml::sax::SAXException, uno::RuntimeException ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { OUString aConvertedName = ConvertName( aName ); if ( !aStack.empty() && aStack.rbegin()->m_aConvertedName.equals( aConvertedName ) ) @@ -361,22 +361,22 @@ void SAL_CALL ManifestImport::endElement( const OUString& aName ) } void SAL_CALL ManifestImport::characters( const OUString& /*aChars*/ ) - throw( xml::sax::SAXException, uno::RuntimeException ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } void SAL_CALL ManifestImport::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) - throw( xml::sax::SAXException, uno::RuntimeException ) + 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 ) + 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 ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { } diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 21b8626ddcb2..ac099c4c285f 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -125,21 +125,21 @@ public: ManifestImport( std::vector < ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > > & rNewVector ); ~ManifestImport( void ); virtual void SAL_CALL startDocument( ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endDocument( ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL endElement( const OUString& aName ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL characters( const OUString& aChars ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) - throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); private: void doFileEntry(StringHashMap &rConvertedAttribs) throw(::com::sun::star::uno::RuntimeException); void doEncryptionData(StringHashMap &rConvertedAttribs) throw(::com::sun::star::uno::RuntimeException); diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx index ac8d75bf287e..2a3a4281b19e 100644 --- a/package/source/manifest/ManifestReader.cxx +++ b/package/source/manifest/ManifestReader.cxx @@ -47,7 +47,7 @@ ManifestReader::~ManifestReader() { } Sequence< Sequence< PropertyValue > > SAL_CALL ManifestReader::readManifestSequence( const Reference< XInputStream >& rStream ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { Sequence < Sequence < PropertyValue > > aManifestSequence; Reference < XParser > xParser = Parser::create(m_xContext); @@ -101,19 +101,19 @@ Sequence < OUString > ManifestReader::static_getSupportedServiceNames() } OUString ManifestReader::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return static_getImplementationName(); } sal_Bool SAL_CALL ManifestReader::supportsService(OUString const & rServiceName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName ); } Sequence < OUString > ManifestReader::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return static_getSupportedServiceNames(); } diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx index 72fe473ad153..76d93a0fc48a 100644 --- a/package/source/manifest/ManifestReader.hxx +++ b/package/source/manifest/ManifestReader.hxx @@ -43,15 +43,15 @@ public: // XManifestReader virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL readManifestSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rStream ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Component constructor static OUString static_getImplementationName(); diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/manifest/ManifestWriter.cxx index 2c32bc994d68..458b1f16591c 100644 --- a/package/source/manifest/ManifestWriter.cxx +++ b/package/source/manifest/ManifestWriter.cxx @@ -57,7 +57,7 @@ ManifestWriter::~ManifestWriter() // XManifestWriter methods void SAL_CALL ManifestWriter::writeManifestSequence( const Reference< XOutputStream >& rStream, const Sequence< Sequence< PropertyValue > >& rSequence ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Reference < XWriter > xSource = Writer::create( m_xContext ); xSource->setOutputStream ( rStream ); @@ -89,18 +89,18 @@ Sequence < OUString > ManifestWriter::static_getSupportedServiceNames() } OUString ManifestWriter::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return static_getImplementationName(); } sal_Bool SAL_CALL ManifestWriter::supportsService(OUString const & rServiceName) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } Sequence < OUString > ManifestWriter::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return static_getSupportedServiceNames(); } diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx index f4b77a0f17e6..3bd8554d23f2 100644 --- a/package/source/manifest/ManifestWriter.hxx +++ b/package/source/manifest/ManifestWriter.hxx @@ -43,15 +43,15 @@ public: // XManifestWriter virtual void SAL_CALL writeManifestSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rStream, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rSequence ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Component constructor static OUString static_getImplementationName(); diff --git a/package/source/xstor/disposelistener.cxx b/package/source/xstor/disposelistener.cxx index d2d5f3d147f2..63978f0fa7cf 100644 --- a/package/source/xstor/disposelistener.cxx +++ b/package/source/xstor/disposelistener.cxx @@ -36,7 +36,7 @@ void OChildDispListener_Impl::OwnerIsDisposed() } void SAL_CALL OChildDispListener_Impl::disposing( const lang::EventObject& Source ) - throw ( uno::RuntimeException ) + 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 1ca57962ce13..eafab4397d07 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 ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx index f0cfc517e258..f72439d2d354 100644 --- a/package/source/xstor/ocompinstream.cxx +++ b/package/source/xstor/ocompinstream.cxx @@ -77,7 +77,7 @@ OInputCompStream::~OInputCompStream() } uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Any aReturn; @@ -110,7 +110,7 @@ sal_Int32 SAL_CALL OInputCompStream::readBytes( uno::Sequence< sal_Int8 >& aData throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -132,7 +132,7 @@ sal_Int32 SAL_CALL OInputCompStream::readSomeBytes( uno::Sequence< sal_Int8 >& a throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -155,7 +155,7 @@ void SAL_CALL OInputCompStream::skipBytes( sal_Int32 nBytesToSkip ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -177,7 +177,7 @@ void SAL_CALL OInputCompStream::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL OInputCompStream::available( ) throw ( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -199,13 +199,13 @@ sal_Int32 SAL_CALL OInputCompStream::available( ) void SAL_CALL OInputCompStream::closeInput( ) throw ( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { dispose(); } uno::Reference< io::XInputStream > SAL_CALL OInputCompStream::getInputStream() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -221,7 +221,7 @@ uno::Reference< io::XInputStream > SAL_CALL OInputCompStream::getInputStream() } uno::Reference< io::XOutputStream > SAL_CALL OInputCompStream::getOutputStream() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -262,7 +262,7 @@ void OInputCompStream::InternalDispose() } void SAL_CALL OInputCompStream::dispose( ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -289,7 +289,7 @@ void SAL_CALL OInputCompStream::dispose( ) } void SAL_CALL OInputCompStream::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -305,7 +305,7 @@ void SAL_CALL OInputCompStream::addEventListener( const uno::Reference< lang::XE } void SAL_CALL OInputCompStream::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -320,7 +320,7 @@ void SAL_CALL OInputCompStream::removeEventListener( const uno::Reference< lang: sal_Bool SAL_CALL OInputCompStream::hasByID( const OUString& sID ) throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -347,7 +347,7 @@ sal_Bool SAL_CALL OInputCompStream::hasByID( const OUString& sID ) OUString SAL_CALL OInputCompStream::getTargetByID( const OUString& sID ) throw ( container::NoSuchElementException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -371,7 +371,7 @@ OUString SAL_CALL OInputCompStream::getTargetByID( const OUString& sID ) OUString SAL_CALL OInputCompStream::getTypeByID( const OUString& sID ) throw ( container::NoSuchElementException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -395,7 +395,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -424,7 +424,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -458,7 +458,7 @@ 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) + throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -488,7 +488,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -507,7 +507,7 @@ void SAL_CALL OInputCompStream::insertRelationshipByID( const OUString& /*sID*/ void SAL_CALL OInputCompStream::removeRelationshipByID( const OUString& /*sID*/ ) throw ( container::NoSuchElementException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -526,7 +526,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -544,7 +544,7 @@ void SAL_CALL OInputCompStream::insertRelationships( const uno::Sequence< uno:: void SAL_CALL OInputCompStream::clearRelationships() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -561,7 +561,7 @@ void SAL_CALL OInputCompStream::clearRelationships() } uno::Reference< beans::XPropertySetInfo > SAL_CALL OInputCompStream::getPropertySetInfo() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -580,7 +580,7 @@ void SAL_CALL OInputCompStream::setPropertyValue( const OUString& aPropertyName, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -605,7 +605,7 @@ void SAL_CALL OInputCompStream::setPropertyValue( const OUString& aPropertyName, uno::Any SAL_CALL OInputCompStream::getPropertyValue( const OUString& aProp ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -641,7 +641,7 @@ void SAL_CALL OInputCompStream::addPropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -659,7 +659,7 @@ void SAL_CALL OInputCompStream::removePropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -677,7 +677,7 @@ void SAL_CALL OInputCompStream::addVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -695,7 +695,7 @@ void SAL_CALL OInputCompStream::removeVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + 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 ba71dd80e491..7b931c7e5c31 100644 --- a/package/source/xstor/ocompinstream.hxx +++ b/package/source/xstor/ocompinstream.hxx @@ -70,49 +70,49 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XInputStream virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL available( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL closeInput( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); //XStream - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception); //XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); //XRelationshipAccess - virtual ::sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getAllRelationships( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertRelationships( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aEntries, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearRelationships( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getAllRelationships( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertRelationships( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aEntries, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearRelationships( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); }; diff --git a/package/source/xstor/ohierarchyholder.cxx b/package/source/xstor/ohierarchyholder.cxx index 7a297d2e3f7c..0a3f926cc613 100644 --- a/package/source/xstor/ohierarchyholder.cxx +++ b/package/source/xstor/ohierarchyholder.cxx @@ -259,7 +259,7 @@ void OHierarchyElement_Impl::TestForClosing() } void SAL_CALL OHierarchyElement_Impl::disposing( const lang::EventObject& Source ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { try { @@ -303,12 +303,12 @@ void OHierarchyElement_Impl::RemoveElement( const ::rtl::Reference< OHierarchyEl // XTransactionListener void SAL_CALL OHierarchyElement_Impl::preCommit( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { } void SAL_CALL OHierarchyElement_Impl::commited( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { try { @@ -324,12 +324,12 @@ void SAL_CALL OHierarchyElement_Impl::commited( const ::com::sun::star::lang::Ev } void SAL_CALL OHierarchyElement_Impl::preRevert( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { } void SAL_CALL OHierarchyElement_Impl::reverted( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { } diff --git a/package/source/xstor/ohierarchyholder.hxx b/package/source/xstor/ohierarchyholder.hxx index e26c4684c618..095c4a0b01df 100644 --- a/package/source/xstor/ohierarchyholder.hxx +++ b/package/source/xstor/ohierarchyholder.hxx @@ -93,17 +93,17 @@ public: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XTransactionListener virtual void SAL_CALL preCommit( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL commited( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL preRevert( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL reverted( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/package/source/xstor/oseekinstream.cxx b/package/source/xstor/oseekinstream.cxx index 6abdcf3794e2..7b16ee028a9c 100644 --- a/package/source/xstor/oseekinstream.cxx +++ b/package/source/xstor/oseekinstream.cxx @@ -56,7 +56,7 @@ OInputSeekStream::~OInputSeekStream() } uno::Sequence< uno::Type > SAL_CALL OInputSeekStream::getTypes() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { static ::cppu::OTypeCollection* pTypeCollection = NULL ; @@ -78,7 +78,7 @@ uno::Sequence< uno::Type > SAL_CALL OInputSeekStream::getTypes() } uno::Any SAL_CALL OInputSeekStream::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -109,7 +109,7 @@ void SAL_CALL OInputSeekStream::release() void SAL_CALL OInputSeekStream::seek( sal_Int64 location ) throw ( lang::IllegalArgumentException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -129,7 +129,7 @@ void SAL_CALL OInputSeekStream::seek( sal_Int64 location ) sal_Int64 SAL_CALL OInputSeekStream::getPosition() throw ( io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_bDisposed ) @@ -149,7 +149,7 @@ sal_Int64 SAL_CALL OInputSeekStream::getPosition() sal_Int64 SAL_CALL OInputSeekStream::getLength() throw ( io::IOException, - uno::RuntimeException ) + 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 f7cb43b13385..af133b9351d6 100644 --- a/package/source/xstor/oseekinstream.hxx +++ b/package/source/xstor/oseekinstream.hxx @@ -42,17 +42,17 @@ public: virtual ~OInputSeekStream(); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); //XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index eb32aeac92b1..8b1e4c5291db 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -1873,7 +1873,7 @@ void OWriteStream::ModifyParentUnlockMutex_Impl( ::osl::ResettableMutexGuard& aG } uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Any aReturn; @@ -1935,7 +1935,7 @@ void SAL_CALL OWriteStream::release() throw() } uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( m_pData->m_pTypeCollection == NULL ) { @@ -2048,7 +2048,7 @@ 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 ) + throw( uno::RuntimeException, std::exception ) { ::cppu::OImplementationId &rId = lcl_ImplId::get(); return rId.getImplementationId(); @@ -2058,7 +2058,7 @@ sal_Int32 SAL_CALL OWriteStream::readBytes( uno::Sequence< sal_Int8 >& aData, sa throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2080,7 +2080,7 @@ sal_Int32 SAL_CALL OWriteStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2102,7 +2102,7 @@ void SAL_CALL OWriteStream::skipBytes( sal_Int32 nBytesToSkip ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2123,7 +2123,7 @@ void SAL_CALL OWriteStream::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL OWriteStream::available( ) throw ( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2145,7 +2145,7 @@ sal_Int32 SAL_CALL OWriteStream::available( ) void SAL_CALL OWriteStream::closeInput( ) throw ( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2169,7 +2169,7 @@ void SAL_CALL OWriteStream::closeInput( ) } uno::Reference< io::XInputStream > SAL_CALL OWriteStream::getInputStream() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2186,7 +2186,7 @@ uno::Reference< io::XInputStream > SAL_CALL OWriteStream::getInputStream() } uno::Reference< io::XOutputStream > SAL_CALL OWriteStream::getOutputStream() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2208,7 +2208,7 @@ void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2275,7 +2275,7 @@ void SAL_CALL OWriteStream::flush() throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { // In case stream is flushed it's current version becomes visible // to the parent storage. Usually parent storage flushes the stream @@ -2326,7 +2326,7 @@ void SAL_CALL OWriteStream::closeOutput() throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2350,7 +2350,7 @@ void SAL_CALL OWriteStream::closeOutput() void SAL_CALL OWriteStream::seek( sal_Int64 location ) throw ( lang::IllegalArgumentException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2370,7 +2370,7 @@ void SAL_CALL OWriteStream::seek( sal_Int64 location ) sal_Int64 SAL_CALL OWriteStream::getPosition() throw ( io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2390,7 +2390,7 @@ sal_Int64 SAL_CALL OWriteStream::getPosition() sal_Int64 SAL_CALL OWriteStream::getLength() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2410,7 +2410,7 @@ sal_Int64 SAL_CALL OWriteStream::getLength() void SAL_CALL OWriteStream::truncate() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2441,7 +2441,7 @@ void SAL_CALL OWriteStream::truncate() } void SAL_CALL OWriteStream::dispose() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { // should be an internal method since it can be called only from parent storage { @@ -2506,7 +2506,7 @@ void SAL_CALL OWriteStream::dispose() void SAL_CALL OWriteStream::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2522,7 +2522,7 @@ void SAL_CALL OWriteStream::addEventListener( void SAL_CALL OWriteStream::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2538,7 +2538,7 @@ void SAL_CALL OWriteStream::removeEventListener( void SAL_CALL OWriteStream::setEncryptionPassword( const OUString& aPass ) throw ( uno::RuntimeException, - io::IOException ) + io::IOException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2559,7 +2559,7 @@ void SAL_CALL OWriteStream::setEncryptionPassword( const OUString& aPass ) void SAL_CALL OWriteStream::removeEncryption() throw ( uno::RuntimeException, - io::IOException ) + io::IOException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2579,7 +2579,7 @@ void SAL_CALL OWriteStream::removeEncryption() } void SAL_CALL OWriteStream::setEncryptionData( const uno::Sequence< beans::NamedValue >& aEncryptionData ) - throw (io::IOException, uno::RuntimeException) + throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2599,7 +2599,7 @@ void SAL_CALL OWriteStream::setEncryptionData( const uno::Sequence< beans::Named } sal_Bool SAL_CALL OWriteStream::hasEncryptionData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2616,7 +2616,7 @@ sal_Bool SAL_CALL OWriteStream::hasEncryptionData() sal_Bool SAL_CALL OWriteStream::hasByID( const OUString& sID ) throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2646,7 +2646,7 @@ sal_Bool SAL_CALL OWriteStream::hasByID( const OUString& sID ) OUString SAL_CALL OWriteStream::getTargetByID( const OUString& sID ) throw ( container::NoSuchElementException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2670,7 +2670,7 @@ OUString SAL_CALL OWriteStream::getTargetByID( const OUString& sID ) OUString SAL_CALL OWriteStream::getTypeByID( const OUString& sID ) throw ( container::NoSuchElementException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2694,7 +2694,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2723,7 +2723,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2757,7 +2757,7 @@ 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) + throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2776,7 +2776,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2839,7 +2839,7 @@ void SAL_CALL OWriteStream::insertRelationshipByID( const OUString& sID, const void SAL_CALL OWriteStream::removeRelationshipByID( const OUString& sID ) throw ( container::NoSuchElementException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2880,7 +2880,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2961,7 +2961,7 @@ void SAL_CALL OWriteStream::insertRelationships( const uno::Sequence< uno::Sequ void SAL_CALL OWriteStream::clearRelationships() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2980,7 +2980,7 @@ void SAL_CALL OWriteStream::clearRelationships() } uno::Reference< beans::XPropertySetInfo > SAL_CALL OWriteStream::getPropertySetInfo() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2993,7 +2993,7 @@ void SAL_CALL OWriteStream::setPropertyValue( const OUString& aPropertyName, con beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3118,7 +3118,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3173,7 +3173,7 @@ void SAL_CALL OWriteStream::addPropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3191,7 +3191,7 @@ void SAL_CALL OWriteStream::removePropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3209,7 +3209,7 @@ void SAL_CALL OWriteStream::addVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3227,7 +3227,7 @@ void SAL_CALL OWriteStream::removeVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3290,7 +3290,7 @@ void OWriteStream::BroadcastTransaction( sal_Int8 nMessage ) void SAL_CALL OWriteStream::commit() throw ( io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::commit" ); @@ -3354,7 +3354,7 @@ void SAL_CALL OWriteStream::commit() void SAL_CALL OWriteStream::revert() throw ( io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::revert" ); @@ -3419,7 +3419,7 @@ void SAL_CALL OWriteStream::revert() // XTransactionBroadcaster void SAL_CALL OWriteStream::addTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3437,7 +3437,7 @@ void SAL_CALL OWriteStream::addTransactionListener( const uno::Reference< embed: } void SAL_CALL OWriteStream::removeTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener ) - throw ( uno::RuntimeException ) + 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 e1c31588b951..9a2167074bf8 100644 --- a/package/source/xstor/owriteablestream.hxx +++ b/package/source/xstor/owriteablestream.hxx @@ -307,99 +307,99 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XInputStream virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL available( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL closeInput( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XOutputStream - virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); //XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); //XStream - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XTruncate - virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); //XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); //XEncryptionProtectedSource virtual void SAL_CALL setEncryptionPassword( const OUString& aPass ) throw ( ::com::sun::star::uno::RuntimeException, - ::com::sun::star::io::IOException ); + ::com::sun::star::io::IOException, std::exception ); virtual void SAL_CALL removeEncryption() throw ( ::com::sun::star::uno::RuntimeException, - ::com::sun::star::io::IOException ); + ::com::sun::star::io::IOException, std::exception ); //XEncryptionProtectedSource2 - virtual void SAL_CALL setEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasEncryptionData() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasEncryptionData() throw (::com::sun::star::uno::RuntimeException, std::exception); //XRelationshipAccess - virtual ::sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getAllRelationships( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertRelationships( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aEntries, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearRelationships( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByID( const OUString& sID ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getAllRelationships( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertRelationships( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aEntries, ::sal_Bool bReplace ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearRelationships( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ); // XTransactedObject virtual void SAL_CALL commit() throw ( ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL revert() throw ( ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XTransactionBroadcaster virtual void SAL_CALL addTransactionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XTransactionListener >& aListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeTransactionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XTransactionListener >& aListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); }; diff --git a/package/source/xstor/selfterminatefilestream.cxx b/package/source/xstor/selfterminatefilestream.cxx index fe21e3bcc169..6ba6e6845b52 100644 --- a/package/source/xstor/selfterminatefilestream.cxx +++ b/package/source/xstor/selfterminatefilestream.cxx @@ -66,7 +66,7 @@ sal_Int32 SAL_CALL OSelfTerminateFileStream::readBytes( uno::Sequence< sal_Int8 throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xInputStream->readBytes( aData, nBytesToRead ); } @@ -75,7 +75,7 @@ sal_Int32 SAL_CALL OSelfTerminateFileStream::readSomeBytes( uno::Sequence< sal_I throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xInputStream->readSomeBytes( aData, nMaxBytesToRead ); } @@ -84,7 +84,7 @@ void SAL_CALL OSelfTerminateFileStream::skipBytes( sal_Int32 nBytesToSkip ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xInputStream->skipBytes( nBytesToSkip ); } @@ -92,7 +92,7 @@ void SAL_CALL OSelfTerminateFileStream::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL OSelfTerminateFileStream::available( ) throw ( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xInputStream->available(); } @@ -100,7 +100,7 @@ sal_Int32 SAL_CALL OSelfTerminateFileStream::available( ) void SAL_CALL OSelfTerminateFileStream::closeInput( ) throw ( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { CloseStreamDeleteFile(); } @@ -108,21 +108,21 @@ void SAL_CALL OSelfTerminateFileStream::closeInput( ) void SAL_CALL OSelfTerminateFileStream::seek( sal_Int64 location ) throw ( lang::IllegalArgumentException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_xSeekable->seek( location ); } sal_Int64 SAL_CALL OSelfTerminateFileStream::getPosition() throw ( io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return m_xSeekable->getPosition(); } sal_Int64 SAL_CALL OSelfTerminateFileStream::getLength() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xSeekable->getLength(); } diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx index 12e5f2ef0df7..cff8f5ade2e4 100644 --- a/package/source/xstor/selfterminatefilestream.hxx +++ b/package/source/xstor/selfterminatefilestream.hxx @@ -47,20 +47,20 @@ public: // XInputStream virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL available() - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL closeInput() - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); //XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx index be48470284d4..08683628b3f9 100644 --- a/package/source/xstor/switchpersistencestream.cxx +++ b/package/source/xstor/switchpersistencestream.cxx @@ -212,7 +212,7 @@ void SwitchablePersistenceStream::CloseAll_Impl() // com::sun::star::io::XStream uno::Reference< io::XInputStream > SAL_CALL SwitchablePersistenceStream::getInputStream( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -222,7 +222,7 @@ uno::Reference< io::XInputStream > SAL_CALL SwitchablePersistenceStream::getInpu } uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOutputStream( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -233,7 +233,7 @@ uno::Reference< io::XOutputStream > SAL_CALL SwitchablePersistenceStream::getOut // com::sun::star::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) + throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -248,7 +248,7 @@ 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) + throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -263,7 +263,7 @@ 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) + throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -278,7 +278,7 @@ void SAL_CALL SwitchablePersistenceStream::skipBytes( ::sal_Int32 nBytesToSkip ) } ::sal_Int32 SAL_CALL SwitchablePersistenceStream::available( ) - throw (io::NotConnectedException, io::IOException, uno::RuntimeException) + throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -293,7 +293,7 @@ void SAL_CALL SwitchablePersistenceStream::skipBytes( ::sal_Int32 nBytesToSkip ) } void SAL_CALL SwitchablePersistenceStream::closeInput() - throw (io::NotConnectedException, io::IOException, uno::RuntimeException) + throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -307,7 +307,7 @@ void SAL_CALL SwitchablePersistenceStream::closeInput() // com::sun::star::io::XOutputStream void SAL_CALL SwitchablePersistenceStream::writeBytes( const uno::Sequence< ::sal_Int8 >& aData ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) + throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -325,7 +325,7 @@ void SAL_CALL SwitchablePersistenceStream::writeBytes( const uno::Sequence< ::sa } void SAL_CALL SwitchablePersistenceStream::flush( ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) + throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -346,7 +346,7 @@ void SAL_CALL SwitchablePersistenceStream::flush( ) } void SAL_CALL SwitchablePersistenceStream::closeOutput( ) - throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException) + throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -360,7 +360,7 @@ void SAL_CALL SwitchablePersistenceStream::closeOutput( ) // com::sun::star::io::XTruncate void SAL_CALL SwitchablePersistenceStream::truncate( ) - throw (io::IOException, uno::RuntimeException) + throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -379,7 +379,7 @@ void SAL_CALL SwitchablePersistenceStream::truncate( ) // com::sun::star::io::XSeekable void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location ) - throw (lang::IllegalArgumentException, io::IOException, uno::RuntimeException) + throw (lang::IllegalArgumentException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -394,7 +394,7 @@ void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location ) } ::sal_Int64 SAL_CALL SwitchablePersistenceStream::getPosition( ) - throw (io::IOException, uno::RuntimeException) + throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -409,7 +409,7 @@ void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location ) } ::sal_Int64 SAL_CALL SwitchablePersistenceStream::getLength( ) - throw (io::IOException, uno::RuntimeException) + throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -424,7 +424,7 @@ void SAL_CALL SwitchablePersistenceStream::seek( ::sal_Int64 location ) } void SAL_CALL SwitchablePersistenceStream::waitForCompletion() - throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::io::IOException, ::com::sun::star::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 b94958ae170b..81f34c326e36 100644 --- a/package/source/xstor/switchpersistencestream.hxx +++ b/package/source/xstor/switchpersistencestream.hxx @@ -77,31 +77,31 @@ public: void CopyAndSwitchPersistenceTo( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ); // com::sun::star::io::XStream - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::io::XInputStream - virtual ::sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL available( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL closeInput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL available( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL closeInput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::io::XOutputStream - virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL flush( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL closeOutput( ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::io::XTruncate - virtual void SAL_CALL truncate( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL truncate( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // com::sun::star::io::XSeekable - virtual void SAL_CALL seek( ::sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Int64 SAL_CALL getPosition( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL seek( ::sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int64 SAL_CALL getPosition( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int64 SAL_CALL getLength( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::io::XAsyncOutputMonitor - virtual void SAL_CALL waitForCompletion( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL waitForCompletion( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx index 74c7b7f43cb7..1f9ab09c6176 100644 --- a/package/source/xstor/xfactory.cxx +++ b/package/source/xstor/xfactory.cxx @@ -81,7 +81,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::impl_staticCreateSel uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstance() throw ( uno::Exception, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { // TODO: reimplement TempStream service to support XStream interface uno::Reference < io::XStream > xTempStream( @@ -100,7 +100,7 @@ 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 ) + uno::RuntimeException, std::exception ) { // The request for storage can be done with up to three arguments @@ -281,19 +281,19 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr } OUString SAL_CALL OStorageFactory::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return impl_staticGetImplementationName(); } sal_Bool SAL_CALL OStorageFactory::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL OStorageFactory::getSupportedServiceNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return impl_staticGetSupportedServiceNames(); } diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx index 4a56ccd6b95b..9305b1eb58d1 100644 --- a/package/source/xstor/xfactory.hxx +++ b/package/source/xstor/xfactory.hxx @@ -47,13 +47,13 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); // XSingleServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance() throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 1906a809b4c8..7846a4c7a880 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -2191,7 +2191,7 @@ void OStorage::MakeLinkToSubComponent_Impl( const uno::Reference< lang::XCompone // XInterface uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Any aReturn; @@ -2264,7 +2264,7 @@ void SAL_CALL OStorage::release() throw() // XTypeProvider uno::Sequence< uno::Type > SAL_CALL OStorage::getTypes() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( m_pData->m_pTypeCollection == NULL ) { @@ -2332,7 +2332,7 @@ 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 ) + throw( uno::RuntimeException, std::exception ) { ::cppu::OImplementationId &rID = lcl_ImplId::get(); return rID.getImplementationId(); @@ -2344,7 +2344,7 @@ void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >& io::IOException, lang::IllegalArgumentException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyToStorage" ); @@ -2411,7 +2411,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement( packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::openStreamElement" ); @@ -2513,7 +2513,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStreamElement( packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::openEncryptedStreamElement" ); @@ -2526,7 +2526,7 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement( lang::IllegalArgumentException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::openStorageElement" ); @@ -2679,7 +2679,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const OUStr packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::cloneStreamElement" ); @@ -2762,7 +2762,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStreamElement( packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::cloneEncryptedStreamElement" ); @@ -2775,7 +2775,7 @@ void SAL_CALL OStorage::copyLastCommitTo( lang::IllegalArgumentException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyLastCommitTo" ); @@ -2841,7 +2841,7 @@ void SAL_CALL OStorage::copyStorageElementLastCommitTo( lang::IllegalArgumentException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyStorageElementLastCommitTo" ); @@ -2935,7 +2935,7 @@ sal_Bool SAL_CALL OStorage::isStreamElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3002,7 +3002,7 @@ sal_Bool SAL_CALL OStorage::isStorageElement( const OUString& aElementName ) throw ( embed::InvalidStorageException, lang::IllegalArgumentException, container::NoSuchElementException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3071,7 +3071,7 @@ void SAL_CALL OStorage::removeElement( const OUString& aElementName ) container::NoSuchElementException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::removeElement" ); @@ -3163,7 +3163,7 @@ void SAL_CALL OStorage::renameElement( const OUString& aElementName, const OUStr container::ElementExistException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::renameElement" ); @@ -3267,7 +3267,7 @@ void SAL_CALL OStorage::copyElementTo( const OUString& aElementName, container::ElementExistException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyElementTo" ); @@ -3368,7 +3368,7 @@ void SAL_CALL OStorage::moveElementTo( const OUString& aElementName, container::ElementExistException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::moveElementTo" ); @@ -3480,7 +3480,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream( packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::openEncryptedStream" ); @@ -3589,7 +3589,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream( packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::cloneEncryptedStream" ); @@ -3677,7 +3677,7 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement( container::NoSuchElementException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::getPlainRawStreamElement" ); @@ -3784,7 +3784,7 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement( container::NoSuchElementException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::getRawEncrStreamElement" ); @@ -3901,7 +3901,7 @@ void SAL_CALL OStorage::insertRawEncrStreamElement( const OUString& aStreamName, container::ElementExistException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::insertRawEncrStreamElement" ); @@ -3991,7 +3991,7 @@ void SAL_CALL OStorage::insertRawEncrStreamElement( const OUString& aStreamName, void SAL_CALL OStorage::commit() throw ( io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::commit" ); @@ -4056,7 +4056,7 @@ void SAL_CALL OStorage::commit() void SAL_CALL OStorage::revert() throw ( io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::revert" ); @@ -4127,7 +4127,7 @@ void SAL_CALL OStorage::revert() // XTransactionBroadcaster void SAL_CALL OStorage::addTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4142,7 +4142,7 @@ void SAL_CALL OStorage::addTransactionListener( const uno::Reference< embed::XTr } void SAL_CALL OStorage::removeTransactionListener( const uno::Reference< embed::XTransactionListener >& aListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4162,7 +4162,7 @@ void SAL_CALL OStorage::removeTransactionListener( const uno::Reference< embed:: // to the service back. sal_Bool SAL_CALL OStorage::isModified() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4177,7 +4177,7 @@ sal_Bool SAL_CALL OStorage::isModified() void SAL_CALL OStorage::setModified( sal_Bool bModified ) throw ( beans::PropertyVetoException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4203,7 +4203,7 @@ void SAL_CALL OStorage::setModified( sal_Bool bModified ) void SAL_CALL OStorage::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4220,7 +4220,7 @@ void SAL_CALL OStorage::addModifyListener( void SAL_CALL OStorage::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4240,7 +4240,7 @@ void SAL_CALL OStorage::removeModifyListener( uno::Any SAL_CALL OStorage::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::getByName" ); @@ -4304,7 +4304,7 @@ uno::Any SAL_CALL OStorage::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL OStorage::getElementNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::getElementNames" ); @@ -4340,7 +4340,7 @@ uno::Sequence< OUString > SAL_CALL OStorage::getElementNames() } sal_Bool SAL_CALL OStorage::hasByName( const OUString& aName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::hasByName" ); @@ -4385,7 +4385,7 @@ sal_Bool SAL_CALL OStorage::hasByName( const OUString& aName ) } uno::Type SAL_CALL OStorage::getElementType() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4400,7 +4400,7 @@ uno::Type SAL_CALL OStorage::getElementType() } sal_Bool SAL_CALL OStorage::hasElements() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::hasElements" ); @@ -4437,7 +4437,7 @@ sal_Bool SAL_CALL OStorage::hasElements() // XComponent void SAL_CALL OStorage::dispose() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4472,7 +4472,7 @@ void SAL_CALL OStorage::dispose() void SAL_CALL OStorage::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4488,7 +4488,7 @@ void SAL_CALL OStorage::addEventListener( void SAL_CALL OStorage::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4506,7 +4506,7 @@ void SAL_CALL OStorage::removeEventListener( void SAL_CALL OStorage::setEncryptionPassword( const OUString& aPass ) throw ( uno::RuntimeException, - io::IOException ) + io::IOException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::setEncryptionPassword" ); setEncryptionData( ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) ); @@ -4514,7 +4514,7 @@ void SAL_CALL OStorage::setEncryptionPassword( const OUString& aPass ) void SAL_CALL OStorage::removeEncryption() throw ( uno::RuntimeException, - io::IOException ) + io::IOException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::removeEncryption" ); @@ -4588,7 +4588,7 @@ void SAL_CALL OStorage::removeEncryption() void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValue >& aEncryptionData ) throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::setEncryptionData" ); @@ -4650,7 +4650,7 @@ void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValu } sal_Bool SAL_CALL OStorage::hasEncryptionData() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4660,7 +4660,7 @@ sal_Bool SAL_CALL OStorage::hasEncryptionData() // XEncryptionProtectedStorage void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::NamedValue >& aAlgorithms ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::setEncryptionAlgorithms" ); @@ -4725,7 +4725,7 @@ void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::Nam } uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::getEncryptionAlgorithms" ); @@ -4791,7 +4791,7 @@ uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms() // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL OStorage::getPropertySetInfo() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4810,7 +4810,7 @@ void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const u beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::setPropertyValue" ); @@ -4917,7 +4917,7 @@ 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 ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::getPropertyValue" ); @@ -5026,7 +5026,7 @@ void SAL_CALL OStorage::addPropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5044,7 +5044,7 @@ void SAL_CALL OStorage::removePropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5062,7 +5062,7 @@ void SAL_CALL OStorage::addVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5080,7 +5080,7 @@ void SAL_CALL OStorage::removeVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5099,7 +5099,7 @@ void SAL_CALL OStorage::removeVetoableChangeListener( sal_Bool SAL_CALL OStorage::hasByID( const OUString& sID ) throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5129,7 +5129,7 @@ sal_Bool SAL_CALL OStorage::hasByID( const OUString& sID ) OUString SAL_CALL OStorage::getTargetByID( const OUString& sID ) throw ( container::NoSuchElementException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5153,7 +5153,7 @@ OUString SAL_CALL OStorage::getTargetByID( const OUString& sID ) OUString SAL_CALL OStorage::getTypeByID( const OUString& sID ) throw ( container::NoSuchElementException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5177,7 +5177,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5206,7 +5206,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5241,7 +5241,7 @@ 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) + throw (io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5260,7 +5260,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5323,7 +5323,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5364,7 +5364,7 @@ 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 ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5445,7 +5445,7 @@ void SAL_CALL OStorage::insertRelationships( const uno::Sequence< uno::Sequence void SAL_CALL OStorage::clearRelationships() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5473,7 +5473,7 @@ void SAL_CALL OStorage::insertRawNonEncrStreamElementDirect( container::ElementExistException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + 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 @@ -5489,7 +5489,7 @@ void SAL_CALL OStorage::insertStreamElementDirect( container::ElementExistException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::insertStreamElementDirect" ); @@ -5580,7 +5580,7 @@ void SAL_CALL OStorage::copyElementDirectlyTo( container::ElementExistException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyElementDirectlyTo" ); @@ -5678,7 +5678,7 @@ void SAL_CALL OStorage::writeAndAttachToStream( const uno::Reference< io::XStrea lang::IllegalArgumentException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::writeAndAttachToStream" ); @@ -5749,7 +5749,7 @@ void SAL_CALL OStorage::attachToURL( const OUString& sURL, lang::IllegalArgumentException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::attachToURL" ); @@ -5833,7 +5833,7 @@ uno::Any SAL_CALL OStorage::getElementPropertyValue( const OUString& aElementNam beans::UnknownPropertyException, beans::PropertyVetoException, embed::StorageWrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { SAL_INFO( "package.xstor", "package (mv76033) OStorage::getElementPropertyValue" ); @@ -5936,7 +5936,7 @@ void SAL_CALL OStorage::copyStreamElementData( const OUString& aStreamName, cons packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -6020,7 +6020,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openStreamEle packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -6079,7 +6079,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return openEncryptedStreamByHierarchicalName( aStreamPath, nOpenMode, ::comphelper::OStorageHelper::CreatePackageEncryptionData( sPassword ) ); } @@ -6090,7 +6090,7 @@ void SAL_CALL OStorage::removeStreamElementByHierarchicalName( const OUString& a container::NoSuchElementException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -6124,7 +6124,7 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL OStorage::openEncrypted packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + 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 6fab38508e4d..53883be585ee 100644 --- a/package/source/xstor/xstorage.hxx +++ b/package/source/xstor/xstorage.hxx @@ -337,7 +337,7 @@ public: // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire() throw(); @@ -346,10 +346,10 @@ public: // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XStorage @@ -358,7 +358,7 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode ) @@ -367,7 +367,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass ) @@ -377,7 +377,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL openStorageElement( const OUString& aStorName, sal_Int32 nStorageMode ) @@ -385,7 +385,7 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneStreamElement( const OUString& aStreamName ) @@ -394,7 +394,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement( const OUString& aStreamName, const OUString& aPass ) @@ -404,7 +404,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL copyLastCommitTo( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xTargetStorage ) @@ -412,7 +412,7 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL copyStorageElementLastCommitTo( const OUString& aStorName, @@ -421,19 +421,19 @@ public: ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::InvalidStorageException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeElement( const OUString& aElementName ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -441,7 +441,7 @@ public: ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -450,7 +450,7 @@ public: ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL copyElementTo( const OUString& aElementName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, @@ -461,7 +461,7 @@ public: ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL moveElementTo( const OUString& aElementName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDest, @@ -472,7 +472,7 @@ public: ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XStorage2 @@ -483,7 +483,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL cloneEncryptedStream( const OUString& sStreamName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -492,7 +492,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XStorageRawAccess @@ -503,7 +503,7 @@ public: ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getRawEncrStreamElement( const OUString& sStreamName ) @@ -513,7 +513,7 @@ public: ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL insertRawEncrStreamElement( const OUString& aStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream ) @@ -523,145 +523,145 @@ public: ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XTransactedObject virtual void SAL_CALL commit() throw ( ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL revert() throw ( ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XTransactionBroadcaster virtual void SAL_CALL addTransactionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XTransactionListener >& aListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeTransactionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XTransactionListener >& aListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XModifiable virtual sal_Bool SAL_CALL isModified() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setModified( sal_Bool bModified ) throw ( ::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasElements() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XComponent virtual void SAL_CALL dispose() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XEncryptionProtectedSource virtual void SAL_CALL setEncryptionPassword( const OUString& aPass ) throw ( ::com::sun::star::uno::RuntimeException, - ::com::sun::star::io::IOException ); + ::com::sun::star::io::IOException, std::exception ); virtual void SAL_CALL removeEncryption() throw ( ::com::sun::star::uno::RuntimeException, - ::com::sun::star::io::IOException ); + ::com::sun::star::io::IOException, std::exception ); // XEncryptionProtectedSource2 virtual void SAL_CALL setEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ) throw ( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasEncryptionData() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XEncryptionProtectedStorage - virtual void SAL_CALL setEncryptionAlgorithms( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aAlgorithms ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setEncryptionAlgorithms( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aAlgorithms ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > SAL_CALL getEncryptionAlgorithms() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > SAL_CALL getEncryptionAlgorithms() throw (::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XOptimizedStorage virtual void SAL_CALL insertRawNonEncrStreamElementDirect( const OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream ) @@ -671,7 +671,7 @@ public: ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL insertStreamElementDirect( const OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -679,7 +679,7 @@ public: ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL copyElementDirectlyTo( const OUString& sSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XOptimizedStorage >& xTargetStorage, const OUString& sTargetName ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -688,21 +688,21 @@ public: ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL writeAndAttachToStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL attachToURL( const OUString& sURL, sal_Bool bReadOnly ) throw ( ::com::sun::star::embed::InvalidStorageException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Any SAL_CALL getElementPropertyValue( const OUString& sElementName, const OUString& sPropertyName ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -712,7 +712,7 @@ public: ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL copyStreamElementData( const OUString& sStreamName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xTargetStream ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -720,54 +720,54 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XRelationshipAccess virtual ::sal_Bool SAL_CALL hasByID( const OUString& sID ) throw ( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getTargetByID( const OUString& sID ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getTypeByID( const OUString& sID ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL getRelationshipByID( const OUString& sID ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getRelationshipsByType( const OUString& sType ) throw ( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL getAllRelationships( ) throw ( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL insertRelationshipByID( const OUString& sID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aEntry, ::sal_Bool bReplace ) throw ( ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeRelationshipByID( const OUString& sID ) throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL insertRelationships( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > >& aEntries, ::sal_Bool bReplace ) throw ( ::com::sun::star::container::ElementExistException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL clearRelationships( ) throw ( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XHierarchicalStorageAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) @@ -776,7 +776,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -785,7 +785,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath ) throw ( ::com::sun::star::embed::InvalidStorageException, @@ -793,7 +793,7 @@ public: ::com::sun::star::container::NoSuchElementException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XHierarchicalStorageAccess2 virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ) @@ -803,7 +803,7 @@ public: ::com::sun::star::packages::WrongPasswordException, ::com::sun::star::io::IOException, ::com::sun::star::embed::StorageWrappedTargetException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); }; #endif diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx index 7151d810a78d..9b1ec829f901 100644 --- a/package/source/zipapi/XUnbufferedStream.cxx +++ b/package/source/zipapi/XUnbufferedStream.cxx @@ -155,7 +155,7 @@ XUnbufferedStream::~XUnbufferedStream() } sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( maMutexHolder->GetMutex() ); @@ -305,12 +305,12 @@ 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) + throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { return readBytes ( aData, nMaxBytesToRead ); } void SAL_CALL XUnbufferedStream::skipBytes( sal_Int32 nBytesToSkip ) - throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { if ( nBytesToSkip ) { @@ -320,13 +320,13 @@ void SAL_CALL XUnbufferedStream::skipBytes( sal_Int32 nBytesToSkip ) } sal_Int32 SAL_CALL XUnbufferedStream::available( ) - throw( NotConnectedException, IOException, RuntimeException) + throw( NotConnectedException, IOException, RuntimeException, std::exception) { return static_cast < sal_Int32 > ( mnZipSize - mnMyCurrent ); } void SAL_CALL XUnbufferedStream::closeInput( ) - throw( NotConnectedException, IOException, RuntimeException) + throw( NotConnectedException, IOException, RuntimeException, std::exception) { } diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx index 68cf3ba707ac..62a1e7a3301b 100644 --- a/package/source/zipapi/XUnbufferedStream.hxx +++ b/package/source/zipapi/XUnbufferedStream.hxx @@ -85,15 +85,15 @@ public: // XInputStream virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL available( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL closeInput( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XSeekable /* virtual void SAL_CALL seek( sal_Int64 location ) diff --git a/package/source/zipapi/blowfishcontext.cxx b/package/source/zipapi/blowfishcontext.cxx index b0c043dd319e..fac26fba52d6 100644 --- a/package/source/zipapi/blowfishcontext.cxx +++ b/package/source/zipapi/blowfishcontext.cxx @@ -60,7 +60,7 @@ BlowfishCFB8CipherContext::~BlowfishCFB8CipherContext() } uno::Sequence< sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::convertWithCipherContext( const uno::Sequence< ::sal_Int8 >& aData ) - throw( lang::IllegalArgumentException, lang::DisposedException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, lang::DisposedException, uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pCipher ) @@ -96,7 +96,7 @@ uno::Sequence< sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::convertWithCipherC } uno::Sequence< ::sal_Int8 > SAL_CALL BlowfishCFB8CipherContext::finalizeCipherContextAndDispose() - throw( lang::DisposedException, uno::RuntimeException ) + 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 2b87809fcb6e..b2e4e571f051 100644 --- a/package/source/zipapi/blowfishcontext.hxx +++ b/package/source/zipapi/blowfishcontext.hxx @@ -42,8 +42,8 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XCipherContext > Create( const ::com::sun::star::uno::Sequence< sal_Int8 >& aDerivedKey, const ::com::sun::star::uno::Sequence< sal_Int8 >& aInitVector, bool bEncrypt ); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL convertWithCipherContext( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeCipherContextAndDispose( ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception); }; #endif // _BLOWFISHCONTEXT_HXX diff --git a/package/source/zipapi/sha1context.cxx b/package/source/zipapi/sha1context.cxx index 044a19906996..ba8e782eaaac 100644 --- a/package/source/zipapi/sha1context.cxx +++ b/package/source/zipapi/sha1context.cxx @@ -46,7 +46,7 @@ SHA1DigestContext::~SHA1DigestContext() } void SAL_CALL SHA1DigestContext::updateDigest( const uno::Sequence< ::sal_Int8 >& aData ) - throw( lang::DisposedException, uno::RuntimeException ) + throw( lang::DisposedException, uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_pDigest ) @@ -62,7 +62,7 @@ void SAL_CALL SHA1DigestContext::updateDigest( const uno::Sequence< ::sal_Int8 > } uno::Sequence< ::sal_Int8 > SAL_CALL SHA1DigestContext::finalizeDigestAndDispose() - throw( lang::DisposedException, uno::RuntimeException ) + 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 65bf238aad97..576e172c5242 100644 --- a/package/source/zipapi/sha1context.hxx +++ b/package/source/zipapi/sha1context.hxx @@ -40,8 +40,8 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XDigestContext > Create(); - virtual void SAL_CALL updateDigest( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateDigest( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL finalizeDigestAndDispose() throw (::com::sun::star::lang::DisposedException, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index e1cf3f781266..0b93408b7a4d 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -109,34 +109,34 @@ class ActiveDataStreamer : public ::cppu::WeakImplHelper1< XActiveDataStreamer > public: virtual uno::Reference< XStream > SAL_CALL getStream() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return mStream; } virtual void SAL_CALL setStream( const uno::Reference< XStream >& stream ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { mStream = stream; } }; class DummyInputStream : public ::cppu::WeakImplHelper1< XInputStream > { virtual sal_Int32 SAL_CALL readBytes( uno::Sequence< sal_Int8 >&, sal_Int32 ) - throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) + throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { return 0; } virtual sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< sal_Int8 >&, sal_Int32 ) - throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) + throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { return 0; } virtual void SAL_CALL skipBytes( sal_Int32 ) - throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) + throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) {} virtual sal_Int32 SAL_CALL available() - throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) + throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { return 0; } virtual void SAL_CALL closeInput() - throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) + throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) {} }; @@ -575,7 +575,7 @@ void ZipPackage::getZipFileContents() } void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) - throw( Exception, RuntimeException ) + throw( Exception, RuntimeException, std::exception ) { sal_Bool bHaveZipFile = sal_True; uno::Reference< XProgressHandler > xProgressHandler; @@ -784,7 +784,7 @@ void SAL_CALL ZipPackage::initialize( const uno::Sequence< Any >& aArguments ) } Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName ) - throw( NoSuchElementException, RuntimeException ) + throw( NoSuchElementException, RuntimeException, std::exception ) { OUString sTemp, sDirName; sal_Int32 nOldIndex, nIndex, nStreamIndex; @@ -865,7 +865,7 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const OUString& aName ) } sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { OUString sTemp, sDirName; sal_Int32 nOldIndex, nIndex, nStreamIndex; @@ -944,14 +944,14 @@ sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( const OUString& aName ) } uno::Reference< XInterface > SAL_CALL ZipPackage::createInstance() - throw( Exception, RuntimeException ) + throw( Exception, RuntimeException, std::exception ) { uno::Reference < XInterface > xRef = *( new ZipPackageStream ( *this, m_xContext, m_bAllowRemoveOnInsert ) ); return xRef; } uno::Reference< XInterface > SAL_CALL ZipPackage::createInstanceWithArguments( const uno::Sequence< Any >& aArguments ) - throw( Exception, RuntimeException ) + throw( Exception, RuntimeException, std::exception ) { sal_Bool bArg = sal_False; uno::Reference < XInterface > xRef; @@ -1340,7 +1340,7 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput() } void SAL_CALL ZipPackage::commitChanges() - throw( WrappedTargetException, RuntimeException ) + throw( WrappedTargetException, RuntimeException, std::exception ) { // lock the component for the time of commiting ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -1564,12 +1564,12 @@ const uno::Sequence< sal_Int8 > ZipPackage::GetEncryptionKey() } sal_Bool SAL_CALL ZipPackage::hasPendingChanges() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return sal_False; } Sequence< ElementChange > SAL_CALL ZipPackage::getPendingChanges() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return uno::Sequence < ElementChange > (); } @@ -1597,19 +1597,19 @@ Sequence< OUString > ZipPackage::static_getSupportedServiceNames() } OUString ZipPackage::getImplementationName() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { return static_getImplementationName(); } Sequence< OUString > ZipPackage::getSupportedServiceNames() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { return static_getSupportedServiceNames(); } sal_Bool SAL_CALL ZipPackage::supportsService( OUString const & rServiceName ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } @@ -1632,7 +1632,7 @@ Sequence< sal_Int8 > ZipPackage::getUnoTunnelImplementationId( void ) } sal_Int64 SAL_CALL ZipPackage::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( aIdentifier.getLength() == 16 && 0 == memcmp( getUnoTunnelImplementationId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) return reinterpret_cast < sal_Int64 > ( this ); @@ -1640,13 +1640,13 @@ sal_Int64 SAL_CALL ZipPackage::getSomething( const uno::Sequence< sal_Int8 >& aI } uno::Reference< XPropertySetInfo > SAL_CALL ZipPackage::getPropertySetInfo() - throw( RuntimeException ) + 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 ) + throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { if ( m_nFormat != embed::StorageFormats::PACKAGE ) throw UnknownPropertyException(THROW_WHERE, uno::Reference< uno::XInterface >() ); @@ -1742,7 +1742,7 @@ void SAL_CALL ZipPackage::setPropertyValue( const OUString& aPropertyName, const } Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName ) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { // TODO/LATER: Activate the check when zip-ucp is ready // if ( m_nFormat != embed::StorageFormats::PACKAGE ) @@ -1791,19 +1791,19 @@ Any SAL_CALL ZipPackage::getPropertyValue( const OUString& PropertyName ) throw UnknownPropertyException(THROW_WHERE, uno::Reference< uno::XInterface >() ); } void SAL_CALL ZipPackage::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*xListener*/ ) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { } void SAL_CALL ZipPackage::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< XPropertyChangeListener >& /*aListener*/ ) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { } void SAL_CALL ZipPackage::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ ) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { } void SAL_CALL ZipPackage::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< XVetoableChangeListener >& /*aListener*/ ) - throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) + throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { } diff --git a/package/source/zippackage/ZipPackageBuffer.cxx b/package/source/zippackage/ZipPackageBuffer.cxx index 579896248428..deff026f0d58 100644 --- a/package/source/zippackage/ZipPackageBuffer.cxx +++ b/package/source/zippackage/ZipPackageBuffer.cxx @@ -43,7 +43,7 @@ ZipPackageBuffer::~ZipPackageBuffer(void) } sal_Int32 SAL_CALL ZipPackageBuffer::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { if (nBytesToRead < 0) throw BufferSizeExceededException(THROW_WHERE, *this ); @@ -58,12 +58,12 @@ 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) + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { return readBytes(aData, nMaxBytesToRead); } void SAL_CALL ZipPackageBuffer::skipBytes( sal_Int32 nBytesToSkip ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { if (nBytesToSkip < 0) throw BufferSizeExceededException(THROW_WHERE, *this ); @@ -74,16 +74,16 @@ void SAL_CALL ZipPackageBuffer::skipBytes( sal_Int32 nBytesToSkip ) m_nCurrent+=nBytesToSkip; } sal_Int32 SAL_CALL ZipPackageBuffer::available( ) - throw(NotConnectedException, IOException, RuntimeException) + throw(NotConnectedException, IOException, RuntimeException, std::exception) { return static_cast < sal_Int32 > (m_nEnd - m_nCurrent); } void SAL_CALL ZipPackageBuffer::closeInput( ) - throw(NotConnectedException, IOException, RuntimeException) + throw(NotConnectedException, IOException, RuntimeException, std::exception) { } void SAL_CALL ZipPackageBuffer::writeBytes( const Sequence< sal_Int8 >& aData ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { sal_Int64 nDataLen = aData.getLength(), nCombined = m_nEnd + nDataLen; @@ -106,27 +106,27 @@ void SAL_CALL ZipPackageBuffer::writeBytes( const Sequence< sal_Int8 >& aData ) m_nEnd = m_nCurrent; } void SAL_CALL ZipPackageBuffer::flush( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { } void SAL_CALL ZipPackageBuffer::closeOutput( ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { } void SAL_CALL ZipPackageBuffer::seek( sal_Int64 location ) - throw( IllegalArgumentException, IOException, RuntimeException) + 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) + throw(IOException, RuntimeException, std::exception) { return m_nCurrent; } sal_Int64 SAL_CALL ZipPackageBuffer::getLength( ) - throw(IOException, RuntimeException) + throw(IOException, RuntimeException, std::exception) { return m_nEnd; } diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx index 6ceaea6dcd48..80e4137afc0a 100644 --- a/package/source/zippackage/ZipPackageEntry.cxx +++ b/package/source/zippackage/ZipPackageEntry.cxx @@ -55,12 +55,12 @@ ZipPackageEntry::~ZipPackageEntry() // XChild OUString SAL_CALL ZipPackageEntry::getName( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return msName; } void SAL_CALL ZipPackageEntry::setName( const OUString& aName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if ( pParent && !msName.isEmpty() && pParent->hasByName ( msName ) ) pParent->removeByName ( msName ); @@ -76,7 +76,7 @@ void SAL_CALL ZipPackageEntry::setName( const OUString& aName ) pParent->doInsertByName ( this, sal_False ); } uno::Reference< XInterface > SAL_CALL ZipPackageEntry::getParent( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // return uno::Reference< XInterface >( xParent, UNO_QUERY ); return uno::Reference< XInterface >( static_cast< ::cppu::OWeakObject* >( pParent ), UNO_QUERY ); @@ -91,7 +91,7 @@ void ZipPackageEntry::doSetParent ( ZipPackageFolder * pNewParent, sal_Bool bIns } void SAL_CALL ZipPackageEntry::setParent( const uno::Reference< XInterface >& xNewParent ) - throw(NoSupportException, RuntimeException) + throw(NoSupportException, RuntimeException, std::exception) { sal_Int64 nTest(0); uno::Reference < XUnoTunnel > xTunnel ( xNewParent, UNO_QUERY ); @@ -109,24 +109,24 @@ void SAL_CALL ZipPackageEntry::setParent( const uno::Reference< XInterface >& xN } //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL ZipPackageEntry::getPropertySetInfo( ) - throw(RuntimeException) + 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) + 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) + 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) + 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) + throw(beans::UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 2f0013e2bc43..d4d137499697 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -185,7 +185,7 @@ const ::com::sun::star::uno::Sequence < sal_Int8 >& ZipPackageFolder::static_get // XNameContainer void SAL_CALL ZipPackageFolder::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, uno::RuntimeException) + throw(IllegalArgumentException, ElementExistException, WrappedTargetException, uno::RuntimeException, std::exception) { if (hasByName(aName)) throw ElementExistException(THROW_WHERE, uno::Reference< uno::XInterface >() ); @@ -219,7 +219,7 @@ void SAL_CALL ZipPackageFolder::insertByName( const OUString& aName, const uno:: } } void SAL_CALL ZipPackageFolder::removeByName( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, uno::RuntimeException) + throw(NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception) { ContentHash::iterator aIter = maContents.find ( Name ); if ( aIter == maContents.end() ) @@ -228,18 +228,18 @@ void SAL_CALL ZipPackageFolder::removeByName( const OUString& Name ) } // XEnumerationAccess uno::Reference< XEnumeration > SAL_CALL ZipPackageFolder::createEnumeration( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return uno::Reference < XEnumeration> (new ZipPackageFolderEnumeration(maContents)); } // XElementAccess uno::Type SAL_CALL ZipPackageFolder::getElementType( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return ::getCppuType ((const uno::Reference< XUnoTunnel > *) 0); } sal_Bool SAL_CALL ZipPackageFolder::hasElements( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return maContents.size() > 0; } @@ -253,12 +253,12 @@ ContentInfo& ZipPackageFolder::doGetByName( const OUString& aName ) return *(*aIter).second; } uno::Any SAL_CALL ZipPackageFolder::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, uno::RuntimeException) + throw(NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception) { return uno::makeAny ( doGetByName ( aName ).xTunnel ); } uno::Sequence< OUString > SAL_CALL ZipPackageFolder::getElementNames( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { sal_uInt32 i=0, nSize = maContents.size(); uno::Sequence < OUString > aSequence ( nSize ); @@ -269,13 +269,13 @@ uno::Sequence< OUString > SAL_CALL ZipPackageFolder::getElementNames( ) return aSequence; } sal_Bool SAL_CALL ZipPackageFolder::hasByName( const OUString& aName ) - throw(uno::RuntimeException) + 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) + throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, uno::RuntimeException, std::exception) { if ( hasByName( aName ) ) removeByName( aName ); @@ -764,7 +764,7 @@ void ZipPackageFolder::releaseUpwardRef( void ) } sal_Int64 SAL_CALL ZipPackageFolder::getSomething( const uno::Sequence< sal_Int8 >& aIdentifier ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { sal_Int64 nMe = 0; if ( aIdentifier.getLength() == 16 && @@ -773,7 +773,7 @@ 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) + throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, uno::RuntimeException, std::exception) { if ( aPropertyName == "MediaType" ) { @@ -791,7 +791,7 @@ void SAL_CALL ZipPackageFolder::setPropertyValue( const OUString& aPropertyName, throw UnknownPropertyException(THROW_WHERE, uno::Reference< uno::XInterface >() ); } uno::Any SAL_CALL ZipPackageFolder::getPropertyValue( const OUString& PropertyName ) - throw(UnknownPropertyException, WrappedTargetException, uno::RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, uno::RuntimeException, std::exception) { if ( PropertyName == "MediaType" ) { @@ -828,13 +828,13 @@ void ZipPackageFolder::doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetPa pEntry->setParent ( *this ); } OUString ZipPackageFolder::getImplementationName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("ZipPackageFolder"); } uno::Sequence< OUString > ZipPackageFolder::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.packages.PackageFolder"; @@ -842,7 +842,7 @@ uno::Sequence< OUString > ZipPackageFolder::getSupportedServiceNames() } sal_Bool SAL_CALL ZipPackageFolder::supportsService( OUString const & rServiceName ) - throw (uno::RuntimeException) + 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 06d5f93cf573..f8ac3b03ef68 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.cxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.cxx @@ -40,12 +40,12 @@ ZipPackageFolderEnumeration::~ZipPackageFolderEnumeration( void ) } sal_Bool SAL_CALL ZipPackageFolderEnumeration::hasMoreElements( ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return (aIterator != rContents.end() ); } uno::Any SAL_CALL ZipPackageFolderEnumeration::nextElement( ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aAny; if (aIterator == rContents.end() ) @@ -56,13 +56,13 @@ uno::Any SAL_CALL ZipPackageFolderEnumeration::nextElement( ) } OUString ZipPackageFolderEnumeration::getImplementationName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString ("ZipPackageFolderEnumeration"); } uno::Sequence< OUString > ZipPackageFolderEnumeration::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.packages.PackageFolderEnumeration"; @@ -70,7 +70,7 @@ uno::Sequence< OUString > ZipPackageFolderEnumeration::getSupportedServiceNames( } sal_Bool SAL_CALL ZipPackageFolderEnumeration::supportsService( OUString const & rServiceName ) - throw (uno::RuntimeException) + 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 20d2b9d9417f..038acb7eb499 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx @@ -40,17 +40,17 @@ public: // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL nextElement( ) - throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif diff --git a/package/source/zippackage/ZipPackageSink.cxx b/package/source/zippackage/ZipPackageSink.cxx index 19cafdac42c0..c33911e2c6c6 100644 --- a/package/source/zippackage/ZipPackageSink.cxx +++ b/package/source/zippackage/ZipPackageSink.cxx @@ -27,12 +27,12 @@ ZipPackageSink::~ZipPackageSink(void) { } void SAL_CALL ZipPackageSink::setInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { xStream = aStream; } ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL ZipPackageSink::getInputStream( ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return xStream; } diff --git a/package/source/zippackage/ZipPackageSink.hxx b/package/source/zippackage/ZipPackageSink.hxx index 1ceba9c95e57..0618e3100159 100644 --- a/package/source/zippackage/ZipPackageSink.hxx +++ b/package/source/zippackage/ZipPackageSink.hxx @@ -33,9 +33,9 @@ public: ZipPackageSink(); virtual ~ZipPackageSink(); virtual void SAL_CALL setInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& aStream ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); }; #endif diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index a1544e12104b..d6355761d1e2 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -452,7 +452,7 @@ void ZipPackageStream::SetPackageMember( sal_Bool bNewValue ) // XActiveDataSink void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInputStream >& aStream ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // if seekable access is required the wrapping will be done on demand xStream = aStream; @@ -492,7 +492,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData() } uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { try { @@ -525,7 +525,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream() uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getDataStream() throw ( packages::WrongPasswordException, io::IOException, - RuntimeException ) + RuntimeException, std::exception ) { // There is no stream attached to this object if ( m_nStreamMode == PACKAGE_STREAM_NOTSET ) @@ -592,7 +592,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getDataStream() uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream() throw ( packages::NoEncryptionException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { // There is no stream attached to this object if ( m_nStreamMode == PACKAGE_STREAM_NOTSET ) @@ -624,7 +624,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawStream() void SAL_CALL ZipPackageStream::setDataStream( const uno::Reference< io::XInputStream >& aStream ) throw ( io::IOException, - RuntimeException ) + RuntimeException, std::exception ) { setInputStream( aStream ); m_nStreamMode = PACKAGE_STREAM_DATA; @@ -634,7 +634,7 @@ void SAL_CALL ZipPackageStream::setRawStream( const uno::Reference< io::XInputSt throw ( packages::EncryptionNotAllowedException, packages::NoRawFormatException, io::IOException, - RuntimeException ) + RuntimeException, std::exception ) { // wrap the stream in case it is not seekable uno::Reference< io::XInputStream > xNewStream = ::comphelper::OSeekableInputWrapper::CheckSeekableCanWrap( aStream, m_xContext ); @@ -662,7 +662,7 @@ void SAL_CALL ZipPackageStream::setRawStream( const uno::Reference< io::XInputSt uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getPlainRawStream() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { // There is no stream attached to this object if ( m_nStreamMode == PACKAGE_STREAM_NOTSET ) @@ -693,7 +693,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getPlainRawStream( // XUnoTunnel sal_Int64 SAL_CALL ZipPackageStream::getSomething( const Sequence< sal_Int8 >& aIdentifier ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { sal_Int64 nMe = 0; if ( aIdentifier.getLength() == 16 && @@ -704,7 +704,7 @@ 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 ) + throw( beans::UnknownPropertyException, beans::PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { if ( aPropertyName == "MediaType" ) { @@ -862,7 +862,7 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName, } Any SAL_CALL ZipPackageStream::getPropertyValue( const OUString& PropertyName ) - throw( beans::UnknownPropertyException, WrappedTargetException, RuntimeException ) + throw( beans::UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) { Any aAny; if ( PropertyName == "MediaType" ) @@ -911,13 +911,13 @@ void ZipPackageStream::setSize ( const sal_Int64 nNewSize ) aEntry.nSize = nNewSize; } OUString ZipPackageStream::getImplementationName() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { return OUString ("ZipPackageStream"); } Sequence< OUString > ZipPackageStream::getSupportedServiceNames() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { Sequence< OUString > aNames( 1 ); aNames[0] = "com.sun.star.packages.PackageStream"; @@ -925,7 +925,7 @@ Sequence< OUString > ZipPackageStream::getSupportedServiceNames() } sal_Bool SAL_CALL ZipPackageStream::supportsService( OUString const & rServiceName ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } diff --git a/package/source/zippackage/wrapstreamforshare.cxx b/package/source/zippackage/wrapstreamforshare.cxx index 674d20aaea7e..5bd868427169 100644 --- a/package/source/zippackage/wrapstreamforshare.cxx +++ b/package/source/zippackage/wrapstreamforshare.cxx @@ -52,7 +52,7 @@ sal_Int32 SAL_CALL WrapStreamForShare::readBytes( uno::Sequence< sal_Int8 >& aDa throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -71,7 +71,7 @@ sal_Int32 SAL_CALL WrapStreamForShare::readSomeBytes( uno::Sequence< sal_Int8 >& throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -90,7 +90,7 @@ void SAL_CALL WrapStreamForShare::skipBytes( sal_Int32 nBytesToSkip ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -106,7 +106,7 @@ void SAL_CALL WrapStreamForShare::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL WrapStreamForShare::available() throw ( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -119,7 +119,7 @@ sal_Int32 SAL_CALL WrapStreamForShare::available() void SAL_CALL WrapStreamForShare::closeInput() throw ( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -136,7 +136,7 @@ void SAL_CALL WrapStreamForShare::closeInput() void SAL_CALL WrapStreamForShare::seek( sal_Int64 location ) throw ( lang::IllegalArgumentException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -151,7 +151,7 @@ void SAL_CALL WrapStreamForShare::seek( sal_Int64 location ) sal_Int64 SAL_CALL WrapStreamForShare::getPosition() throw ( io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -163,7 +163,7 @@ sal_Int64 SAL_CALL WrapStreamForShare::getPosition() sal_Int64 SAL_CALL WrapStreamForShare::getLength() throw ( io::IOException, - uno::RuntimeException ) + 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 de9db14b1bd5..745d73d0aba8 100644 --- a/package/source/zippackage/wrapstreamforshare.hxx +++ b/package/source/zippackage/wrapstreamforshare.hxx @@ -43,20 +43,20 @@ public: // XInputStream virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL available( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL closeInput( ) - throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); //XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL seek( sal_Int64 location ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getPosition() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getLength() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index 8db659fd7d59..4da9ef1915db 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -164,7 +164,7 @@ sal_Bool OZipFileAccess::StringGoodForPattern_Impl( const OUString& aString, // XInitialization void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArguments ) throw ( uno::Exception, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -230,7 +230,7 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu uno::Any SAL_CALL OZipFileAccess::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -256,7 +256,7 @@ uno::Any SAL_CALL OZipFileAccess::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL OZipFileAccess::getElementNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -290,7 +290,7 @@ uno::Sequence< OUString > SAL_CALL OZipFileAccess::getElementNames() } sal_Bool SAL_CALL OZipFileAccess::hasByName( const OUString& aName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -306,7 +306,7 @@ sal_Bool SAL_CALL OZipFileAccess::hasByName( const OUString& aName ) } uno::Type SAL_CALL OZipFileAccess::getElementType() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -320,7 +320,7 @@ uno::Type SAL_CALL OZipFileAccess::getElementType() } sal_Bool SAL_CALL OZipFileAccess::hasElements() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -337,7 +337,7 @@ sal_Bool SAL_CALL OZipFileAccess::hasElements() uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern( const OUString& aPatternString ) throw ( container::NoSuchElementException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -370,7 +370,7 @@ uno::Reference< io::XInputStream > SAL_CALL OZipFileAccess::getStreamByPattern( // XComponent void SAL_CALL OZipFileAccess::dispose() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -401,7 +401,7 @@ void SAL_CALL OZipFileAccess::dispose() } void SAL_CALL OZipFileAccess::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -414,7 +414,7 @@ void SAL_CALL OZipFileAccess::addEventListener( const uno::Reference< lang::XEve } void SAL_CALL OZipFileAccess::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutexHolder->GetMutex() ); @@ -445,19 +445,19 @@ uno::Reference< uno::XInterface > SAL_CALL OZipFileAccess::impl_staticCreateSelf } OUString SAL_CALL OZipFileAccess::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return impl_staticGetImplementationName(); } sal_Bool SAL_CALL OZipFileAccess::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL OZipFileAccess::getSupportedServiceNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return impl_staticGetSupportedServiceNames(); } |