[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

[Jian Fang Zhang]

 sw/source/filter/xml/xmltbli.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b4311a2871e16001138e6d0009a552dc53d7bcd3
Author: Jian Fang Zhang <zhangjf at apache.org>
Date:   Tue Sep 4 01:05:22 2012 +0000

    Resolves: #i113600# Add call to subtable SwXMLTableRow_Impl.dispose()...
    
    to break cycle reference to SwXMLTableContext object
    
    Found by: zhangjf
    Patch by: zhangjf
    
    (cherry picked from commit ba47a717e009b2b497cbccfca2872e66f9ecb130)
    
    Change-Id: Iba0b581920417b3866b07542621d56ccdc272261
    (cherry picked from commit fc08fc98655397103ce7aacc18c2aa538ccff4e1)

diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 617faf4..dd8b358 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -2867,6 +2867,9 @@ void SwXMLTableContext::MakeTable( SwTableBox *pBox, sal_Int32 nW )
     bRelWidth = GetParentTable()->bRelWidth;
 
     _MakeTable( pBox );
+
+    for (size_t i=0; i < pRows->size(); ++i) // i113600, to break the cyclic reference to SwXMLTableContext object
+        (*pRows)[i].Dispose();
 }
 
 const SwStartNode *SwXMLTableContext::InsertTableSection(