sw/qa/extras/ooxmlexport/data/table_lineRule.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 6 ++++++ sw/source/filter/ww8/ww8atr.cxx | 3 +++ 3 files changed, 9 insertions(+)
New commits: commit b00c73f9338a1bc0d4698f14383c4a5f9dbd78b6 Author: PriyankaGaikwad <priyanka.gaik...@synerzip.com> Date: Fri Nov 15 15:27:54 2013 +0530 Fixed for spacing between lines having lineRule "auto" is getting preserved Problem Desciption: In "w:spacing" value of "w:lineRule" attribute value is not getting is preserved. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/6675 Change-Id: Ie9c99864bd5a198af94c1d251666bcb3427d955a diff --git a/sw/qa/extras/ooxmlexport/data/table_lineRule.docx b/sw/qa/extras/ooxmlexport/data/table_lineRule.docx new file mode 100644 index 0000000..d1d47ff Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/table_lineRule.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 7c5738f..459d615 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1888,6 +1888,12 @@ DECLARE_OOXML_TEST(testFootnoteParagraphTag, "testFootnote.docx") assertXPath(pXmlFootnotes, "/w:footnotes/w:footnote[3]/w:p/w:r/w:rPr/w:rStyle","val","Footnotereference"); } +DECLARE_OOXML_TEST(testSpacingLineRule,"table_lineRule.docx") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p/w:pPr/w:spacing", "lineRule", "auto"); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index b0630a8..69f5900 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -4529,6 +4529,9 @@ void AttributeOutputBase::ParaLineSpacing( const SvxLineSpacingItem& rSpacing ) default: break; case SVX_LINE_SPACE_AUTO: + nSpace = (short)( ( nSpace * rSpacing.GetPropLineSpace() ) / 100L ); + nMulti = 1; + break; case SVX_LINE_SPACE_FIX: case SVX_LINE_SPACE_MIN: { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits