[Libreoffice-commits] core.git: drawinglayer/source

[Kohei Yoshida]

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 305461aafe2527fcf9bf796f59648c81b38d7850
Author: Kohei Yoshida <kohei.yosh...@collabora.com>
Date:   Fri Nov 21 07:19:05 2014 -0500

    Revert "fdo#81643: Regression in rendering of borders"
    
    This reverts commit c35fae3f6b15221701cadfca3132803695607660.
    
    One man's feature (with minor issure) is another man's regressions...

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index f52f562..ba78741 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -278,7 +278,7 @@ namespace drawinglayer
 
             return bTryWorked;
         }
-/*
+
         bool VclPixelProcessor2D::tryDrawBorderLinePrimitive2DDirect(
             const drawinglayer::primitive2d::BorderLinePrimitive2D& rSource)
         {
@@ -613,7 +613,7 @@ namespace drawinglayer
             }
             return false;
         }
-*/
+
         void VclPixelProcessor2D::processBasePrimitive2D(const 
primitive2d::BasePrimitive2D& rCandidate)
         {
             switch(rCandidate.getPrimitive2DID())
@@ -1229,10 +1229,10 @@ namespace drawinglayer
                     sal_uInt16 nAntiAliasing = 
mpOutputDevice->GetAntialiasing();
                     mpOutputDevice->SetAntialiasing(nAntiAliasing & 
~ANTIALIASING_ENABLE_B2DDRAW);
 
-                    //const drawinglayer::primitive2d::BorderLinePrimitive2D& 
rBorder =
-                        //static_cast<const 
drawinglayer::primitive2d::BorderLinePrimitive2D&>(rCandidate);
+                    const drawinglayer::primitive2d::BorderLinePrimitive2D& 
rBorder =
+                        static_cast<const 
drawinglayer::primitive2d::BorderLinePrimitive2D&>(rCandidate);
 
-                    //if (!tryDrawBorderLinePrimitive2DDirect(rBorder))
+                    if (!tryDrawBorderLinePrimitive2DDirect(rBorder))
                         
process(rCandidate.get2DDecomposition(getViewInformation2D()));
 
                     mpOutputDevice->SetAntialiasing(nAntiAliasing);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits