[Libreoffice-commits] core.git: sw/source
Caolán McNamara
caolanm at redhat.com
Mon Feb 19 20:46:27 UTC 2018
sw/source/filter/ww8/ww8graf.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 3db5a4ca4f29b7f3bdba6bdf825d4606fd939a22
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 19 15:26:26 2018 +0000
ofz#6459 leak
Change-Id: Ie5501d20176f13a50a6d57c13ce1053343924a91
Reviewed-on: https://gerrit.libreoffice.org/50003
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 3b3aea37ca15..f8258e10a001 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2630,7 +2630,13 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
// #i21847#
// Some shapes are set to *hidden*, don't import those ones.
if (pRecord->bHidden)
+ {
+ // remove old object from the Z-Order list
+ m_xMSDffManager->RemoveFromShapeOrder(pObject);
+ // and delete the object
+ SdrObject::Free(pObject);
return nullptr;
+ }
sal_uInt16 nCount = pObject->GetUserDataCount();
if(nCount)
More information about the Libreoffice-commits
mailing list