diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-03-17 23:49:37 +0300 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-07-20 12:15:18 +0200 |
| commit | 784d8fceceb5378cfb7661c2f4294a0a22f0397c (patch) | |
| tree | ffdb7cd4c40f7b3cbfb8ddfcacacb032f30d528c /editeng | |
| parent | aca48fbf7b7c33ebabf6f1e479959838693e2508 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/57705
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/items/frmitems.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index ec08134ef2eb..3e311a3c8975 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -2679,10 +2679,10 @@ void BorderDistancesToWord(const SvxBoxItem& rBox, const WordPageMargins& rMargi const SvxBorderLine* pLnR = rBox.GetLine(SvxBoxItemLine::RIGHT); // We need to take border widths into account - const long nWidthT = pLnT ? pLnT->GetWidth() : 0; - const long nWidthL = pLnL ? pLnL->GetWidth() : 0; - const long nWidthB = pLnB ? pLnB->GetWidth() : 0; - const long nWidthR = pLnR ? pLnR->GetWidth() : 0; + const long nWidthT = pLnT ? pLnT->GetScaledWidth() : 0; + const long nWidthL = pLnL ? pLnL->GetScaledWidth() : 0; + const long nWidthB = pLnB ? pLnB->GetScaledWidth() : 0; + const long nWidthR = pLnR ? pLnR->GetScaledWidth() : 0; // Resulting distances from text to borders const sal_Int32 nT2BT = pLnT ? nT : 0; |