[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Miklos Vajna]

 sw/source/core/layout/paintfrm.cxx |   67 -------------------------------------
 1 file changed, 67 deletions(-)

New commits:
commit f20c1f3081c98cfb03940318e4ba7ec33f624aec
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Apr 16 16:12:39 2012 +0200

    fdo#38635: fix border printing:
    
    Apparently this special case in lcl_PaintLeftRightLine for printer
    output devices is no longer necessary with the new drawing layer borders
    and causes the vertical border lines to be far too short, leading to
    visible gaps in the PDF.
    (regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2)
    
    (cherry picked from commit 502c93143ef29989692ca3e63e3e6abc255fd53f)
    
    Signed-off-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 3a93e47..659606f 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4462,73 +4462,6 @@ void lcl_PaintLeftRightLine( const sal_Bool         _bLeft,
         if ( _rAttrs.JoinedWithNext( _rFrm ) ) pBottomBorder = NULL;
     }
 
-    // OD 06.05.2003 #107169# - adjustments for printer output device
-    if ( bPrtOutputDev )
-    {
-        // substract width of outer top line.
-        if ( rBox.GetTop() && (!bCnt || _rAttrs.GetTopLine( _rFrm )) )
-        {
-            long nDist = ::lcl_AlignHeight( rBox.GetTop()->GetOutWidth() );
-            (aRect.*_rRectFn->fnSubTop)( -nDist );
-            // OD 19.05.2003 #109667# - If outer top line is hair line, calculated
-            // top has to be adjusted.
-            if ( nDist == 1 )
-            {
-                if ( _rFrm.IsVertical() )
-                {
-                    // right of border rectangle has to be checked and adjusted
-                    Point aCompPt( aRect.Right(), 0 );
-                    Point aRefPt( aCompPt.X() + 1, aCompPt.Y() );
-                    lcl_CompPxPosAndAdjustPos( *(pGlobalShell->GetOut()),
-                                              aRefPt, aCompPt,
-                                              sal_True, -1 );
-                    aRect.Right( aCompPt.X() );
-                }
-                else
-                {
-                    // top of border rectangle has to be checked and adjusted
-                    Point aCompPt( 0, aRect.Top() );
-                    Point aRefPt( aCompPt.X(), aCompPt.Y() - 1 );
-                    lcl_CompPxPosAndAdjustPos( *(pGlobalShell->GetOut()),
-                                              aRefPt, aCompPt,
-                                              sal_False, +1 );
-                    aRect.Top( aCompPt.Y() );
-                }
-            }
-        }
-        // substract width of outer bottom line.
-        if ( rBox.GetBottom() && (!bCnt || _rAttrs.GetBottomLine( _rFrm )) )
-        {
-            long nDist = ::lcl_AlignHeight( rBox.GetBottom()->GetOutWidth());
-            (aRect.*_rRectFn->fnAddBottom)( -nDist );
-            // OD 19.05.2003 #109667# - If outer bottom line is hair line, calculated
-            // top has to be adjusted.
-            if ( nDist == 1 )
-            {
-                if ( _rFrm.IsVertical() )
-                {
-                    // left of border rectangle has to be checked and adjusted
-                    Point aCompPt( aRect.Left(), 0 );
-                    Point aRefPt( aCompPt.X() - 1, aCompPt.Y() );
-                    lcl_CompPxPosAndAdjustPos( *(pGlobalShell->GetOut()),
-                                              aRefPt, aCompPt,
-                                              sal_True, +1 );
-                    aRect.Left( aCompPt.X() );
-                }
-                else
-                {
-                    // bottom of border rectangle has to be checked and adjusted
-                    Point aCompPt( 0, aRect.Bottom() );
-                    Point aRefPt( aCompPt.X(), aCompPt.Y() + 1 );
-                    lcl_CompPxPosAndAdjustPos( *(pGlobalShell->GetOut()),
-                                              aRefPt, aCompPt,
-                                              sal_False, -1 );
-                    aRect.Bottom( aCompPt.Y() );
-                }
-            }
-        }
-    }
-
     if ( !pLeftRightBorder->GetInWidth() )
     {
         // OD 06.05.2003 #107169# - add 6th parameter