From 5c21b3d55ac332acd097fb7a4e564398c1628929 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 25 Jan 2012 17:44:36 +0100 Subject: [PATCH 1/2] fdo#38542: sw: ODF import: divide width by 3 for "double" borders The problem is that the width from the fo:border{,-left,-right,-top,-bottom} attributes is effectively tripled for "double" borders. --- sw/source/filter/xml/xmlithlp.cxx | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx index 18a1b6b..cd383b5 100644 --- a/sw/source/filter/xml/xmlithlp.cxx +++ b/sw/source/filter/xml/xmlithlp.cxx @@ -212,6 +212,10 @@ sal_Bool lcl_frmitems_setXMLBorder( SvxBorderLine*& rpLine, rpLine->GetOutWidth(); rpLine->SetWidth( nWidth ); + if (bDouble) + { // fdo#38542: divide width by 3 for outer line, gap, inner line + rpLine->ScaleMetrics(1, 3); + } } lcl_frmitems_setXMLBorderStyle( *rpLine, nStyle ); } -- 1.7.7.6