diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /oox/source | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'oox/source')
28 files changed, 242 insertions, 242 deletions
diff --git a/oox/source/core/contexthandler.cxx b/oox/source/core/contexthandler.cxx index 83567dab2a3e..296ed71b9132 100644 --- a/oox/source/core/contexthandler.cxx +++ b/oox/source/core/contexthandler.cxx @@ -84,33 +84,33 @@ void ContextHandler::implSetLocator( const Reference< XLocator >& rxLocator ) // com.sun.star.xml.sax.XFastContextHandler interface ------------------------- -void ContextHandler::startFastElement( sal_Int32, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException ) +void ContextHandler::startFastElement( sal_Int32, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception ) { } -void ContextHandler::startUnknownElement( const OUString&, const OUString&, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException ) +void ContextHandler::startUnknownElement( const OUString&, const OUString&, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception ) { } -void ContextHandler::endFastElement( sal_Int32 ) throw( SAXException, RuntimeException ) +void ContextHandler::endFastElement( sal_Int32 ) throw( SAXException, RuntimeException, std::exception ) { } -void ContextHandler::endUnknownElement( const OUString&, const OUString& ) throw( SAXException, RuntimeException ) +void ContextHandler::endUnknownElement( const OUString&, const OUString& ) throw( SAXException, RuntimeException, std::exception ) { } -Reference< XFastContextHandler > ContextHandler::createFastChildContext( sal_Int32, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException ) +Reference< XFastContextHandler > ContextHandler::createFastChildContext( sal_Int32, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception ) { return 0; } -Reference< XFastContextHandler > ContextHandler::createUnknownChildContext( const OUString&, const OUString&, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException ) +Reference< XFastContextHandler > ContextHandler::createUnknownChildContext( const OUString&, const OUString&, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception ) { return 0; } -void ContextHandler::characters( const OUString& ) throw( SAXException, RuntimeException ) +void ContextHandler::characters( const OUString& ) throw( SAXException, RuntimeException, std::exception ) { } diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx index fd0c0218139e..4e5bf80d7594 100644 --- a/oox/source/core/contexthandler2.cxx +++ b/oox/source/core/contexthandler2.cxx @@ -194,23 +194,23 @@ ContextHandler2::~ContextHandler2() // com.sun.star.xml.sax.XFastContextHandler interface ------------------------- Reference< XFastContextHandler > SAL_CALL ContextHandler2::createFastChildContext( - sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw( SAXException, RuntimeException ) + sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw( SAXException, RuntimeException, std::exception ) { return implCreateChildContext( nElement, rxAttribs ); } void SAL_CALL ContextHandler2::startFastElement( - sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw( SAXException, RuntimeException ) + sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw( SAXException, RuntimeException, std::exception ) { implStartElement( nElement, rxAttribs ); } -void SAL_CALL ContextHandler2::characters( const OUString& rChars ) throw( SAXException, RuntimeException ) +void SAL_CALL ContextHandler2::characters( const OUString& rChars ) throw( SAXException, RuntimeException, std::exception ) { implCharacters( rChars ); } -void SAL_CALL ContextHandler2::endFastElement( sal_Int32 nElement ) throw( SAXException, RuntimeException ) +void SAL_CALL ContextHandler2::endFastElement( sal_Int32 nElement ) throw( SAXException, RuntimeException, std::exception ) { implEndElement( nElement ); } diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx index 117868a0c476..5bf6102d8405 100644 --- a/oox/source/core/fasttokenhandler.cxx +++ b/oox/source/core/fasttokenhandler.cxx @@ -56,38 +56,38 @@ FastTokenHandler::~FastTokenHandler() } // XServiceInfo -OUString SAL_CALL FastTokenHandler::getImplementationName() throw (RuntimeException) +OUString SAL_CALL FastTokenHandler::getImplementationName() throw (RuntimeException, std::exception) { return FastTokenHandler_getImplementationName(); } -sal_Bool SAL_CALL FastTokenHandler::supportsService( const OUString& rServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL FastTokenHandler::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SAL_CALL FastTokenHandler::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > SAL_CALL FastTokenHandler::getSupportedServiceNames() throw (RuntimeException, std::exception) { return FastTokenHandler_getSupportedServiceNames(); } // XFastTokenHandler -sal_Int32 FastTokenHandler::getToken( const OUString& rIdentifier ) throw( RuntimeException ) +sal_Int32 FastTokenHandler::getToken( const OUString& rIdentifier ) throw( RuntimeException, std::exception ) { return mrTokenMap.getTokenFromUnicode( rIdentifier ); } -OUString FastTokenHandler::getIdentifier( sal_Int32 nToken ) throw( RuntimeException ) +OUString FastTokenHandler::getIdentifier( sal_Int32 nToken ) throw( RuntimeException, std::exception ) { return mrTokenMap.getUnicodeTokenName( nToken ); } -Sequence< sal_Int8 > FastTokenHandler::getUTF8Identifier( sal_Int32 nToken ) throw( RuntimeException ) +Sequence< sal_Int8 > FastTokenHandler::getUTF8Identifier( sal_Int32 nToken ) throw( RuntimeException, std::exception ) { return mrTokenMap.getUtf8TokenName( nToken ); } -sal_Int32 FastTokenHandler::getTokenFromUTF8( const Sequence< sal_Int8 >& rIdentifier ) throw( RuntimeException ) +sal_Int32 FastTokenHandler::getTokenFromUTF8( const Sequence< sal_Int8 >& rIdentifier ) throw( RuntimeException, std::exception ) { return mrTokenMap.getTokenFromUtf8( rIdentifier ); } diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index cad97b67328d..1b45ea282597 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -390,17 +390,17 @@ bool FilterBase::importBinaryData( StreamDataSequence& orDataSeq, const OUString // com.sun.star.lang.XServiceInfo interface -OUString SAL_CALL FilterBase::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL FilterBase::getImplementationName() throw( RuntimeException, std::exception ) { return implGetImplementationName(); } -sal_Bool SAL_CALL FilterBase::supportsService( const OUString& rServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL FilterBase::supportsService( const OUString& rServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SAL_CALL FilterBase::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL FilterBase::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aServiceNames( 2 ); aServiceNames[ 0 ] = "com.sun.star.document.ImportFilter"; @@ -410,7 +410,7 @@ Sequence< OUString > SAL_CALL FilterBase::getSupportedServiceNames() throw( Runt // com.sun.star.lang.XInitialization interface -void SAL_CALL FilterBase::initialize( const Sequence< Any >& rArgs ) throw( Exception, RuntimeException ) +void SAL_CALL FilterBase::initialize( const Sequence< Any >& rArgs ) throw( Exception, RuntimeException, std::exception ) { if( rArgs.getLength() >= 2 ) try { @@ -423,7 +423,7 @@ void SAL_CALL FilterBase::initialize( const Sequence< Any >& rArgs ) throw( Exce // com.sun.star.document.XImporter interface -void SAL_CALL FilterBase::setTargetDocument( const Reference< XComponent >& rxDocument ) throw( IllegalArgumentException, RuntimeException ) +void SAL_CALL FilterBase::setTargetDocument( const Reference< XComponent >& rxDocument ) throw( IllegalArgumentException, RuntimeException, std::exception ) { mxImpl->setDocumentModel( rxDocument ); mxImpl->meDirection = FILTERDIRECTION_IMPORT; @@ -431,7 +431,7 @@ void SAL_CALL FilterBase::setTargetDocument( const Reference< XComponent >& rxDo // com.sun.star.document.XExporter interface -void SAL_CALL FilterBase::setSourceDocument( const Reference< XComponent >& rxDocument ) throw( IllegalArgumentException, RuntimeException ) +void SAL_CALL FilterBase::setSourceDocument( const Reference< XComponent >& rxDocument ) throw( IllegalArgumentException, RuntimeException, std::exception ) { mxImpl->setDocumentModel( rxDocument ); mxImpl->meDirection = FILTERDIRECTION_EXPORT; @@ -439,7 +439,7 @@ void SAL_CALL FilterBase::setSourceDocument( const Reference< XComponent >& rxDo // com.sun.star.document.XFilter interface -sal_Bool SAL_CALL FilterBase::filter( const Sequence< PropertyValue >& rMediaDescSeq ) throw( RuntimeException ) +sal_Bool SAL_CALL FilterBase::filter( const Sequence< PropertyValue >& rMediaDescSeq ) throw( RuntimeException, std::exception ) { if( !mxImpl->mxModel.is() || !mxImpl->mxModelFactory.is() || (mxImpl->meDirection == FILTERDIRECTION_UNKNOWN) ) throw RuntimeException(); @@ -474,7 +474,7 @@ sal_Bool SAL_CALL FilterBase::filter( const Sequence< PropertyValue >& rMediaDes return bRet; } -void SAL_CALL FilterBase::cancel() throw( RuntimeException ) +void SAL_CALL FilterBase::cancel() throw( RuntimeException, std::exception ) { } diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 11a60ca6408e..3fd557810d79 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -61,23 +61,23 @@ FilterDetectDocHandler::~FilterDetectDocHandler() } void SAL_CALL FilterDetectDocHandler::startDocument() - throw (SAXException, RuntimeException) + throw (SAXException, RuntimeException, std::exception) { } void SAL_CALL FilterDetectDocHandler::endDocument() - throw (SAXException, RuntimeException) + throw (SAXException, RuntimeException, std::exception) { } void SAL_CALL FilterDetectDocHandler::setDocumentLocator( const Reference<XLocator>& /*xLocator*/ ) - throw (SAXException, RuntimeException) + throw (SAXException, RuntimeException, std::exception) { } void SAL_CALL FilterDetectDocHandler::startFastElement( sal_Int32 nElement, const Reference< XFastAttributeList >& rAttribs ) - throw (SAXException,RuntimeException) + throw (SAXException,RuntimeException, std::exception) { AttributeList aAttribs( rAttribs ); switch ( nElement ) @@ -107,37 +107,37 @@ void SAL_CALL FilterDetectDocHandler::startFastElement( void SAL_CALL FilterDetectDocHandler::startUnknownElement( const OUString& /*Namespace*/, const OUString& /*Name*/, const Reference<XFastAttributeList>& /*Attribs*/ ) - throw (SAXException, RuntimeException) + throw (SAXException, RuntimeException, std::exception) { } void SAL_CALL FilterDetectDocHandler::endFastElement( sal_Int32 /*nElement*/ ) - throw (SAXException, RuntimeException) + throw (SAXException, RuntimeException, std::exception) { maContextStack.pop_back(); } void SAL_CALL FilterDetectDocHandler::endUnknownElement( - const OUString& /*Namespace*/, const OUString& /*Name*/ ) throw (SAXException, RuntimeException) + const OUString& /*Namespace*/, const OUString& /*Name*/ ) throw (SAXException, RuntimeException, std::exception) { } Reference<XFastContextHandler> SAL_CALL FilterDetectDocHandler::createFastChildContext( sal_Int32 /*Element*/, const Reference<XFastAttributeList>& /*Attribs*/ ) - throw (SAXException, RuntimeException) + throw (SAXException, RuntimeException, std::exception) { return this; } Reference<XFastContextHandler> SAL_CALL FilterDetectDocHandler::createUnknownChildContext( const OUString& /*Namespace*/, const OUString& /*Name*/, const Reference<XFastAttributeList>& /*Attribs*/) - throw (SAXException, RuntimeException) + throw (SAXException, RuntimeException, std::exception) { return this; } void SAL_CALL FilterDetectDocHandler::characters( const OUString& /*aChars*/ ) - throw (SAXException, RuntimeException) + throw (SAXException, RuntimeException, std::exception) { } @@ -376,24 +376,24 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript // com.sun.star.lang.XServiceInfo interface ----------------------------------- -OUString SAL_CALL FilterDetect::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL FilterDetect::getImplementationName() throw( RuntimeException, std::exception ) { return FilterDetect_getImplementationName(); } -sal_Bool SAL_CALL FilterDetect::supportsService( const OUString& rServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL FilterDetect::supportsService( const OUString& rServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SAL_CALL FilterDetect::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL FilterDetect::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return FilterDetect_getSupportedServiceNames(); } // com.sun.star.document.XExtendedFilterDetection interface ------------------- -OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& rMediaDescSeq ) throw( RuntimeException ) +OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& rMediaDescSeq ) throw( RuntimeException, std::exception ) { OUString aFilterName; MediaDescriptor aMediaDescriptor( rMediaDescSeq ); diff --git a/oox/source/core/fragmenthandler.cxx b/oox/source/core/fragmenthandler.cxx index 632e6b6e70f1..f19f0f1c4295 100644 --- a/oox/source/core/fragmenthandler.cxx +++ b/oox/source/core/fragmenthandler.cxx @@ -58,48 +58,48 @@ FragmentHandler::~FragmentHandler() // com.sun.star.xml.sax.XFastDocumentHandler interface ------------------------ -void FragmentHandler::startDocument() throw( SAXException, RuntimeException ) +void FragmentHandler::startDocument() throw( SAXException, RuntimeException, std::exception ) { } -void FragmentHandler::endDocument() throw( SAXException, RuntimeException ) +void FragmentHandler::endDocument() throw( SAXException, RuntimeException, std::exception ) { } -void FragmentHandler::setDocumentLocator( const Reference< XLocator >& rxLocator ) throw( SAXException, RuntimeException ) +void FragmentHandler::setDocumentLocator( const Reference< XLocator >& rxLocator ) throw( SAXException, RuntimeException, std::exception ) { implSetLocator( rxLocator ); } // com.sun.star.xml.sax.XFastContextHandler interface ------------------------- -void FragmentHandler::startFastElement( sal_Int32, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException ) +void FragmentHandler::startFastElement( sal_Int32, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception ) { } -void FragmentHandler::startUnknownElement( const OUString&, const OUString&, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException ) +void FragmentHandler::startUnknownElement( const OUString&, const OUString&, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception ) { } -void FragmentHandler::endFastElement( sal_Int32 ) throw( SAXException, RuntimeException ) +void FragmentHandler::endFastElement( sal_Int32 ) throw( SAXException, RuntimeException, std::exception ) { } -void FragmentHandler::endUnknownElement( const OUString&, const OUString& ) throw( SAXException, RuntimeException ) +void FragmentHandler::endUnknownElement( const OUString&, const OUString& ) throw( SAXException, RuntimeException, std::exception ) { } -Reference< XFastContextHandler > FragmentHandler::createFastChildContext( sal_Int32, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException ) +Reference< XFastContextHandler > FragmentHandler::createFastChildContext( sal_Int32, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception ) { return 0; } -Reference< XFastContextHandler > FragmentHandler::createUnknownChildContext( const OUString&, const OUString&, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException ) +Reference< XFastContextHandler > FragmentHandler::createUnknownChildContext( const OUString&, const OUString&, const Reference< XFastAttributeList >& ) throw( SAXException, RuntimeException, std::exception ) { return 0; } -void FragmentHandler::characters( const OUString& ) throw( SAXException, RuntimeException ) +void FragmentHandler::characters( const OUString& ) throw( SAXException, RuntimeException, std::exception ) { } diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx index 5d0c2068effc..6a305d16da02 100644 --- a/oox/source/core/fragmenthandler2.cxx +++ b/oox/source/core/fragmenthandler2.cxx @@ -46,12 +46,12 @@ FragmentHandler2::~FragmentHandler2() // com.sun.star.xml.sax.XFastDocumentHandler interface -------------------- -void SAL_CALL FragmentHandler2::startDocument() throw( SAXException, RuntimeException ) +void SAL_CALL FragmentHandler2::startDocument() throw( SAXException, RuntimeException, std::exception ) { initializeImport(); } -void SAL_CALL FragmentHandler2::endDocument() throw( SAXException, RuntimeException ) +void SAL_CALL FragmentHandler2::endDocument() throw( SAXException, RuntimeException, std::exception ) { finalizeImport(); } @@ -106,7 +106,7 @@ bool FragmentHandler2::prepareMceContext( sal_Int32 nElement, const AttributeLis // com.sun.star.xml.sax.XFastContextHandler interface ------------------------- Reference< XFastContextHandler > SAL_CALL FragmentHandler2::createFastChildContext( - sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw( SAXException, RuntimeException ) + sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw( SAXException, RuntimeException, std::exception ) { if( getNamespace( nElement ) == NMSP_mce ) // TODO for checking 'Ignorable' { @@ -118,17 +118,17 @@ Reference< XFastContextHandler > SAL_CALL FragmentHandler2::createFastChildConte } void SAL_CALL FragmentHandler2::startFastElement( - sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw( SAXException, RuntimeException ) + sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw( SAXException, RuntimeException, std::exception ) { implStartElement( nElement, rxAttribs ); } -void SAL_CALL FragmentHandler2::characters( const OUString& rChars ) throw( SAXException, RuntimeException ) +void SAL_CALL FragmentHandler2::characters( const OUString& rChars ) throw( SAXException, RuntimeException, std::exception ) { implCharacters( rChars ); } -void SAL_CALL FragmentHandler2::endFastElement( sal_Int32 nElement ) throw( SAXException, RuntimeException ) +void SAL_CALL FragmentHandler2::endFastElement( sal_Int32 nElement ) throw( SAXException, RuntimeException, std::exception ) { /* If MCE */ switch( nElement ) diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx index 73d5bdd52212..9c95a822fb63 100644 --- a/oox/source/core/recordparser.cxx +++ b/oox/source/core/recordparser.cxx @@ -50,10 +50,10 @@ public: // com.sun.star.sax.XLocator interface - virtual sal_Int32 SAL_CALL getColumnNumber() throw( RuntimeException ); - virtual sal_Int32 SAL_CALL getLineNumber() throw( RuntimeException ); - virtual OUString SAL_CALL getPublicId() throw( RuntimeException ); - virtual OUString SAL_CALL getSystemId() throw( RuntimeException ); + virtual sal_Int32 SAL_CALL getColumnNumber() throw( RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getLineNumber() throw( RuntimeException, std::exception ); + virtual OUString SAL_CALL getPublicId() throw( RuntimeException, std::exception ); + virtual OUString SAL_CALL getSystemId() throw( RuntimeException, std::exception ); private: RecordParser* mpParser; @@ -72,23 +72,23 @@ void Locator::checkDispose() throw( RuntimeException ) throw DisposedException(); } -sal_Int32 SAL_CALL Locator::getColumnNumber() throw( RuntimeException ) +sal_Int32 SAL_CALL Locator::getColumnNumber() throw( RuntimeException, std::exception ) { return -1; } -sal_Int32 SAL_CALL Locator::getLineNumber() throw( RuntimeException ) +sal_Int32 SAL_CALL Locator::getLineNumber() throw( RuntimeException, std::exception ) { return -1; } -OUString SAL_CALL Locator::getPublicId() throw( RuntimeException ) +OUString SAL_CALL Locator::getPublicId() throw( RuntimeException, std::exception ) { checkDispose(); return mpParser->getInputSource().maPublicId; } -OUString SAL_CALL Locator::getSystemId() throw( RuntimeException ) +OUString SAL_CALL Locator::getSystemId() throw( RuntimeException, std::exception ) { checkDispose(); return mpParser->getInputSource().maSystemId; diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx index 136169766afb..b5eace0cf69e 100644 --- a/oox/source/core/relationshandler.cxx +++ b/oox/source/core/relationshandler.cxx @@ -62,7 +62,7 @@ RelationsFragment::RelationsFragment( XmlFilterBase& rFilter, RelationsRef xRela } Reference< XFastContextHandler > RelationsFragment::createFastChildContext( - sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw (SAXException, RuntimeException) + sal_Int32 nElement, const Reference< XFastAttributeList >& rxAttribs ) throw (SAXException, RuntimeException, std::exception) { Reference< XFastContextHandler > xRet; AttributeList aAttribs( rxAttribs ); diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index c3549b2195e1..b78842955cc4 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -47,22 +47,22 @@ vector<sal_uInt8> convertToVector(Sequence<sal_Int8>& input) class AgileTokenHandler : public cppu::WeakImplHelper1< XFastTokenHandler > { public: - virtual sal_Int32 SAL_CALL getToken( const OUString& /*nIdentifier*/ ) throw (RuntimeException) + virtual sal_Int32 SAL_CALL getToken( const OUString& /*nIdentifier*/ ) throw (RuntimeException, std::exception) { return FastToken::DONTKNOW; } - virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException) + virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence< sal_Int8 >& /*nIdentifier*/ ) throw (RuntimeException, std::exception) { return FastToken::DONTKNOW; } - virtual OUString SAL_CALL getIdentifier( sal_Int32 /*nToken*/ ) throw (RuntimeException) + virtual OUString SAL_CALL getIdentifier( sal_Int32 /*nToken*/ ) throw (RuntimeException, std::exception) { return OUString(); } - virtual Sequence<sal_Int8> SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException) + virtual Sequence<sal_Int8> SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException, std::exception) { return Sequence<sal_Int8>(); } @@ -78,20 +78,20 @@ public: {} void SAL_CALL startDocument() - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) {} void SAL_CALL endDocument() - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) {} void SAL_CALL setDocumentLocator( const Reference< XLocator >& /*xLocator*/ ) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) {} void SAL_CALL startFastElement( sal_Int32 /*Element*/, const Reference< XFastAttributeList >& /*Attribs*/ ) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) {} void SAL_CALL startUnknownElement( const OUString& /*aNamespace*/, const OUString& aName, const Reference< XFastAttributeList >& aAttributeList ) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) { if(aName == "keyData") { @@ -173,26 +173,26 @@ public: } void SAL_CALL endFastElement( sal_Int32 /*aElement*/ ) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) {} void SAL_CALL endUnknownElement( const OUString& /*aNamespace*/, const OUString& /*aName*/ ) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) {} Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 /*aElement*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) { return NULL; } Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& /*aNamespace*/, const OUString& /*aName*/, const Reference< XFastAttributeList >& /*aAttribs*/ ) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) { return this; } void SAL_CALL characters( const OUString& /*aChars*/ ) - throw (RuntimeException, SAXException) + throw (RuntimeException, SAXException, std::exception) {} }; diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index f7091bd8dec1..c209e6515bf7 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -268,20 +268,20 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars ) // com.sun.star.xml.sax.XFastDocumentHandler void SAL_CALL OOXMLDocPropHandler::startDocument() - throw (xml::sax::SAXException, uno::RuntimeException) + throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OOXMLDocPropHandler::endDocument() - throw (xml::sax::SAXException, uno::RuntimeException) + throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { InitNew(); } void SAL_CALL OOXMLDocPropHandler::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) - throw (xml::sax::SAXException, uno::RuntimeException) + throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { } @@ -289,7 +289,7 @@ void SAL_CALL OOXMLDocPropHandler::setDocumentLocator( const uno::Reference< xml // com.sun.star.xml.sax.XFastContextHandler void SAL_CALL OOXMLDocPropHandler::startFastElement( ::sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList >& xAttribs ) - throw (xml::sax::SAXException, uno::RuntimeException) + throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { if ( !m_nInBlock && !m_nState ) { @@ -331,7 +331,7 @@ void SAL_CALL OOXMLDocPropHandler::startFastElement( ::sal_Int32 nElement, const void SAL_CALL OOXMLDocPropHandler::startUnknownElement( const OUString& aNamespace, const OUString& aName, const uno::Reference< xml::sax::XFastAttributeList >& ) - throw (xml::sax::SAXException, uno::RuntimeException) + throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { SAL_WARN("oox", "Unknown element " << aNamespace << ":" << aName); @@ -343,7 +343,7 @@ void SAL_CALL OOXMLDocPropHandler::startUnknownElement( const OUString& aNamespa void SAL_CALL OOXMLDocPropHandler::endFastElement( ::sal_Int32 ) - throw (xml::sax::SAXException, uno::RuntimeException) + throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { if ( m_nInBlock ) { @@ -363,7 +363,7 @@ void SAL_CALL OOXMLDocPropHandler::endFastElement( ::sal_Int32 ) void SAL_CALL OOXMLDocPropHandler::endUnknownElement( const OUString&, const OUString& ) - throw (xml::sax::SAXException, uno::RuntimeException) + throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { if ( m_nInBlock ) m_nInBlock--; @@ -371,7 +371,7 @@ void SAL_CALL OOXMLDocPropHandler::endUnknownElement( const OUString&, const OUS uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::createFastChildContext( ::sal_Int32, const uno::Reference< xml::sax::XFastAttributeList >& ) - throw (xml::sax::SAXException, uno::RuntimeException) + throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { // Should the arguments be parsed? return uno::Reference< xml::sax::XFastContextHandler >( static_cast< xml::sax::XFastContextHandler* >( this ) ); @@ -379,14 +379,14 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::cr uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::createUnknownChildContext( const OUString&, const OUString&, const uno::Reference< xml::sax::XFastAttributeList >& ) - throw (xml::sax::SAXException, uno::RuntimeException) + throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { return uno::Reference< xml::sax::XFastContextHandler >( static_cast< xml::sax::XFastContextHandler* >( this ) ); } void SAL_CALL OOXMLDocPropHandler::characters( const OUString& aChars ) - throw (xml::sax::SAXException, uno::RuntimeException) + throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { try { diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx index 27bbe36a25a0..f12bd51685db 100644 --- a/oox/source/docprop/docprophandler.hxx +++ b/oox/source/docprop/docprophandler.hxx @@ -66,19 +66,19 @@ public: // com.sun.star.xml.sax.XFastDocumentHandler - virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startDocument() 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, std::exception); + virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); // com.sun.star.xml.sax.XFastContextHandler - virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) 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, std::exception); virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index e826d03a4db1..1e5a392fffd0 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -104,17 +104,17 @@ DocumentPropertiesImport::DocumentPropertiesImport( const Reference< XComponentC } // XServiceInfo -OUString SAL_CALL DocumentPropertiesImport::getImplementationName() throw (RuntimeException) +OUString SAL_CALL DocumentPropertiesImport::getImplementationName() throw (RuntimeException, std::exception) { return DocumentPropertiesImport_getImplementationName(); } -sal_Bool SAL_CALL DocumentPropertiesImport::supportsService( const OUString& rServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL DocumentPropertiesImport::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SAL_CALL DocumentPropertiesImport::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > SAL_CALL DocumentPropertiesImport::getSupportedServiceNames() throw (RuntimeException, std::exception) { return DocumentPropertiesImport_getSupportedServiceNames(); } @@ -122,7 +122,7 @@ Sequence< OUString > SAL_CALL DocumentPropertiesImport::getSupportedServiceNames // XOOXMLDocumentPropertiesImporter void SAL_CALL DocumentPropertiesImport::importProperties( const Reference< XStorage >& rxSource, const Reference< XDocumentProperties >& rxDocumentProperties ) - throw (RuntimeException, IllegalArgumentException, SAXException, Exception) + throw (RuntimeException, IllegalArgumentException, SAXException, Exception, std::exception) { if( !mxContext.is() ) throw RuntimeException(); diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx index 473a275afb04..d56a3cdd6b7e 100644 --- a/oox/source/docprop/ooxmldocpropimport.hxx +++ b/oox/source/docprop/ooxmldocpropimport.hxx @@ -41,15 +41,15 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 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& rServiceName ) 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); // XOOXMLDocumentPropertiesImporter virtual void SAL_CALL importProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxSource, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties >& rxDocumentProperties ) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::Exception, std::exception); private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx index 373a05214dff..475c6ab92db5 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx @@ -45,7 +45,7 @@ DiagramDataFragmentHandler::~DiagramDataFragmentHandler( ) throw () } void SAL_CALL DiagramDataFragmentHandler::endDocument() - throw (SAXException, RuntimeException) + throw (SAXException, RuntimeException, std::exception) { } @@ -83,7 +83,7 @@ DiagramLayoutFragmentHandler::~DiagramLayoutFragmentHandler( ) throw () } void SAL_CALL DiagramLayoutFragmentHandler::endDocument() - throw (SAXException, RuntimeException) + throw (SAXException, RuntimeException, std::exception) { } diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx index e5c14c37bbbc..e1b255f16d85 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx @@ -32,7 +32,7 @@ public: DiagramDataFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramDataPtr pDataPtr ) throw(); virtual ~DiagramDataFragmentHandler() throw(); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; private: @@ -48,7 +48,7 @@ public: DiagramLayoutFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr pDataPtr ) throw(); virtual ~DiagramLayoutFragmentHandler() throw(); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; private: diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx index c6cca0ad7581..b69c43c2a6e6 100644 --- a/oox/source/export/ColorPropertySet.cxx +++ b/oox/source/export/ColorPropertySet.cxx @@ -43,9 +43,9 @@ public: protected: // ____ XPropertySetInfo ____ - virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException); - virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException); - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException); + virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException, std::exception); + virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception); private: OUString m_aColorPropName; @@ -60,14 +60,14 @@ lcl_ColorPropertySetInfo::lcl_ColorPropertySetInfo( bool bFillColor ) : {} Sequence< Property > SAL_CALL lcl_ColorPropertySetInfo::getProperties() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return Sequence< Property >( & m_aColorProp, 1 ); } Property SAL_CALL lcl_ColorPropertySetInfo::getPropertyByName( const OUString& aName ) - throw (UnknownPropertyException, RuntimeException) + throw (UnknownPropertyException, RuntimeException, std::exception) { if( aName.equals( m_aColorPropName )) return m_aColorProp; @@ -75,7 +75,7 @@ Property SAL_CALL lcl_ColorPropertySetInfo::getPropertyByName( const OUString& a } sal_Bool SAL_CALL lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& Name ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return Name.equals( m_aColorPropName ); } @@ -103,7 +103,7 @@ ColorPropertySet::~ColorPropertySet() // ____ XPropertySet ____ Reference< XPropertySetInfo > SAL_CALL ColorPropertySet::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xInfo.is()) m_xInfo.set( new lcl_ColorPropertySetInfo( m_bIsFillColor )); @@ -116,7 +116,7 @@ void SAL_CALL ColorPropertySet::setPropertyValue( const OUString& /* aPropertyNa PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { aValue >>= m_nColor; } @@ -124,7 +124,7 @@ void SAL_CALL ColorPropertySet::setPropertyValue( const OUString& /* aPropertyNa uno::Any SAL_CALL ColorPropertySet::getPropertyValue( const OUString& aPropertyName ) throw (UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( aPropertyName == "FillStyle" && m_bIsFillColor ) { @@ -137,7 +137,7 @@ uno::Any SAL_CALL ColorPropertySet::getPropertyValue( const OUString& aPropertyN void SAL_CALL ColorPropertySet::addPropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* xListener */ ) throw (UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL( "Not Implemented" ); return; @@ -146,7 +146,7 @@ void SAL_CALL ColorPropertySet::addPropertyChangeListener( const OUString& /* aP void SAL_CALL ColorPropertySet::removePropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* aListener */ ) throw (UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL( "Not Implemented" ); return; @@ -155,7 +155,7 @@ void SAL_CALL ColorPropertySet::removePropertyChangeListener( const OUString& /* void SAL_CALL ColorPropertySet::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ ) throw (UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL( "Not Implemented" ); return; @@ -164,7 +164,7 @@ void SAL_CALL ColorPropertySet::addVetoableChangeListener( const OUString& /* Pr void SAL_CALL ColorPropertySet::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ ) throw (UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL( "Not Implemented" ); return; @@ -174,14 +174,14 @@ void SAL_CALL ColorPropertySet::removeVetoableChangeListener( const OUString& /* PropertyState SAL_CALL ColorPropertySet::getPropertyState( const OUString& /* PropertyName */ ) throw (UnknownPropertyException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return PropertyState_DIRECT_VALUE; } Sequence< PropertyState > SAL_CALL ColorPropertySet::getPropertyStates( const Sequence< OUString >& /* aPropertyName */ ) throw (UnknownPropertyException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { PropertyState aState = PropertyState_DIRECT_VALUE; return Sequence< PropertyState >( & aState, 1 ); @@ -189,7 +189,7 @@ Sequence< PropertyState > SAL_CALL ColorPropertySet::getPropertyStates( const Se void SAL_CALL ColorPropertySet::setPropertyToDefault( const OUString& PropertyName ) throw (UnknownPropertyException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( PropertyName.equals( m_aColorPropName )) m_nColor = m_nDefaultColor; @@ -198,7 +198,7 @@ void SAL_CALL ColorPropertySet::setPropertyToDefault( const OUString& PropertyNa uno::Any SAL_CALL ColorPropertySet::getPropertyDefault( const OUString& aPropertyName ) throw (UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( aPropertyName.equals( m_aColorPropName )) return uno::makeAny( m_nDefaultColor ); diff --git a/oox/source/export/ColorPropertySet.hxx b/oox/source/export/ColorPropertySet.hxx index 23d2c691b2fe..9228cd7504d1 100644 --- a/oox/source/export/ColorPropertySet.hxx +++ b/oox/source/export/ColorPropertySet.hxx @@ -44,7 +44,7 @@ public: protected: // ____ 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 ) @@ -52,55 +52,55 @@ protected: ::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); // ____ XPropertyState ____ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::uno::Reference< diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 14eab54424c5..ab37dd3856b0 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -109,18 +109,18 @@ public: explicit GenericPropertySet( const PropertyMap& rPropMap ); // XPropertySet - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException); - virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException); + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception); + virtual Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception); // XPropertySetInfo - virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException); - virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException); - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException); + virtual Sequence< Property > SAL_CALL getProperties() throw (RuntimeException, std::exception); + virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (RuntimeException, std::exception); private: typedef ::std::map< OUString, Any > PropertyNameMap; @@ -136,18 +136,18 @@ GenericPropertySet::GenericPropertySet( const PropertyMap& rPropMap ) maPropMap[ rPropNames[ aIt->first ] ] = aIt->second; } -Reference< XPropertySetInfo > SAL_CALL GenericPropertySet::getPropertySetInfo() throw (RuntimeException) +Reference< XPropertySetInfo > SAL_CALL GenericPropertySet::getPropertySetInfo() throw (RuntimeException, std::exception) { return this; } -void SAL_CALL GenericPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL GenericPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( *this ); maPropMap[ rPropertyName ] = rValue; } -Any SAL_CALL GenericPropertySet::getPropertyValue( const OUString& rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) +Any SAL_CALL GenericPropertySet::getPropertyValue( const OUString& rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertyNameMap::iterator aIt = maPropMap.find( rPropertyName ); if( aIt == maPropMap.end() ) @@ -156,13 +156,13 @@ Any SAL_CALL GenericPropertySet::getPropertyValue( const OUString& rPropertyName } // listeners are not supported by this implementation -void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) {} -void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) {} -void SAL_CALL GenericPropertySet::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) {} -void SAL_CALL GenericPropertySet::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) {} +void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {} +void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {} +void SAL_CALL GenericPropertySet::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {} +void SAL_CALL GenericPropertySet::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) {} // XPropertySetInfo -Sequence< Property > SAL_CALL GenericPropertySet::getProperties() throw (RuntimeException) +Sequence< Property > SAL_CALL GenericPropertySet::getProperties() throw (RuntimeException, std::exception) { Sequence< Property > aSeq( static_cast< sal_Int32 >( maPropMap.size() ) ); Property* pProperty = aSeq.getArray(); @@ -176,7 +176,7 @@ Sequence< Property > SAL_CALL GenericPropertySet::getProperties() throw (Runtime return aSeq; } -Property SAL_CALL GenericPropertySet::getPropertyByName( const OUString& rPropertyName ) throw (UnknownPropertyException, RuntimeException) +Property SAL_CALL GenericPropertySet::getPropertyByName( const OUString& rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) { PropertyNameMap::iterator aIt = maPropMap.find( rPropertyName ); if( aIt == maPropMap.end() ) @@ -189,7 +189,7 @@ Property SAL_CALL GenericPropertySet::getPropertyByName( const OUString& rProper return aProperty; } -sal_Bool SAL_CALL GenericPropertySet::hasPropertyByName( const OUString& rPropertyName ) throw (RuntimeException) +sal_Bool SAL_CALL GenericPropertySet::hasPropertyByName( const OUString& rPropertyName ) throw (RuntimeException, std::exception) { return maPropMap.find( rPropertyName ) != maPropMap.end(); } diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx index 2517a756baec..ab966a9befaf 100644 --- a/oox/source/helper/textinputstream.cxx +++ b/oox/source/helper/textinputstream.cxx @@ -47,15 +47,15 @@ public: explicit UnoBinaryInputStream( BinaryInputStream& rInStrm ); virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); virtual sal_Int32 SAL_CALL available() - throw (NotConnectedException, IOException, RuntimeException); + throw (NotConnectedException, IOException, RuntimeException, std::exception); virtual void SAL_CALL closeInput() - throw (NotConnectedException, IOException, RuntimeException); + throw (NotConnectedException, IOException, RuntimeException, std::exception); private: void ensureConnected() const throw (NotConnectedException); @@ -72,33 +72,33 @@ UnoBinaryInputStream::UnoBinaryInputStream( BinaryInputStream& rInStrm ) : } sal_Int32 SAL_CALL UnoBinaryInputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { ensureConnected(); return mpInStrm->readData( rData, nBytesToRead, 1 ); } sal_Int32 SAL_CALL UnoBinaryInputStream::readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { ensureConnected(); return mpInStrm->readData( rData, nMaxBytesToRead, 1 ); } void SAL_CALL UnoBinaryInputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { ensureConnected(); mpInStrm->skip( nBytesToSkip, 1 ); } -sal_Int32 SAL_CALL UnoBinaryInputStream::available() throw (NotConnectedException, IOException, RuntimeException) +sal_Int32 SAL_CALL UnoBinaryInputStream::available() throw (NotConnectedException, IOException, RuntimeException, std::exception) { ensureConnected(); throw RuntimeException( "Functionality not supported", Reference< XInputStream >() ); } -void SAL_CALL UnoBinaryInputStream::closeInput() throw (NotConnectedException, IOException, RuntimeException) +void SAL_CALL UnoBinaryInputStream::closeInput() throw (NotConnectedException, IOException, RuntimeException, std::exception) { ensureConnected(); mpInStrm->close(); diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx index b0be04d781fa..4b8d3886e266 100644 --- a/oox/source/ole/olestorage.cxx +++ b/oox/source/ole/olestorage.cxx @@ -65,13 +65,13 @@ public: const OUString& rElementName ); virtual ~OleOutputStream(); - virtual void SAL_CALL seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException ); - virtual sal_Int64 SAL_CALL getPosition() throw( IOException, RuntimeException ); - virtual sal_Int64 SAL_CALL getLength() throw( IOException, RuntimeException ); + virtual void SAL_CALL seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ); + virtual sal_Int64 SAL_CALL getPosition() throw( IOException, RuntimeException, std::exception ); + virtual sal_Int64 SAL_CALL getLength() throw( IOException, RuntimeException, std::exception ); - virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ); - virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ); - virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ); + virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ); + virtual void SAL_CALL flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ); + virtual void SAL_CALL closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ); private: void ensureSeekable() const throw( IOException ); @@ -107,37 +107,37 @@ OleOutputStream::~OleOutputStream() { } -void SAL_CALL OleOutputStream::seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException ) +void SAL_CALL OleOutputStream::seek( sal_Int64 nPos ) throw( IllegalArgumentException, IOException, RuntimeException, std::exception ) { ensureSeekable(); mxSeekable->seek( nPos ); } -sal_Int64 SAL_CALL OleOutputStream::getPosition() throw( IOException, RuntimeException ) +sal_Int64 SAL_CALL OleOutputStream::getPosition() throw( IOException, RuntimeException, std::exception ) { ensureSeekable(); return mxSeekable->getPosition(); } -sal_Int64 SAL_CALL OleOutputStream::getLength() throw( IOException, RuntimeException ) +sal_Int64 SAL_CALL OleOutputStream::getLength() throw( IOException, RuntimeException, std::exception ) { ensureSeekable(); return mxSeekable->getLength(); } -void SAL_CALL OleOutputStream::writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) +void SAL_CALL OleOutputStream::writeBytes( const Sequence< sal_Int8 >& rData ) throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { ensureConnected(); mxOutStrm->writeBytes( rData ); } -void SAL_CALL OleOutputStream::flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) +void SAL_CALL OleOutputStream::flush() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { ensureConnected(); mxOutStrm->flush(); } -void SAL_CALL OleOutputStream::closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException ) +void SAL_CALL OleOutputStream::closeOutput() throw( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception ) { ensureConnected(); ensureSeekable(); diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx index 64eb7237f68d..dc1c9adc199f 100644 --- a/oox/source/ole/vbamodule.cxx +++ b/oox/source/ole/vbamodule.cxx @@ -60,7 +60,7 @@ class OleIdToNameContainer : public OleIdToNameContainer_BASE public: OleIdToNameContainer() {} // XIndexContainer Methods - virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException) + virtual void SAL_CALL insertByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); OUString sOleName; @@ -68,7 +68,7 @@ public: throw IllegalArgumentException(); ObjIdToNameHash[ Index ] = sOleName; } - virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) + virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByIndex( Index ) ) @@ -76,7 +76,7 @@ public: ObjIdToNameHash.erase( ObjIdToNameHash.find( Index ) ); } // XIndexReplace Methods - virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException) + virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const Any& Element ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByIndex( Index ) ) @@ -87,12 +87,12 @@ public: ObjIdToNameHash[ Index ] = sOleName; } // XIndexAccess Methods - virtual ::sal_Int32 SAL_CALL getCount( ) throw (RuntimeException) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return ObjIdToNameHash.size(); } - virtual Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException) + virtual Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByIndex( Index ) ) @@ -100,11 +100,11 @@ public: return makeAny( ObjIdToNameHash[ Index ] ); } // XElementAccess Methods - virtual Type SAL_CALL getElementType( ) throw (RuntimeException) + virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) { return ::getCppuType( static_cast< const OUString* >( 0 ) ); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return ( getCount() > 0 ); diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index f97423086d00..f1d05e0baef2 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -137,7 +137,7 @@ const ::oox::drawingml::Theme* PowerPointImport::getCurrentTheme() const return mpActualSlidePersist ? mpActualSlidePersist->getTheme().get() : 0; } -sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDescriptor ) throw( RuntimeException ) +sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDescriptor ) throw( RuntimeException, std::exception ) { if( XmlFilterBase::filter( rDescriptor ) ) return true; diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 26fda73aaa4e..fe0c9f9e31ae 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -260,7 +260,7 @@ ShapeContextHandler::getContextHandler(sal_Int32 nElement) void SAL_CALL ShapeContextHandler::startFastElement (::sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { static const OUString sInputStream ("InputStream"); @@ -307,7 +307,7 @@ void SAL_CALL ShapeContextHandler::startFastElement void SAL_CALL ShapeContextHandler::startUnknownElement (const OUString & Namespace, const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { if ( getContextHandler() == getDrawingShapeContext() ) mpDrawing->getShapes().pushMark(); @@ -319,7 +319,7 @@ void SAL_CALL ShapeContextHandler::startUnknownElement } void SAL_CALL ShapeContextHandler::endFastElement(::sal_Int32 Element) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { uno::Reference<XFastContextHandler> xContextHandler(getContextHandler()); @@ -339,7 +339,7 @@ void SAL_CALL ShapeContextHandler::endFastElement(::sal_Int32 Element) void SAL_CALL ShapeContextHandler::endUnknownElement (const OUString & Namespace, const OUString & Name) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { uno::Reference<XFastContextHandler> xContextHandler(getContextHandler()); @@ -351,7 +351,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ShapeContextHandler::createFastChildContext (::sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { uno::Reference< xml::sax::XFastContextHandler > xResult; uno::Reference< xml::sax::XFastContextHandler > xContextHandler(getContextHandler(Element)); @@ -368,7 +368,7 @@ ShapeContextHandler::createUnknownChildContext (const OUString & Namespace, const OUString & Name, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { uno::Reference<XFastContextHandler> xContextHandler(getContextHandler()); @@ -380,7 +380,7 @@ ShapeContextHandler::createUnknownChildContext } void SAL_CALL ShapeContextHandler::characters(const OUString & aChars) - throw (uno::RuntimeException, xml::sax::SAXException) + throw (uno::RuntimeException, xml::sax::SAXException, std::exception) { uno::Reference<XFastContextHandler> xContextHandler(getContextHandler()); @@ -390,7 +390,7 @@ void SAL_CALL ShapeContextHandler::characters(const OUString & aChars) // ::com::sun::star::xml::sax::XFastShapeContextHandler: uno::Reference< drawing::XShape > SAL_CALL -ShapeContextHandler::getShape() throw (uno::RuntimeException) +ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception) { uno::Reference< drawing::XShape > xResult; uno::Reference< drawing::XShapes > xShapes( mxDrawPage, uno::UNO_QUERY ); @@ -503,20 +503,20 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException) } css::uno::Reference< css::drawing::XDrawPage > SAL_CALL -ShapeContextHandler::getDrawPage() throw (css::uno::RuntimeException) +ShapeContextHandler::getDrawPage() throw (css::uno::RuntimeException, std::exception) { return mxDrawPage; } void SAL_CALL ShapeContextHandler::setDrawPage (const css::uno::Reference< css::drawing::XDrawPage > & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { mxDrawPage = the_value; } css::uno::Reference< css::frame::XModel > SAL_CALL -ShapeContextHandler::getModel() throw (css::uno::RuntimeException) +ShapeContextHandler::getModel() throw (css::uno::RuntimeException, std::exception) { if( !mxFilterBase.is() ) throw uno::RuntimeException(); @@ -525,7 +525,7 @@ ShapeContextHandler::getModel() throw (css::uno::RuntimeException) void SAL_CALL ShapeContextHandler::setModel (const css::uno::Reference< css::frame::XModel > & the_value) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { if( !mxFilterBase.is() ) throw uno::RuntimeException(); @@ -534,64 +534,64 @@ void SAL_CALL ShapeContextHandler::setModel } uno::Reference< io::XInputStream > SAL_CALL -ShapeContextHandler::getInputStream() throw (uno::RuntimeException) +ShapeContextHandler::getInputStream() throw (uno::RuntimeException, std::exception) { return mxInputStream; } void SAL_CALL ShapeContextHandler::setInputStream (const uno::Reference< io::XInputStream > & the_value) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { mxInputStream = the_value; } OUString SAL_CALL ShapeContextHandler::getRelationFragmentPath() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return msRelationFragmentPath; } void SAL_CALL ShapeContextHandler::setRelationFragmentPath(const OUString & the_value) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { msRelationFragmentPath = the_value; } -::sal_Int32 SAL_CALL ShapeContextHandler::getStartToken() throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 SAL_CALL ShapeContextHandler::getStartToken() throw (::com::sun::star::uno::RuntimeException, std::exception) { return mnStartToken; } -void SAL_CALL ShapeContextHandler::setStartToken( ::sal_Int32 _starttoken ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ShapeContextHandler::setStartToken( ::sal_Int32 _starttoken ) throw (::com::sun::star::uno::RuntimeException, std::exception) { mnStartToken = _starttoken; } -awt::Point SAL_CALL ShapeContextHandler::getPosition() throw (uno::RuntimeException) +awt::Point SAL_CALL ShapeContextHandler::getPosition() throw (uno::RuntimeException, std::exception) { return maPosition; } -void SAL_CALL ShapeContextHandler::setPosition(const awt::Point& rPosition) throw (uno::RuntimeException) +void SAL_CALL ShapeContextHandler::setPosition(const awt::Point& rPosition) throw (uno::RuntimeException, std::exception) { maPosition = rPosition; } OUString ShapeContextHandler::getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return ShapeContextHandler_getImplementationName(); } uno::Sequence< OUString > ShapeContextHandler::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return ShapeContextHandler_getSupportedServiceNames(); } ::sal_Bool SAL_CALL ShapeContextHandler::supportsService(const OUString & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx index d6083dcacad7..a2719c316d70 100644 --- a/oox/source/shape/ShapeContextHandler.hxx +++ b/oox/source/shape/ShapeContextHandler.hxx @@ -57,86 +57,86 @@ public: // ::com::sun::star::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL supportsService - (const OUString & ServiceName) throw (css::uno::RuntimeException); + (const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException); + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); // ::com::sun::star::xml::sax::XFastContextHandler: virtual void SAL_CALL startFastElement (::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); virtual void SAL_CALL endFastElement(::sal_Int32 Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); virtual void SAL_CALL endUnknownElement (const OUString & Namespace, const OUString & Name) - throw (css::uno::RuntimeException, css::xml::sax::SAXException); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); virtual void SAL_CALL characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); // ::com::sun::star::xml::sax::XFastShapeContextHandler: virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getShape() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setDrawPage (const css::uno::Reference< css::drawing::XDrawPage > & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setModel (const css::uno::Reference< css::frame::XModel > & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getInputStream() throw (css::uno::RuntimeException); + getInputStream() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setInputStream (const css::uno::Reference< css::io::XInputStream > & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getRelationFragmentPath() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setRelationFragmentPath (const OUString & the_value) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getStartToken() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getStartToken() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException); - virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) throw (css::uno::RuntimeException); + virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) throw (css::uno::RuntimeException, std::exception); private: ShapeContextHandler(ShapeContextHandler &); // not defined diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.cxx b/oox/source/shape/ShapeDrawingFragmentHandler.cxx index a0a968142c34..8f64af353012 100644 --- a/oox/source/shape/ShapeDrawingFragmentHandler.cxx +++ b/oox/source/shape/ShapeDrawingFragmentHandler.cxx @@ -23,7 +23,7 @@ ShapeDrawingFragmentHandler::~ShapeDrawingFragmentHandler() throw() { } -void SAL_CALL ShapeDrawingFragmentHandler::endDocument() throw (xml::sax::SAXException, uno::RuntimeException) +void SAL_CALL ShapeDrawingFragmentHandler::endDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { } diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx index 82478b724d99..6c47e2bc91c0 100644 --- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx +++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx @@ -21,7 +21,7 @@ class ShapeDrawingFragmentHandler : public oox::core::FragmentHandler2 public: ShapeDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr pGroupShapePtr ) throw(); virtual ~ShapeDrawingFragmentHandler() throw(); - virtual void SAL_CALL endDocument() throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL endDocument() throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) SAL_OVERRIDE; private: diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx index 51c09b898962..f534ecf2ea0c 100644 --- a/oox/source/vml/vmlinputstream.cxx +++ b/oox/source/vml/vmlinputstream.cxx @@ -275,7 +275,7 @@ InputStream::~InputStream() } sal_Int32 SAL_CALL InputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { if( nBytesToRead < 0 ) throw IOException(); @@ -301,13 +301,13 @@ sal_Int32 SAL_CALL InputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int3 } sal_Int32 SAL_CALL InputStream::readSomeBytes( Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { return readBytes( rData, nMaxBytesToRead ); } void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { if( nBytesToSkip < 0 ) throw IOException(); @@ -321,13 +321,13 @@ void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip ) } } -sal_Int32 SAL_CALL InputStream::available() throw (NotConnectedException, IOException, RuntimeException) +sal_Int32 SAL_CALL InputStream::available() throw (NotConnectedException, IOException, RuntimeException, std::exception) { updateBuffer(); return maBuffer.getLength() - mnBufferPos; } -void SAL_CALL InputStream::closeInput() throw (NotConnectedException, IOException, RuntimeException) +void SAL_CALL InputStream::closeInput() throw (NotConnectedException, IOException, RuntimeException, std::exception) { mxTextStrm->closeInput(); } |