[Libreoffice-commits] core.git: xmloff/source

Caolán McNamara caolanm at redhat.com
Tue Sep 19 07:58:06 UTC 2017


 xmloff/source/core/xmlimp.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 505a062b47f01f7bc68d8450397f7cc6d818c80c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 18 20:38:38 2017 +0100

    ofz: fix Indirect leaks
    
    Change-Id: Ib851012a0e3ad520a09c1e43e3f77417ab05f9c4
    Reviewed-on: https://gerrit.libreoffice.org/42435
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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;
 }
 


More information about the Libreoffice-commits mailing list