diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-06-12 15:40:45 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-12 16:15:17 +0100 |
| commit | 56214e02055862f196900be9a7318cbe54a48f1c (patch) | |
| tree | c55fc6af9c8dc34a34f148936ee7431975a262a7 | |
| parent | b3e0232e08f49824c9884e33d579646748f7f5f6 (diff) | |
fdo#43249: WW8: fix double border import:
The border widths are tripled on import, because that is effectively
what SetWidth does for DOUBLE borders; set a divisor of 3 similar to
e2ffb71305c5f085eec6d396651c76d6daee3406
70a6a4d425558340bb49507975343a3e0a1bdde8
Change-Id: I40b175bedc1ed2d564be126bf9e6870b43474aba
(cherry picked from commit 36e43b52992735c622833e923faa63774b9e2f76)
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 5ac204bb8ac4..8182cff02d58 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -1571,6 +1571,10 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor, aLine.SetWidth( nLineThick ); // No conversion here, nLineThick is already in twips aLine.SetStyle( nIdx ); + if (editeng::DOUBLE == nIdx) + { // fdo#43249: divide width by 3 for outer line, gap, inner line + aLine.ScaleMetrics(1, 3); + } for(sal_uInt16 nLine = 0; nLine < 4; ++nLine) rBox.SetLine(new SvxBorderLine( aLine ), nLine); |