diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-25 14:36:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-25 18:33:00 +0200 |
| commit | 975884fbbc3f80a634258ee562037688a42027a9 (patch) | |
| tree | 5643f200fc17b298a17dea1c500f2a2bd8db59fb /sax | |
| parent | 6189c211d52975442be4a23662af501dbb2582e2 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/source/fastparser/fastparser.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
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() ); } |