diff options
| author | PriyankaGaikwad <priyanka.gaikwad@synerzip.com> | 2013-11-15 15:27:54 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-15 17:47:25 +0100 |
| commit | b00c73f9338a1bc0d4698f14383c4a5f9dbd78b6 (patch) | |
| tree | ba5c1ec4cf7d6c769f9e3810a0f071eba9755ddf /sw | |
| parent | 5cdd6d28d10d815c046b65db48847558259a1d1a (diff) | |
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
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/table_lineRule.docx | bin | 0 -> 13998 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/table_lineRule.docx b/sw/qa/extras/ooxmlexport/data/table_lineRule.docx Binary files differnew file mode 100644 index 000000000000..d1d47ff24069 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/table_lineRule.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 7c5738f30ea8..459d615b0dce 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 b0630a8b6709..69f5900592a9 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: { |