mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#38635: sw: fix border corner gaps:

Browse Source 
The start and end points of the vertical and adjacent horizontal borders
were apart by 1.5 to 3 twips, leading to small visible gaps in the corners.
This is fixed by using lcl_AlignWidth/lcl_AlignHeight on the border widths,
and by always computing the start/end positions from the outer edge,
which makes the horizontal and vertical start/end points match.
(regression from 0f0896c26f)
This commit is contained in:
Michael Stahl
2012-04-17 22:30:25 +02:00
parent cbcf7e32ad
commit b08e9f3023
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sw/source/core/layout/paintfrm.cxx
View File

@@ -4616,8 +4616,13 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft,
nExtentOE = lcl_GetExtent( pBottomBorder, NULL ); nExtentOE = lcl_GetExtent( pBottomBorder, NULL );
} }
basegfx::B2DPoint aStart( aRect.Left() + aRect.Width() / 2.0, aRect.Top() + lcl_GetLineWidth( pTopBorder ) / 2.0 ); double const fStartX( (_bLeft) // fdo#38635: always from outer edge
basegfx::B2DPoint aEnd( aRect.Left() + aRect.Width() / 2.0, aRect.Bottom() - lcl_GetLineWidth( pBottomBorder ) / 2.0 ); ? aRect.Left() + (aRect.Width() / 2.0)
: aRect.Right() - (aRect.Width() / 2.0));
basegfx::B2DPoint const aStart(fStartX,
aRect.Top() + lcl_AlignHeight(lcl_GetLineWidth(pTopBorder))/2.0 );
basegfx::B2DPoint const aEnd(fStartX,
aRect.Bottom() - lcl_AlignHeight(lcl_GetLineWidth(pBottomBorder))/2.0 );
double nLeftWidth = !_bLeft ? pLeftRightBorder->GetOutWidth() : pLeftRightBorder->GetInWidth( ); double nLeftWidth = !_bLeft ? pLeftRightBorder->GetOutWidth() : pLeftRightBorder->GetInWidth( );
double nRightWidth = !_bLeft ? pLeftRightBorder->GetInWidth() : pLeftRightBorder->GetOutWidth( ); double nRightWidth = !_bLeft ? pLeftRightBorder->GetInWidth() : pLeftRightBorder->GetOutWidth( );
@@ -4691,8 +4696,15 @@ void lcl_PaintTopBottomLine( const sal_Bool _bTop,
nExtentOE = lcl_GetExtent( NULL, pRightBorder ); nExtentOE = lcl_GetExtent( NULL, pRightBorder );
} }
basegfx::B2DPoint aStart( aRect.Left() + lcl_GetLineWidth( pLeftBorder ) / 2.0, aRect.Top() + aRect.Height() / 2.0 ); double const fStartY( (_bTop) // fdo#38635: always from outer edge
basegfx::B2DPoint aEnd( aRect.Right() - lcl_GetLineWidth( pRightBorder ) / 2.0, aRect.Top() + aRect.Height() / 2.0 ); ? aRect.Top() + (aRect.Height() / 2.0)
: aRect.Bottom() - (aRect.Height() / 2.0));
basegfx::B2DPoint const aStart(
aRect.Left() + lcl_AlignWidth(lcl_GetLineWidth(pLeftBorder))/2.0,
fStartY );
basegfx::B2DPoint const aEnd(
aRect.Right() - lcl_AlignWidth(lcl_GetLineWidth(pRightBorder))/2.0,
fStartY );
double nLeftWidth = !_bTop ? pTopBottomBorder->GetOutWidth() : pTopBottomBorder->GetInWidth( ); double nLeftWidth = !_bTop ? pTopBottomBorder->GetOutWidth() : pTopBottomBorder->GetInWidth( );
double nRightWidth = !_bTop ? pTopBottomBorder->GetInWidth() : pTopBottomBorder->GetOutWidth( ); double nRightWidth = !_bTop ? pTopBottomBorder->GetInWidth() : pTopBottomBorder->GetOutWidth( );