sax/source/fastparser/fastparser.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit cc709725803901edbb2c4c1cc4dad4114d91ef74 Author: Caolán McNamara <caol...@redhat.com> Date: Sun Mar 25 14:36:28 2018 +0100 ofz#7110 ensure join is called on std::exceptions as well as uno::Exception Change-Id: I1d17301e4d7f951b7176d5a91c0dca0ef051b2a2 Reviewed-on: https://gerrit.libreoffice.org/51831 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 4d4ec416e7a4..a0b568c46e38 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -288,7 +288,7 @@ private: { mpParser->parse(); } - catch (const Exception &) + catch (...) { Entity &rEntity = mpParser->getEntity(); rEntity.getEvent( EXCEPTION ); @@ -459,7 +459,7 @@ void Entity::startElement( Event const *pEvent ) maContextStack.top().mxContext.set( xContext.get() ); xContext.set( nullptr, SAL_NO_ACQUIRE ); } - catch (const Exception&) + catch (...) { saveException( ::cppu::getCaughtException() ); } @@ -478,7 +478,7 @@ void Entity::characters( const OUString& sChars ) { xContext->characters( sChars ); } - catch (const Exception&) + catch (...) { saveException( ::cppu::getCaughtException() ); } @@ -502,7 +502,7 @@ void Entity::endElement() else xContext->endUnknownElement( aContext.maNamespace, aContext.maElementName ); } - catch (const Exception&) + catch (...) { saveException( ::cppu::getCaughtException() ); } @@ -515,7 +515,7 @@ void Entity::processingInstruction( const OUString& rTarget, const OUString& rDa { mxDocumentHandler->processingInstruction( rTarget, rData ); } - catch (const Exception&) + catch (...) { saveException( ::cppu::getCaughtException() ); } @@ -1236,7 +1236,7 @@ void FastSaxParserImpl::callbackStartElement(const xmlChar *localName , const xm rEntity.startElement( &rEvent ); } } - catch (const Exception&) + catch (...) { rEntity.saveException( ::cppu::getCaughtException() ); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits