Kaydet (Commit) 795132a1 authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Andras Timar

ofz#7110 ensure join is called on std::exceptions as well as uno::Exception

Change-Id: I1d17301e4d7f951b7176d5a91c0dca0ef051b2a2
Reviewed-on: https://gerrit.libreoffice.org/51831Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit cc709725)
üst 25e37b64
......@@ -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() );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment