From 2930a1abf8ba74d9bba0be808c1172ea7cd8e149 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 12 Jun 2012 15:40:45 +0200 Subject: 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: Michael Stahl --- sw/source/filter/ww8/ww8graf.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sw') diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 65431a5e12d4..084fc1519e63 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -1570,6 +1570,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); -- cgit v1.2.3