From 45f1b733e0f736f4db677ba1fd17695ac1009c9f Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Sat, 17 Mar 2018 23:49:37 +0300 Subject: tdf#112118: use correct border when calculating margin This is a longstanding (at least since 2000: already present in commit 7b0b5cdf) error where left border linespace was used when calculating right margin. It was copypasted from ww8 import to ooxml code verbatim. The problem only manifests itself when left and right border spacings are not the same; and since we had other errors in the borders import, that additional problem simply wasn't apparent. Also use scaled border width in border distance/margin calculations. Unit tests updated. Change-Id: I70961e1bde29471def69e1ef944ba2779cffe307 Reviewed-on: https://gerrit.libreoffice.org/51474 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- sw/source/filter/ww8/ww8par6.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw/source/filter/ww8/ww8par6.cxx') diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 5e8341e88060..a476a800dc93 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -439,7 +439,7 @@ long SetBorderDistance(bool bFromEdge, SvxBoxItem& aBox, SvxBoxItemLine eLine, l return nMSMargin; sal_Int32 nNewMargin = nMSMargin; sal_Int32 nNewDist = aBox.GetDistance(eLine); - sal_Int32 nLineWidth = pLine->GetWidth(); + sal_Int32 nLineWidth = pLine->GetScaledWidth(); editeng::BorderDistanceFromWord(bFromEdge, nNewMargin, nNewDist, nLineWidth); aBox.SetDistance(nNewDist, eLine); -- cgit