commit e21f924439c065239268844d1cabdd0eaee7b313
author Michael Stahl <mstahl@redhat.com> Wed Jun 27 15:58:16 2012 +0200
committer Miklos Vajna <vmiklos@suse.cz> Fri Jun 29 09:36:51 2012 +0200
tree 02ab1f16992d9d4814f7368a84f7d23c5df6ab22
parent af18adbad7de00a7b0b1eda659ec6552a760556d

fdo#39415: sw: fix collapsing border painting:

In a table with collapsing borders, the horizontal borders  need to be
painted "below" the reference line, and not "centered" on the line like
the vertical borders.
a0486f02433703744f487e599422714d03937956 was apparently an attempt to
fix this, but unfortunately it adjusted both top and bottom borders
with the top border width, which has horrible results if the top and
bottom borders have different widths.

Change-Id: I7605eda6ef8111612ceb1ded79c0811de9ca7b25
(cherry picked from commit aa8240e80394887a4af45710de69aacacec66d25)

sw/source/core/layout/paintfrm.cxx

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 2351e02..d851cf0 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2708,6 +2708,7 @@ void SwTabFrmPainter::Insert( const SwFrm& rFrm, const SvxBoxItem& rBoxItem )
    svx::frame::Style aB( rBoxItem.GetBottom() );

    const SwTwips nHalfTopWidth = aT.GetWidth() / 2;
    const SwTwips nHalfBottomWidth = aB.GetWidth() / 2;

    aR.MirrorSelf();
    aB.MirrorSelf();
@@ -2720,10 +2721,14 @@ void SwTabFrmPainter::Insert( const SwFrm& rFrm, const SvxBoxItem& rBoxItem )
    aT.SetRefMode( !bVert ? svx::frame::REFMODE_BEGIN : svx::frame::REFMODE_END );
    aB.SetRefMode( !bVert ? svx::frame::REFMODE_BEGIN : svx::frame::REFMODE_END );

    SwLineEntry aLeft  ( nLeft,   nTop + nHalfTopWidth,  nBottom + nHalfTopWidth, bVert ? aB : ( bR2L ? aR : aL ) );
    SwLineEntry aRight ( nRight,  nTop + nHalfTopWidth,  nBottom + nHalfTopWidth, bVert ? aT : ( bR2L ? aL : aR ) );
    SwLineEntry aTop   ( nTop + nHalfTopWidth,    nLeft, nRight,  bVert ? aL : aT );
    SwLineEntry aBottom( nBottom + nHalfTopWidth, nLeft, nRight,  bVert ? aR : aB );
    SwLineEntry aLeft  ( nLeft,   nTop + nHalfTopWidth,
            nBottom + nHalfBottomWidth, bVert ? aB : ( bR2L ? aR : aL ) );
    SwLineEntry aRight ( nRight,  nTop + nHalfTopWidth,
            nBottom + nHalfBottomWidth, bVert ? aT : ( bR2L ? aL : aR ) );
    SwLineEntry aTop   ( nTop + nHalfTopWidth,
            nLeft, nRight,  bVert ? aL : aT );
    SwLineEntry aBottom( nBottom + nHalfBottomWidth,
            nLeft, nRight,  bVert ? aR : aB );

    Insert( aLeft, false );
    Insert( aRight, false );