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

[PriyankaGaikwad]

 sw/qa/extras/ooxmlexport/data/table_atleast.docx         |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx                 |    6 ++++++
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |    3 +++
 3 files changed, 9 insertions(+)

New commits:
commit 9fbdb2b8a71e195ac2aa68740e66e84316b08ed7
Author: PriyankaGaikwad <priyanka.gaikwad at synerzip.com>
Date:   Fri Nov 15 18:29:22 2013 +0530

    Fixed for spacing between lines in table is getting preserve.
    
    Problem Description:
    In "w:spacing" value of "w:line" attribute value in table is not getting is preserved.
    
    Conflicts:
    	sw/qa/extras/ooxmlexport/ooxmlexport.cxx
    Reviewed on:
    	https://gerrit.libreoffice.org/6678
    
    Change-Id: I2b0284a22da3a828c81876960f488049be4f8681

diff --git a/sw/qa/extras/ooxmlexport/data/table_atleast.docx b/sw/qa/extras/ooxmlexport/data/table_atleast.docx
new file mode 100644
index 0000000..ec751aa
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/table_atleast.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 459d615..66a24c5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1894,6 +1894,12 @@ DECLARE_OOXML_TEST(testSpacingLineRule,"table_lineRule.docx")
      assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p/w:pPr/w:spacing", "lineRule", "auto");
 }
 
+DECLARE_OOXML_TEST(testTableLineSpacing, "table_atleast.docx")
+{
+    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+    assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:pPr/w:spacing", "line", "320");
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index f18c329..a8e51b0 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -656,6 +656,9 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
                 const PropertyMap::iterator aDefaultRepeatIt = pAllCellProps->find(PROP_HEADER_ROW_COUNT);
                 if ( aDefaultRepeatIt != pAllCellProps->end( ) )
                     pAllCellProps->erase( aDefaultRepeatIt );
+                const PropertyMap::iterator aDefaultRepeatIt2 = pAllCellProps->find(PROP_PARA_LINE_SPACING);
+                if ( aDefaultRepeatIt2 != pAllCellProps->end( ) )
+                    pAllCellProps->erase( aDefaultRepeatIt2 );
 
                 // Then add the cell properties
                 pAllCellProps->InsertProps(*aCellIterator);