summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-01-25 17:44:36 +0100
committerNoel Power <noel.power@novell.com>2012-01-30 11:34:16 +0000
commit8e184c376ce77b3c27d7a2722b15b8f36de71ea5 (patch)
tree9ef1de43058fc8d47079094747f6192f994e559b
parentec59889a80e9fd91fc94943a56173e27427ec4a5 (diff)
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. Signed-off-by: C├ędric Bosdonnat <cedric.bosdonnat.ooo@free.fr> Signed-off-by: Noel Power <noel.power@novell.com>
-rw-r--r--sw/source/filter/xml/xmlithlp.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index 6a509373b9..7946b81370 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 );
}