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 /svgio/source | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'svgio/source')
-rw-r--r-- | svgio/source/svgreader/svgdocumenthandler.cxx | 16 | ||||
-rw-r--r-- | svgio/source/svguno/xsvgparser.cxx | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx index fb211c70d29f..b4a6e25bf762 100644 --- a/svgio/source/svgreader/svgdocumenthandler.cxx +++ b/svgio/source/svgreader/svgdocumenthandler.cxx @@ -157,19 +157,19 @@ namespace svgio #endif } - void SvgDocHdl::startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { OSL_ENSURE(!mpTarget, "Already a target at document start (!)"); OSL_ENSURE(!maCssContents.size(), "SvgDocHdl startDocument with active css style stack entry (!)"); } - void SvgDocHdl::endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { OSL_ENSURE(!mpTarget, "Still a target at document end (!)"); OSL_ENSURE(!maCssContents.size(), "SvgDocHdl endDocument with active css style stack entry (!)"); } - void SvgDocHdl::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { if(!aName.isEmpty()) { @@ -383,7 +383,7 @@ namespace svgio } } - void SvgDocHdl::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { if(!aName.isEmpty()) { @@ -507,7 +507,7 @@ namespace svgio } } - void SvgDocHdl::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { const sal_uInt32 nLength(aChars.getLength()); @@ -582,15 +582,15 @@ namespace svgio } } - void SvgDocHdl::ignorableWhitespace(const OUString& /*aWhitespaces*/) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::ignorableWhitespace(const OUString& /*aWhitespaces*/) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { } - void SvgDocHdl::processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { } - void SvgDocHdl::setDocumentLocator(const uno::Reference< xml::sax::XLocator >& /*xLocator*/) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::setDocumentLocator(const uno::Reference< xml::sax::XLocator >& /*xLocator*/) throw (xml::sax::SAXException, uno::RuntimeException, std::exception) { } } // end of namespace svgreader diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx index e32e712225cd..a3433e022e2c 100644 --- a/svgio/source/svguno/xsvgparser.cxx +++ b/svgio/source/svguno/xsvgparser.cxx @@ -55,12 +55,12 @@ namespace svgio // XSvgParser virtual uno::Sequence< uno::Reference< ::graphic::XPrimitive2D > > SAL_CALL getDecomposition( const uno::Reference< ::io::XInputStream >& xSVGStream, - const OUString& aAbsolutePath) throw (uno::RuntimeException); + const OUString& aAbsolutePath) throw (uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const OUString&) throw(uno::RuntimeException); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService(const OUString&) throw(uno::RuntimeException, std::exception); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException, std::exception); }; } // end of namespace svgreader } // end of namespace svgio @@ -106,7 +106,7 @@ namespace svgio uno::Sequence< uno::Reference< ::graphic::XPrimitive2D > > XSvgParser::getDecomposition( const uno::Reference< ::io::XInputStream >& xSVGStream, - const OUString& aAbsolutePath ) throw (uno::RuntimeException) + const OUString& aAbsolutePath ) throw (uno::RuntimeException, std::exception) { drawinglayer::primitive2d::Primitive2DSequence aRetval; @@ -171,17 +171,17 @@ namespace svgio return aRetval; } - OUString SAL_CALL XSvgParser::getImplementationName() throw(uno::RuntimeException) + OUString SAL_CALL XSvgParser::getImplementationName() throw(uno::RuntimeException, std::exception) { return(XSvgParser_getImplementationName()); } - sal_Bool SAL_CALL XSvgParser::supportsService(const OUString& rServiceName) throw(uno::RuntimeException) + sal_Bool SAL_CALL XSvgParser::supportsService(const OUString& rServiceName) throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } - uno::Sequence< OUString > SAL_CALL XSvgParser::getSupportedServiceNames() throw(uno::RuntimeException) + uno::Sequence< OUString > SAL_CALL XSvgParser::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { return XSvgParser_getSupportedServiceNames(); } |