diff options
Diffstat (limited to 'package/source/manifest')
-rw-r--r-- | package/source/manifest/ManifestImport.cxx | 16 | ||||
-rw-r--r-- | package/source/manifest/ManifestImport.hxx | 16 | ||||
-rw-r--r-- | package/source/manifest/ManifestReader.cxx | 8 | ||||
-rw-r--r-- | package/source/manifest/ManifestReader.hxx | 8 | ||||
-rw-r--r-- | package/source/manifest/ManifestWriter.cxx | 8 | ||||
-rw-r--r-- | package/source/manifest/ManifestWriter.hxx | 8 |
6 files changed, 32 insertions, 32 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(); |