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

[Miklos Vajna]

 sw/source/filter/ww8/rtfattributeoutput.cxx |   14 --------------
 1 file changed, 14 deletions(-)

New commits:
commit b8ddbddfd7ac7365196f0d2f875dbcc3e26dbff5
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Sep 12 09:31:14 2013 +0200

    RtfAttributeOutput::StartTableRow: clean this up
    
    This was never enabled by default, nobody requested it, adds complexity,
    so just don't do it at all.
    
    Change-Id: Ieafb9777045e9cde3cdd2272c5190f88eb5eb576

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 5151261..f318699 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -905,19 +905,6 @@ void RtfAttributeOutput::StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pT
 
     TableDefinition(pTableTextNodeInfoInner);
 
-    SvtMiscOptions aMiscOptions;
-    if (aMiscOptions.IsExperimentalMode())
-    {
-        m_aTables.push_back(m_aRowDefs.toString());
-        // Emit row properties at the start of the row as well for non-nested
-        // tables, to support old readers.
-        if ( nCurrentDepth <= 1 )
-            m_rExport.Strm() << m_aRowDefs.makeStringAndClear().getStr();
-        m_aRowDefs.setLength(0);
-        return;
-    }
-    else
-    {
     if (!m_bLastTable)
         m_aTables.push_back(m_aRowDefs.makeStringAndClear());
 
@@ -928,7 +915,6 @@ void RtfAttributeOutput::StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pT
     // necessary for subtables.
     m_rExport.Strm() << m_aAfterRuns.makeStringAndClear().getStr();
     m_rExport.Strm() << m_aRowDefs.makeStringAndClear().getStr();
-    }
 }
 
 void RtfAttributeOutput::StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )