Rearrange OutputDevice line functions

Reorganized OutputDevice line functions - several of these functions
should be private. I have renamed the following functions:

* ImplInitLineColor -> InitLineColor (made this private)
* ImplPaintLineGeometryWithEvtlExpand -> PaintLineGeometryWithEvtlExpand
(made this private)
* ImplTryDrawPolyLineDirect -> TryDrawPolyLineDirectNoAA (made this
private)

I also made a small code change to make bTryAA more clear, and also
change (bTryAA && TryDrawPolyLineDirect(rPoly.getB2DPolygon()) to a
nestied if statement.

Change-Id: I90e8083d69b715912bf0ad1d400bc355f3501981

11 files changed, 137 insertions, 127 deletions

diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 6fe9b385a025..6983a3cc74d9 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -858,7 +858,7 @@ void Printer::ApplyMask( const Bitmap& rMask, const Color& rMaskColor,
         Push( PUSH_FILLCOLOR | PUSH_LINECOLOR );
         SetLineColor( rMaskColor );
         SetFillColor( rMaskColor );
-        ImplInitLineColor();
+        InitLineColor();
         ImplInitFillColor();
 
         // create forward mapping tables
diff --git a/vcl/source/outdev/curvedshapes.cxx b/vcl/source/outdev/curvedshapes.cxx
index 7fe7e684db58..160d06b3bc12 100644
--- a/vcl/source/outdev/curvedshapes.cxx
+++ b/vcl/source/outdev/curvedshapes.cxx
@@ -56,7 +56,7 @@ void OutputDevice::DrawEllipse( const Rectangle& rRect )
         return;
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
 
     Polygon aRectPoly( aRect.Center(), aRect.GetWidth() >> 1, aRect.GetHeight() >> 1 );
     if ( aRectPoly.GetSize() >= 2 )
@@ -103,7 +103,7 @@ void OutputDevice::DrawArc( const Rectangle& rRect,
         return;
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
 
     const Point     aStart( ImplLogicToDevicePixel( rStartPt ) );
     const Point     aEnd( ImplLogicToDevicePixel( rEndPt ) );
@@ -146,7 +146,7 @@ void OutputDevice::DrawPie( const Rectangle& rRect,
         return;
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
 
     const Point     aStart( ImplLogicToDevicePixel( rStartPt ) );
     const Point     aEnd( ImplLogicToDevicePixel( rEndPt ) );
@@ -196,7 +196,7 @@ void OutputDevice::DrawChord( const Rectangle& rRect,
         return;
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
 
     const Point     aStart( ImplLogicToDevicePixel( rStartPt ) );
     const Point     aEnd( ImplLogicToDevicePixel( rEndPt ) );
diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index af1e7b359b50..f89a00406d5a 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -104,7 +104,7 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch
         EnableMapMode( false );
         Push( PUSH_LINECOLOR );
         SetLineColor( aHatch.GetColor() );
-        ImplInitLineColor();
+        InitLineColor();
         DrawHatch( aPolyPoly, aHatch, false );
         Pop();
         EnableMapMode( bOldMap );
diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx
index 14b630ce58c7..c6e9a865a635 100644
--- a/vcl/source/outdev/line.cxx
+++ b/vcl/source/outdev/line.cxx
@@ -24,6 +24,8 @@
 
 #include <salgdi.hxx>
 
+#include "outdata.hxx"
+
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
@@ -45,8 +47,11 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
     if ( !IsDeviceOutputNecessary() || !mbLineColor || ( LINE_NONE == rLineInfo.GetStyle() ) || ImplIsRecordLayout() )
         return;
 
-    if( !mpGraphics && !ImplGetGraphics() )
-        return;
+    if( !mpGraphics )
+    {
+        if ( !ImplGetGraphics() )
+            return;
+    }
 
     if ( mbInitClipRegion )
         ImplInitClipRegion();
@@ -61,7 +66,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
     const bool bLineWidthUsed(aInfo.GetWidth() > 1);
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
 
     if(bDashUsed || bLineWidthUsed)
     {
@@ -69,7 +74,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
         aLinePolygon.append(basegfx::B2DPoint(aStartPt.X(), aStartPt.Y()));
         aLinePolygon.append(basegfx::B2DPoint(aEndPt.X(), aEndPt.Y()));
 
-        ImplPaintLineGeometryWithEvtlExpand(aInfo, basegfx::B2DPolyPolygon(aLinePolygon));
+        PaintLineGeometryWithEvtlExpand(aInfo, basegfx::B2DPolyPolygon(aLinePolygon));
     }
     else
     {
@@ -97,11 +102,12 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt )
 
     if ( mbInitClipRegion )
         ImplInitClipRegion();
+
     if ( mbOutputClipped )
         return;
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
 
     // #i101598# support AA and snap for lines, too
     if((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
@@ -139,9 +145,78 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt )
         mpAlphaVDev->DrawLine( rStartPt, rEndPt );
 }
 
-void OutputDevice::ImplPaintLineGeometryWithEvtlExpand(
-    const LineInfo& rInfo,
-    basegfx::B2DPolyPolygon aLinePolyPolygon)
+void OutputDevice::SetLineColor()
+{
+
+    if ( mpMetaFile )
+        mpMetaFile->AddAction( new MetaLineColorAction( Color(), false ) );
+
+    if ( mbLineColor )
+    {
+        mbInitLineColor = true;
+        mbLineColor = false;
+        maLineColor = Color( COL_TRANSPARENT );
+    }
+
+    if( mpAlphaVDev )
+        mpAlphaVDev->SetLineColor();
+}
+
+void OutputDevice::SetLineColor( const Color& rColor )
+{
+
+    Color aColor = ImplDrawModeToColor( rColor );
+
+    if( mpMetaFile )
+        mpMetaFile->AddAction( new MetaLineColorAction( aColor, true ) );
+
+    if( ImplIsColorTransparent( aColor ) )
+    {
+        if ( mbLineColor )
+        {
+            mbInitLineColor = true;
+            mbLineColor = false;
+            maLineColor = Color( COL_TRANSPARENT );
+        }
+    }
+    else
+    {
+        if( maLineColor != aColor )
+        {
+            mbInitLineColor = true;
+            mbLineColor = true;
+            maLineColor = aColor;
+        }
+    }
+
+    if( mpAlphaVDev )
+        mpAlphaVDev->SetLineColor( COL_BLACK );
+}
+
+void OutputDevice::InitLineColor()
+{
+    DBG_TESTSOLARMUTEX();
+
+    if( mbLineColor )
+    {
+        if( ROP_0 == meRasterOp )
+            mpGraphics->SetROPLineColor( SAL_ROP_0 );
+        else if( ROP_1 == meRasterOp )
+            mpGraphics->SetROPLineColor( SAL_ROP_1 );
+        else if( ROP_INVERT == meRasterOp )
+            mpGraphics->SetROPLineColor( SAL_ROP_INVERT );
+        else
+            mpGraphics->SetLineColor( ImplColorToSal( maLineColor ) );
+    }
+    else
+        mpGraphics->SetLineColor();
+
+    mbInitLineColor = false;
+}
+
+void OutputDevice::PaintLineGeometryWithEvtlExpand(
+            const LineInfo& rInfo,
+            basegfx::B2DPolyPolygon aLinePolyPolygon)
 {
     const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
@@ -245,7 +320,7 @@ void OutputDevice::ImplPaintLineGeometryWithEvtlExpand(
         const Color     aOldFillColor( maFillColor );
 
         SetLineColor();
-        ImplInitLineColor();
+        InitLineColor();
         SetFillColor( aOldLineColor );
         ImplInitFillColor();
 
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 997ccc476bf8..032ed0376dfd 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -781,27 +781,6 @@ void OutputDevice::ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const
 }
 
 
-void OutputDevice::ImplInitLineColor()
-{
-    DBG_TESTSOLARMUTEX();
-
-    if( mbLineColor )
-    {
-        if( ROP_0 == meRasterOp )
-            mpGraphics->SetROPLineColor( SAL_ROP_0 );
-        else if( ROP_1 == meRasterOp )
-            mpGraphics->SetROPLineColor( SAL_ROP_1 );
-        else if( ROP_INVERT == meRasterOp )
-            mpGraphics->SetROPLineColor( SAL_ROP_INVERT );
-        else
-            mpGraphics->SetLineColor( ImplColorToSal( maLineColor ) );
-    }
-    else
-        mpGraphics->SetLineColor();
-
-    mbInitLineColor = false;
-}
-
 void OutputDevice::ImplInitFillColor()
 {
     DBG_TESTSOLARMUTEX();
@@ -1068,23 +1047,6 @@ void OutputDevice::SetRasterOp( RasterOp eRasterOp )
         mpAlphaVDev->SetRasterOp( eRasterOp );
 }
 
-void OutputDevice::SetLineColor()
-{
-
-    if ( mpMetaFile )
-        mpMetaFile->AddAction( new MetaLineColorAction( Color(), false ) );
-
-    if ( mbLineColor )
-    {
-        mbInitLineColor = true;
-        mbLineColor = false;
-        maLineColor = Color( COL_TRANSPARENT );
-    }
-
-    if( mpAlphaVDev )
-        mpAlphaVDev->SetLineColor();
-}
-
 Color OutputDevice::ImplDrawModeToColor( const Color& rColor ) const
 {
     Color aColor( rColor );
@@ -1125,37 +1087,6 @@ Color OutputDevice::ImplDrawModeToColor( const Color& rColor ) const
     return aColor;
 }
 
-void OutputDevice::SetLineColor( const Color& rColor )
-{
-
-    Color aColor = ImplDrawModeToColor( rColor );
-
-    if( mpMetaFile )
-        mpMetaFile->AddAction( new MetaLineColorAction( aColor, true ) );
-
-    if( ImplIsColorTransparent( aColor ) )
-    {
-        if ( mbLineColor )
-        {
-            mbInitLineColor = true;
-            mbLineColor = false;
-            maLineColor = Color( COL_TRANSPARENT );
-        }
-    }
-    else
-    {
-        if( maLineColor != aColor )
-        {
-            mbInitLineColor = true;
-            mbLineColor = true;
-            maLineColor = aColor;
-        }
-    }
-
-    if( mpAlphaVDev )
-        mpAlphaVDev->SetLineColor( COL_BLACK );
-}
-
 void OutputDevice::SetFillColor()
 {
 
diff --git a/vcl/source/outdev/outdevnative.cxx b/vcl/source/outdev/outdevnative.cxx
index e521ae7524a8..8b0ef8a27de9 100644
--- a/vcl/source/outdev/outdevnative.cxx
+++ b/vcl/source/outdev/outdevnative.cxx
@@ -272,7 +272,7 @@ bool OutputDevice::DrawNativeControl( ControlType nType,
         return true;
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
     if ( mbInitFillColor )
         ImplInitFillColor();
 
diff --git a/vcl/source/outdev/pixel.cxx b/vcl/source/outdev/pixel.cxx
index 02c8741e8ab2..5da1ca38d1b3 100644
--- a/vcl/source/outdev/pixel.cxx
+++ b/vcl/source/outdev/pixel.cxx
@@ -92,7 +92,7 @@ void OutputDevice::DrawPixel( const Point& rPt )
         return;
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
 
     mpGraphics->DrawPixel( aPt.X(), aPt.Y(), this );
 
diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx
index 74026755b166..359818610bea 100644
--- a/vcl/source/outdev/polygon.cxx
+++ b/vcl/source/outdev/polygon.cxx
@@ -56,7 +56,7 @@ void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly )
         return;
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
     if ( mbInitFillColor )
         ImplInitFillColor();
 
@@ -163,7 +163,7 @@ void OutputDevice::DrawPolygon( const Polygon& rPoly )
         return;
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
     if ( mbInitFillColor )
         ImplInitFillColor();
 
@@ -263,7 +263,7 @@ void OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP
         return;
 
     if( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
     if( mbInitFillColor )
         ImplInitFillColor();
 
@@ -528,7 +528,7 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon
     }
 
     if( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
 
     if( mbInitFillColor )
         ImplInitFillColor();
diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx
index 97dab0fe8062..3d06e27d0472 100644
--- a/vcl/source/outdev/polyline.cxx
+++ b/vcl/source/outdev/polyline.cxx
@@ -50,31 +50,34 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly )
         return;
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
 
-    const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
-        && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
-        && ROP_OVERPAINT == GetRasterOp()
-        && IsLineColor());
+    const bool bTryAA( (mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
+                    && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
+                    && ROP_OVERPAINT == GetRasterOp()
+                    && IsLineColor());
 
     // use b2dpolygon drawing if possible
-    if(bTryAA && ImplTryDrawPolyLineDirect(rPoly.getB2DPolygon()))
+    if(bTryAA)
     {
-        basegfx::B2DPolygon aB2DPolyLine(rPoly.getB2DPolygon());
-        const ::basegfx::B2DHomMatrix aTransform = ImplGetDeviceTransformation();
-        const ::basegfx::B2DVector aB2DLineWidth( 1.0, 1.0 );
+        if ( TryDrawPolyLineDirectNoAA( rPoly.getB2DPolygon() ) )
+        {
+            basegfx::B2DPolygon aB2DPolyLine(rPoly.getB2DPolygon());
+            const ::basegfx::B2DHomMatrix aTransform = ImplGetDeviceTransformation();
+            const ::basegfx::B2DVector aB2DLineWidth( 1.0, 1.0 );
 
-        // transform the polygon
-        aB2DPolyLine.transform( aTransform );
+            // transform the polygon
+            aB2DPolyLine.transform( aTransform );
 
-        if(mnAntialiasing & ANTIALIASING_PIXELSNAPHAIRLINE)
-        {
-            aB2DPolyLine = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aB2DPolyLine);
-        }
+            if(mnAntialiasing & ANTIALIASING_PIXELSNAPHAIRLINE)
+            {
+                aB2DPolyLine = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aB2DPolyLine);
+            }
 
-        if(mpGraphics->DrawPolyLine( aB2DPolyLine, 0.0, aB2DLineWidth, basegfx::B2DLINEJOIN_NONE, css::drawing::LineCap_BUTT, this))
-        {
-            return;
+            if(mpGraphics->DrawPolyLine( aB2DPolyLine, 0.0, aB2DLineWidth, basegfx::B2DLINEJOIN_NONE, css::drawing::LineCap_BUTT, this))
+            {
+                return;
+            }
         }
     }
 
@@ -122,7 +125,7 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly, const LineInfo& rLineInfo
     if ( mpMetaFile )
         mpMetaFile->AddAction( new MetaPolyLineAction( rPoly, rLineInfo ) );
 
-    ImplDrawPolyLineWithLineInfo(rPoly, rLineInfo);
+    DrawPolyLineWithLineInfo(rPoly, rLineInfo);
 }
 
 void OutputDevice::DrawPolyLine(
@@ -156,7 +159,7 @@ void OutputDevice::DrawPolyLine(
         return;
 
     if( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
 
     const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
@@ -164,9 +167,10 @@ void OutputDevice::DrawPolyLine(
         && IsLineColor());
 
     // use b2dpolygon drawing if possible
-    if(bTryAA && ImplTryDrawPolyLineDirect(rB2DPolygon, fLineWidth, 0.0, eLineJoin, eLineCap))
+    if(bTryAA)
     {
-        return;
+        if ( TryDrawPolyLineDirectNoAA(rB2DPolygon, fLineWidth, 0.0, eLineJoin, eLineCap) )
+            return;
     }
 
     // #i101491#
@@ -188,7 +192,7 @@ void OutputDevice::DrawPolyLine(
         const Color aOldFillColor(maFillColor);
 
         SetLineColor();
-        ImplInitLineColor();
+        InitLineColor();
         SetFillColor(aOldLineColor);
         ImplInitFillColor();
 
@@ -200,7 +204,7 @@ void OutputDevice::DrawPolyLine(
         }
 
         SetLineColor(aOldLineColor);
-        ImplInitLineColor();
+        InitLineColor();
         SetFillColor(aOldFillColor);
         ImplInitFillColor();
 
@@ -210,7 +214,7 @@ void OutputDevice::DrawPolyLine(
             // to avoid optical gaps
             for(sal_uInt32 a(0); a < aAreaPolyPolygon.count(); a++)
             {
-                ImplTryDrawPolyLineDirect(aAreaPolyPolygon.getB2DPolygon(a));
+                TryDrawPolyLineDirectNoAA(aAreaPolyPolygon.getB2DPolygon(a));
             }
         }
     }
@@ -221,11 +225,11 @@ void OutputDevice::DrawPolyLine(
         LineInfo aLineInfo;
         if( fLineWidth != 0.0 )
             aLineInfo.SetWidth( static_cast<long>(fLineWidth+0.5) );
-        ImplDrawPolyLineWithLineInfo( aToolsPolygon, aLineInfo );
+        DrawPolyLineWithLineInfo( aToolsPolygon, aLineInfo );
     }
 }
 
-void OutputDevice::ImplDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineInfo& rLineInfo)
+void OutputDevice::DrawPolyLineWithLineInfo(const Polygon& rPoly, const LineInfo& rLineInfo)
 {
     sal_uInt16 nPoints(rPoly.GetSize());
 
@@ -245,7 +249,7 @@ void OutputDevice::ImplDrawPolyLineWithLineInfo(const Polygon& rPoly, const Line
         return;
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
 
     const LineInfo aInfo( ImplLogicToDevicePixel( rLineInfo ) );
     const bool bDashUsed(LINE_DASH == aInfo.GetStyle());
@@ -253,7 +257,7 @@ void OutputDevice::ImplDrawPolyLineWithLineInfo(const Polygon& rPoly, const Line
 
     if(bDashUsed || bLineWidthUsed)
     {
-        ImplPaintLineGeometryWithEvtlExpand(aInfo, basegfx::B2DPolyPolygon(aPoly.getB2DPolygon()));
+        PaintLineGeometryWithEvtlExpand(aInfo, basegfx::B2DPolyPolygon(aPoly.getB2DPolygon()));
     }
     else
     {
@@ -273,7 +277,7 @@ void OutputDevice::ImplDrawPolyLineWithLineInfo(const Polygon& rPoly, const Line
         mpAlphaVDev->DrawPolyLine( rPoly, rLineInfo );
 }
 
-bool OutputDevice::ImplTryDrawPolyLineDirect(
+bool OutputDevice::TryDrawPolyLineDirectNoAA(
             const basegfx::B2DPolygon& rB2DPolygon,
             double fLineWidth,
             double fTransparency,
@@ -336,7 +340,7 @@ bool OutputDevice::TryDrawPolyLineDirect(
         return true;
 
     if( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
 
     const bool bTryAA((mnAntialiasing & ANTIALIASING_ENABLE_B2DDRAW)
         && mpGraphics->supportsOperation(OutDevSupport_B2DDraw)
@@ -345,7 +349,7 @@ bool OutputDevice::TryDrawPolyLineDirect(
 
     if(bTryAA)
     {
-        if(ImplTryDrawPolyLineDirect(rB2DPolygon, fLineWidth, fTransparency, eLineJoin, eLineCap))
+        if(TryDrawPolyLineDirectNoAA(rB2DPolygon, fLineWidth, fTransparency, eLineJoin, eLineCap))
         {
             // worked, add metafile action (if recorded) and return true
             if( mpMetaFile )
diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx
index c8663d868d71..6e26585221a4 100644
--- a/vcl/source/outdev/rect.cxx
+++ b/vcl/source/outdev/rect.cxx
@@ -51,7 +51,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect )
         return;
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
     if ( mbInitFillColor )
         ImplInitFillColor();
 
@@ -92,7 +92,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect,
         return;
 
     if ( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
     if ( mbInitFillColor )
         ImplInitFillColor();
 
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index 964d255842cc..acf9464091ff 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -196,7 +196,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly,
         return;
 
     if( mbInitLineColor )
-        ImplInitLineColor();
+        InitLineColor();
     if( mbInitFillColor )
         ImplInitFillColor();
 
@@ -276,7 +276,7 @@ bool OutputDevice::DrawTransparentNatively ( const PolyPolygon& rPolyPoly,
         if( mbOutputClipped )
             return false;
         if( mbInitLineColor )
-            ImplInitLineColor();
+            InitLineColor();
         if( mbInitFillColor )
             ImplInitFillColor();
 
@@ -360,7 +360,7 @@ void OutputDevice::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly,
             if ( mbInitClipRegion )
                 ImplInitClipRegion();
             if ( mbInitLineColor )
-                ImplInitLineColor();
+                InitLineColor();
             if ( mbInitFillColor )
                 ImplInitFillColor();