sax/source/fastparser/fastparser.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit 975884fbbc3f80a634258ee562037688a42027a9 Author: Caolán McNamara <[email protected]> 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/51830 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index c6c9c0b207fd..2765584a08fc 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -290,7 +290,7 @@ private: { mpParser->parse(); } - catch (const Exception &) + catch (...) { Entity &rEntity = mpParser->getEntity(); rEntity.getEvent( EXCEPTION ); @@ -445,7 +445,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() ); } @@ -464,7 +464,7 @@ void Entity::characters( const OUString& sChars ) { xContext->characters( sChars ); } - catch (const Exception&) + catch (...) { saveException( ::cppu::getCaughtException() ); } @@ -488,7 +488,7 @@ void Entity::endElement() else xContext->endUnknownElement( aContext.maNamespace, aContext.maElementName ); } - catch (const Exception&) + catch (...) { saveException( ::cppu::getCaughtException() ); } @@ -501,7 +501,7 @@ void Entity::processingInstruction( const OUString& rTarget, const OUString& rDa { mxDocumentHandler->processingInstruction( rTarget, rData ); } - catch (const Exception&) + catch (...) { saveException( ::cppu::getCaughtException() ); } @@ -1225,7 +1225,7 @@ void FastSaxParserImpl::callbackStartElement(const xmlChar *localName , const xm rEntity.startElement( &rEvent ); } } - catch (const Exception&) + catch (...) { rEntity.saveException( ::cppu::getCaughtException() ); } diff --git a/sw/qa/core/data/ooxml/pass/ofz4825-1.docx b/sw/qa/core/data/ooxml/fail/ofz4825-1.docx similarity index 100% rename from sw/qa/core/data/ooxml/pass/ofz4825-1.docx rename to sw/qa/core/data/ooxml/fail/ofz4825-1.docx _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
