[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8graf.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 56214e02055862f196900be9a7318cbe54a48f1c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jun 12 15:40:45 2012 +0200

    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 at redhat.com>

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 5ac204b..8182cff 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);