diff options
author | Tushar Bende <tushar.bende@synerzip.com> | 2014-02-03 16:44:08 +0530 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-02-13 17:43:47 +0100 |
commit | d9809c68f62af3b594854b142e1db5171804158d (patch) | |
tree | e56c916785bfe4bdeef185a446f545912cc227a2 /editeng | |
parent | f8ebc65a51a61c1d9b3172467b0770202281db32 (diff) |
fdo#74141 :In <w:ind> Right margin gets added even if not present in orig doc.
There was a problem that in style.xml and document.xml in <w:ind> tag "right" & "left" margin
attributes gets added(w:right=0 & w:left=0),if these attributes are not set in original document.
(In this case LO should not write these attributes in <w:ind>)
eg. if original doc has implicit right and left indentation values set(In style.xml) and there is no
explicit values provided for some para (In document.xml) still it used to write w:right=0 and w:left=0
in <w:ind> tag of document.xml which overrides an entry from style.xml.
XML difference :
- Original file:
<w:ind w:left="567" />
- Roundtrip file Before Fix:
<w:ind w:left="567" w:right="0" w:hanging="0"/>
- Roundtrip file After Fix:
<w:ind w:left="567" w:hanging="0"/>
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7816
Change-Id: Ifa01bae24d48bb38d5e255356247c46a43beefcc
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/items/frmitems.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 6eb012ad26e0..7f2cf425d51a 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -420,7 +420,9 @@ SvxLRSpaceItem::SvxLRSpaceItem( const sal_uInt16 nId ) : nPropFirstLineOfst( 100 ), nPropLeftMargin( 100 ), nPropRightMargin( 100 ), - bAutoFirst ( 0 ) + bAutoFirst ( 0 ), + bExplicitZeroMarginValRight(sal_False), + bExplicitZeroMarginValLeft(sal_False) { } @@ -439,7 +441,9 @@ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight, nPropFirstLineOfst( 100 ), nPropLeftMargin( 100 ), nPropRightMargin( 100 ), - bAutoFirst ( 0 ) + bAutoFirst ( 0 ), + bExplicitZeroMarginValRight(sal_False), + bExplicitZeroMarginValLeft(sal_False) { } @@ -574,7 +578,9 @@ bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const nPropFirstLineOfst == rOther.GetPropTxtFirstLineOfst() && nPropLeftMargin == rOther.GetPropLeft() && nPropRightMargin == rOther.GetPropRight() && - bAutoFirst == rOther.IsAutoFirst() ); + bAutoFirst == rOther.IsAutoFirst() && + bExplicitZeroMarginValRight == rOther.IsExplicitZeroMarginValRight() && + bExplicitZeroMarginValLeft == rOther.IsExplicitZeroMarginValLeft() ); } // ----------------------------------------------------------------------- |