From 9f4b335af20217d9d982ae92e946fe9b73cdfa61 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 25 Feb 2014 13:19:12 +0000 Subject: coverity#738306 Uncaught exception Change-Id: Id8b343993b22ceb83490c7f2d1f465a728ccb4fc --- include/xmloff/xmlimp.hxx | 6 ++++-- sw/source/filter/xml/xmlimp.cxx | 6 ++++-- sw/source/filter/xml/xmlimp.hxx | 6 ++++-- xmloff/source/core/xmlimp.cxx | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 5b5ee9a444da..1dd5cd693cea 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -195,8 +195,10 @@ public: static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw(); // ::com::sun::star::xml::sax::XDocumentHandler - virtual void SAL_CALL startDocument(void) - 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, diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 77278f2ad0bb..657ea3465209 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -493,8 +493,10 @@ static OTextCursorHelper *lcl_xml_GetSwXTextCursor( const Reference < XTextCurso return pTxtCrsr; } -void SwXMLImport::startDocument( void ) - throw( xml::sax::SAXException, uno::RuntimeException ) +void SwXMLImport::startDocument() + throw (xml::sax::SAXException, + uno::RuntimeException, + std::exception) { // delegate to parent SvXMLImport::startDocument(); diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index 4b13b6c6052d..e25afd952164 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -115,8 +115,10 @@ public: ~SwXMLImport() throw(); // ::com::sun::star::xml::sax::XDocumentHandler - virtual void SAL_CALL startDocument(void) - 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(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 4c361e503fc9..46ec380a34da 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -466,8 +466,10 @@ sal_Int64 SAL_CALL SvXMLImport::getSomething( const uno::Sequence< sal_Int8 >& r return 0; } -void SAL_CALL SvXMLImport::startDocument( void ) - throw( xml::sax::SAXException, uno::RuntimeException ) +void SAL_CALL SvXMLImport::startDocument() + throw (xml::sax::SAXException, + uno::RuntimeException, + std::exception) { SAL_INFO( "xmloff.core", "{ SvXMLImport::startDocument" ); if( !mxGraphicResolver.is() || !mxEmbeddedResolver.is() ) -- cgit