diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-18 20:38:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-19 09:57:37 +0200 |
| commit | 505a062b47f01f7bc68d8450397f7cc6d818c80c (patch) | |
| tree | 025021475a77fe4b2695aa809899b30d6196133e | |
| parent | Looks like we can just as well use ADORecordset here (diff) | |
| download | core-505a062b47f01f7bc68d8450397f7cc6d818c80c.tar.gz core-505a062b47f01f7bc68d8450397f7cc6d818c80c.zip | |
ofz: fix Indirect leaks
Change-Id: Ib851012a0e3ad520a09c1e43e3f77417ab05f9c4
Reviewed-on: https://gerrit.libreoffice.org/42435
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | xmloff/source/core/xmlimp.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 1da5e8212615..724dd5c88e80 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -1592,11 +1592,15 @@ XMLEventImportHelper& SvXMLImport::GetEventImport() void SvXMLImport::SetFontDecls( XMLFontStylesContext *pFontDecls ) { + if (mxFontDecls.is()) + static_cast<SvXMLStylesContext*>(mxFontDecls.get())->Clear(); mxFontDecls = pFontDecls; } void SvXMLImport::SetStyles( SvXMLStylesContext *pStyles ) { + if (mxStyles.is()) + static_cast<SvXMLStylesContext*>(mxStyles.get())->Clear(); mxStyles = pStyles; } @@ -1628,6 +1632,8 @@ void SvXMLImport::SetAutoStyles( SvXMLStylesContext *pAutoStyles ) } } } + if (mxAutoStyles.is()) + static_cast<SvXMLStylesContext*>(mxAutoStyles.get())->Clear(); mxAutoStyles = pAutoStyles; GetTextImport()->SetAutoStyles( pAutoStyles ); GetShapeImport()->SetAutoStylesContext( pAutoStyles ); @@ -1637,6 +1643,8 @@ void SvXMLImport::SetAutoStyles( SvXMLStylesContext *pAutoStyles ) void SvXMLImport::SetMasterStyles( SvXMLStylesContext *pMasterStyles ) { + if (mxMasterStyles.is()) + static_cast<SvXMLStylesContext*>(mxMasterStyles.get())->Clear(); mxMasterStyles = pMasterStyles; } |