From 24b4fbfa39f212c769bf4d966258a8fb4c98c201 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 18 Mar 2014 12:29:36 -0400 Subject: fdo#75260: More adjustments. 1) Offset top and left border lines only for double lines. 2) Don't apply zoom level scaling to border widths. That's used for line pattern spacing only. Change-Id: I12bdd1492531cc6651e22955c3dca4bdda0f1e4c --- sw/source/core/layout/paintfrm.cxx | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'sw') diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index e1f37f2d948f..18bfe6fe05a8 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2797,13 +2797,17 @@ void calcOffsetForDoubleLine( SwLineEntryMap& rLines ) for (size_t i = 0; itSet != itSetEnd; ++itSet, ++i) { SwLineEntry aLine = *itSet; - aLine.mnOffset = static_cast(aLine.maAttribute.Prim()+aLine.maAttribute.Dist()); - aLine.mbOffsetPerp = true; - - if (i == 0) - aLine.mbOffsetStart = true; - if (i == nEntryCount - 1) - aLine.mbOffsetEnd = true; + if (aLine.maAttribute.Secn()) + { + // Apply offset only for double lines. + aLine.mnOffset = static_cast(aLine.maAttribute.Prim()+aLine.maAttribute.Dist()); + aLine.mbOffsetPerp = true; + + if (i == 0) + aLine.mbOffsetStart = true; + if (i == nEntryCount - 1) + aLine.mbOffsetEnd = true; + } aNewSet.insert(aLine); } @@ -2865,10 +2869,14 @@ void SwTabFrmPainter::Insert( const SwFrm& rFrm, const SvxBoxItem& rBoxItem ) const Fraction& rFracX = rMapMode.GetScaleX(); const Fraction& rFracY = rMapMode.GetScaleY(); - svx::frame::Style aL(rBoxItem.GetLeft(), rFracX); - svx::frame::Style aR(rBoxItem.GetRight(), rFracY); - svx::frame::Style aT(rBoxItem.GetTop(), rFracX); - svx::frame::Style aB(rBoxItem.GetBottom(), rFracY); + svx::frame::Style aL(rBoxItem.GetLeft()); + aL.SetPatternScale(rFracY); + svx::frame::Style aR(rBoxItem.GetRight()); + aR.SetPatternScale(rFracY); + svx::frame::Style aT(rBoxItem.GetTop()); + aT.SetPatternScale(rFracX); + svx::frame::Style aB(rBoxItem.GetBottom()); + aB.SetPatternScale(rFracX); aR.MirrorSelf(); aB.MirrorSelf(); -- cgit