summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-06-04 18:54:34 +0200
committerMichael Stahl <mstahl@redhat.com>2012-06-04 19:17:27 +0200
commit30aa036181480c76f909c2dda86b2682cac1fd73 (patch)
tree653b52f00bf2aef96c3618b4410eb989ab21cd79
parent764752f5d85cb7c86ad21340dfdda4b62754790c (diff)
fdo#46112: tweak condition to prevent guessing only...
...if there are actually individual line widths given; fixes the sw_rtftok test. Change-Id: If5f6ef54b93c5bfccfd011f25d9d9301637d388e
-rw-r--r--editeng/source/items/frmitems.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index c40bec98cae5..bfdf178574a1 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1867,7 +1867,8 @@ SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, Svx
rSvxLine.SetWidth( bConvert? MM100_TO_TWIP_UNSIGNED( rLine.LineWidth ) : rLine.LineWidth );
// fdo#46112: double does not necessarily mean symmetric
// for backwards compatibility
- bGuessWidth = (DOUBLE == nStyle);
+ bGuessWidth = (DOUBLE == nStyle) &&
+ (rLine.InnerLineWidth > 0) && (rLine.OuterLineWidth > 0);
}
return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, bGuessWidth);