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

[Caolán McNamara]

 sw/source/filter/ww8/docxattributeoutput.cxx |    9 ---------
 sw/source/filter/ww8/docxattributeoutput.hxx |    2 --
 2 files changed, 11 deletions(-)

New commits:
commit ff349e96ae552d852ee39ce08009079b76033fd3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 17 14:23:45 2015 +0100

    incredibly dubious hunk of code
    
    from
    
    commit 0415e2696156b25226f21085a0716187f83c2f4b
    Author: PriyankaGaikwad <priyanka.gaikwad at synerzip.com>
    Date:   Thu Feb 27 17:42:52 2014 +0530
    
        fdo#73219 File corruption: Table in header
    
        Description:
        File corrupt due to the end tag </w:tc> </w:tr> </w:tbl> are missing after roundtrip in header4.xml
    
        Conflicts:
            sw/qa/extras/ooxmlexport/ooxmlexport.cxx
        Reviewed on:
            https://gerrit.libreoffice.org/8378
    
        Change-Id: Ib05a50b3b3beca6c744b93360f9341ddcaa1a22a
    
    Change-Id: I93ecadf7bfd2d19da33611e82ba95c4106bda2a5

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index f65ba79..f5e9581 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -264,18 +264,9 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText
                 {
                     ww8::WW8TableNodeInfoInner::Pointer_t pInner( pTextNodeInfo->getInnerForDepth( nDepth ) );
 
-                    if (m_tableReference->m_pOldTablepInner && m_tableReference->m_pOldTablepInner->getTable() == pInner->getTable() && nCurrentDepth > 1 &&  nDepth != 1)
-                    {
-                       m_tableReference->m_pOldTablepInner = pInner;
-                       break;
-                    }
-                    else
-                    {
                     StartTable( pInner );
                     StartTableRow( pInner );
                     StartTableCell( pInner );
-                    m_tableReference->m_pOldTablepInner = pInner;
-                    }
                 }
 
                 m_tableReference->m_nTableDepth = nCurrentDepth;
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index e3d2fbb..4da101b 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -130,8 +130,6 @@ struct TableReference
     /// Remember the current table depth.
     sal_uInt32 m_nTableDepth;
 
-    ww8::WW8TableNodeInfoInner::Pointer_t m_pOldTablepInner;
-
     TableReference()
         : m_bTableCellOpen(false),
         m_bTableCellParaSdtOpen(false),