VCL: remove comment, rename ImplInitClipRegion to InitClipRegion

Change-Id: If8d18b59285f75d61d9972ca019390fce700be3c

18 files changed, 69 insertions, 71 deletions

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 0f9b7a93568d..2809f0c6a079 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -121,7 +121,7 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize,
             return;
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if ( mbOutputClipped )
         return;
@@ -357,7 +357,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
                 return;
 
         if ( mbInitClipRegion )
-            ImplInitClipRegion();
+            InitClipRegion();
 
         if ( mbOutputClipped )
             return;
diff --git a/vcl/source/outdev/clipping.cxx b/vcl/source/outdev/clipping.cxx
index cc976b06b22c..a1e3526fd4b6 100644
--- a/vcl/source/outdev/clipping.cxx
+++ b/vcl/source/outdev/clipping.cxx
@@ -31,30 +31,7 @@
 
 #include <numeric>
 
-void OutputDevice::ClipToPaintRegion(Rectangle& /*rDstRect*/)
-{
-}
-
-bool OutputDevice::ImplSelectClipRegion( const Region& rRegion, SalGraphics* pGraphics )
-{
-    DBG_TESTSOLARMUTEX();
-
-    if( !pGraphics )
-    {
-        if( !mpGraphics )
-            if( !AcquireGraphics() )
-                return false;
-        pGraphics = mpGraphics;
-    }
-
-    bool bClipRegion = pGraphics->SetClipRegion( rRegion, this );
-    OSL_ENSURE( bClipRegion, "OutputDevice::ImplSelectClipRegion() - can't create region" );
-    return bClipRegion;
-}
-
-// TODO: fdo#74424 - this needs to be moved out of OutputDevice and into the
-// Window, VirtualDevice and Printer classes
-void OutputDevice::ImplInitClipRegion()
+void OutputDevice::InitClipRegion()
 {
     DBG_TESTSOLARMUTEX();
 
@@ -108,6 +85,27 @@ void OutputDevice::ImplInitClipRegion()
     mbInitClipRegion = false;
 }
 
+void OutputDevice::ClipToPaintRegion(Rectangle& /*rDstRect*/)
+{
+}
+
+bool OutputDevice::ImplSelectClipRegion( const Region& rRegion, SalGraphics* pGraphics )
+{
+    DBG_TESTSOLARMUTEX();
+
+    if( !pGraphics )
+    {
+        if( !mpGraphics )
+            if( !AcquireGraphics() )
+                return false;
+        pGraphics = mpGraphics;
+    }
+
+    bool bClipRegion = pGraphics->SetClipRegion( rRegion, this );
+    OSL_ENSURE( bClipRegion, "OutputDevice::ImplSelectClipRegion() - can't create region" );
+    return bClipRegion;
+}
+
 void OutputDevice::ImplSetClipRegion( const Region* pRegion )
 {
     DBG_TESTSOLARMUTEX();
diff --git a/vcl/source/outdev/curvedshapes.cxx b/vcl/source/outdev/curvedshapes.cxx
index 9acd9990b6cf..fce74a035366 100644
--- a/vcl/source/outdev/curvedshapes.cxx
+++ b/vcl/source/outdev/curvedshapes.cxx
@@ -43,7 +43,7 @@ void OutputDevice::DrawEllipse( const Rectangle& rRect )
     }
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return;
 
@@ -90,7 +90,7 @@ void OutputDevice::DrawArc( const Rectangle& rRect,
     }
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return;
 
@@ -133,7 +133,7 @@ void OutputDevice::DrawPie( const Rectangle& rRect,
     }
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return;
 
@@ -183,7 +183,7 @@ void OutputDevice::DrawChord( const Rectangle& rRect,
     }
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return;
 
diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx
index 2357f5e08ea9..7a4a3c50a946 100644
--- a/vcl/source/outdev/gradient.cxx
+++ b/vcl/source/outdev/gradient.cxx
@@ -45,7 +45,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
         return;     // nothing to draw!
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if ( mbOutputClipped )
         return;
@@ -116,7 +116,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly,
                 IntersectClipRegion( aBoundRect );
 
                 if( mbInitClipRegion )
-                    ImplInitClipRegion();
+                    InitClipRegion();
 
                 if( !mbOutputClipped )
                 {
diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index 5d313b526299..eff7bd482e6f 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -86,7 +86,7 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch
         return;
 
     if( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if( mbOutputClipped )
         return;
diff --git a/vcl/source/outdev/line.cxx b/vcl/source/outdev/line.cxx
index 13f1d65cac1b..0d5784bfc1ce 100644
--- a/vcl/source/outdev/line.cxx
+++ b/vcl/source/outdev/line.cxx
@@ -54,7 +54,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt,
     }
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if ( mbOutputClipped )
         return;
@@ -101,7 +101,7 @@ void OutputDevice::DrawLine( const Point& rStartPt, const Point& rEndPt )
     }
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if ( mbOutputClipped )
         return;
diff --git a/vcl/source/outdev/mask.cxx b/vcl/source/outdev/mask.cxx
index 9ca59b8c848f..8ce7dfc62317 100644
--- a/vcl/source/outdev/mask.cxx
+++ b/vcl/source/outdev/mask.cxx
@@ -86,7 +86,7 @@ void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize,
             return;
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if ( mbOutputClipped )
         return;
diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx
index 0c4db5b50cd6..dc454c32920b 100644
--- a/vcl/source/outdev/nativecontrols.cxx
+++ b/vcl/source/outdev/nativecontrols.cxx
@@ -268,7 +268,7 @@ bool OutputDevice::DrawNativeControl( ControlType nType,
             return false;
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return true;
 
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 5eedc982f194..135ab33e48a7 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -574,7 +574,7 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
             return;
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if ( mbOutputClipped )
         return;
@@ -632,7 +632,7 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
             return;
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if ( mbOutputClipped )
         return;
@@ -695,7 +695,7 @@ void OutputDevice::CopyArea( const Point& rDestPt,
             return;
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if ( mbOutputClipped )
         return;
@@ -1353,7 +1353,7 @@ bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize,
                 return bDrawn;
 
             if( mbInitClipRegion )
-                ImplInitClipRegion();
+                InitClipRegion();
 
             aRect.Justify();
             bDrawn = mpGraphics->DrawEPS( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(),
diff --git a/vcl/source/outdev/pixel.cxx b/vcl/source/outdev/pixel.cxx
index f2521d69c810..edb828007934 100644
--- a/vcl/source/outdev/pixel.cxx
+++ b/vcl/source/outdev/pixel.cxx
@@ -41,7 +41,7 @@ Color OutputDevice::GetPixel( const Point& rPt ) const
     if ( mpGraphics || AcquireGraphics() )
     {
         if ( mbInitClipRegion )
-            const_cast<OutputDevice*>(this)->ImplInitClipRegion();
+            const_cast<OutputDevice*>(this)->InitClipRegion();
 
         if ( !mbOutputClipped )
         {
@@ -74,7 +74,7 @@ void OutputDevice::DrawPixel( const Point& rPt )
     }
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return;
 
@@ -107,7 +107,7 @@ void OutputDevice::DrawPixel( const Point& rPt, const Color& rColor )
     }
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return;
 
@@ -139,7 +139,7 @@ void OutputDevice::DrawPixel( const Polygon& rPts, const Color* pColors )
             if ( mpGraphics || AcquireGraphics() )
             {
                 if ( mbInitClipRegion )
-                    ImplInitClipRegion();
+                    InitClipRegion();
 
                 if ( mbOutputClipped )
                     return;
diff --git a/vcl/source/outdev/polygon.cxx b/vcl/source/outdev/polygon.cxx
index 40fc9191d7a7..894c4e3cd6d5 100644
--- a/vcl/source/outdev/polygon.cxx
+++ b/vcl/source/outdev/polygon.cxx
@@ -49,7 +49,7 @@ void OutputDevice::DrawPolyPolygon( const PolyPolygon& rPolyPoly )
             return;
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return;
 
@@ -156,7 +156,7 @@ void OutputDevice::DrawPolygon( const Polygon& rPoly )
             return;
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return;
 
@@ -256,7 +256,7 @@ void OutputDevice::ImplDrawPolyPolygonWithB2DPolyPolygon(const basegfx::B2DPolyP
             return;
 
     if( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if( mbOutputClipped )
         return;
 
@@ -488,7 +488,7 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon
         return;
 
     if( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if( mbOutputClipped )
         return;
diff --git a/vcl/source/outdev/polyline.cxx b/vcl/source/outdev/polyline.cxx
index 738de797a16a..07f2a10227db 100644
--- a/vcl/source/outdev/polyline.cxx
+++ b/vcl/source/outdev/polyline.cxx
@@ -44,7 +44,7 @@ void OutputDevice::DrawPolyLine( const Polygon& rPoly )
             return;
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return;
 
@@ -153,7 +153,7 @@ void OutputDevice::DrawPolyLine(
             return;
 
     if( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if( mbOutputClipped )
         return;
 
@@ -242,7 +242,7 @@ void OutputDevice::DrawPolyLineWithLineInfo(const Polygon& rPoly, const LineInfo
         return;
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if ( mbOutputClipped )
         return;
@@ -333,7 +333,7 @@ bool OutputDevice::TryDrawPolyLineDirect(
             return false;
 
     if( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if( mbOutputClipped )
         return true;
diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx
index d47119b52850..d9d39b9fa9dc 100644
--- a/vcl/source/outdev/rect.cxx
+++ b/vcl/source/outdev/rect.cxx
@@ -47,7 +47,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect )
     }
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return;
 
@@ -88,7 +88,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect,
     }
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return;
 
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 941e16e98cce..88a99f11bbe7 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -461,7 +461,7 @@ void OutputDevice::ImplDrawSpecialText( SalLayout& rSalLayout )
 void OutputDevice::ImplDrawText( SalLayout& rSalLayout )
 {
     if( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if( mbOutputClipped )
         return;
     if( mbInitTextColor )
@@ -977,7 +977,7 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr,
     if( !mpGraphics && !AcquireGraphics() )
         return;
     if( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if( mbOutputClipped )
         return;
 
@@ -1721,7 +1721,7 @@ void OutputDevice::AddTextRectActions( const Rectangle& rRect,
     if( !mpGraphics && !AcquireGraphics() )
         return;
     if( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     // temporarily swap in passed mtf for action generation, and
     // disable output generation.
@@ -1762,7 +1762,7 @@ void OutputDevice::DrawText( const Rectangle& rRect, const OUString& rOrigStr, s
     if( !mpGraphics && !AcquireGraphics() )
         return;
     if( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if( mbOutputClipped && !bDecomposeTextRectAction )
         return;
 
@@ -2069,7 +2069,7 @@ void OutputDevice::DrawCtrlText( const Point& rPos, const OUString& rStr,
     if( !mpGraphics && !AcquireGraphics() )
         return;
     if( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return;
 
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 5e076343b2c7..a2a3beda06e0 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -640,7 +640,7 @@ void OutputDevice::ImplDrawStrikeoutChar( long nBaseX, long nBaseY,
     Push( PUSH_CLIPREGION );
     IntersectClipRegion( PixelToLogic(aPixelRect) );
     if( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     pLayout->DrawText( *mpGraphics );
 
@@ -917,7 +917,7 @@ void OutputDevice::DrawTextLine( const Point& rPos, long nWidth,
     if( !mpGraphics && !AcquireGraphics() )
         return;
     if( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if( mbOutputClipped )
         return;
 
@@ -950,7 +950,7 @@ void OutputDevice::DrawWaveLine( const Point& rStartPos, const Point& rEndPos )
             return;
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if ( mbOutputClipped )
         return;
 
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index cf21e29a370b..65e1ae8fa2d7 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -179,7 +179,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly,
             return;
 
     if( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
     if( mbOutputClipped )
         return;
 
@@ -260,7 +260,7 @@ bool OutputDevice::DrawTransparentNatively ( const PolyPolygon& rPolyPoly,
     {
         // prepare the graphics device
         if( mbInitClipRegion )
-            ImplInitClipRegion();
+            InitClipRegion();
         if( mbOutputClipped )
             return false;
         if( mbInitLineColor )
@@ -346,7 +346,7 @@ void OutputDevice::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly,
             // setup Graphics only here (other cases delegate
             // to basic OutDev methods)
             if ( mbInitClipRegion )
-                ImplInitClipRegion();
+                InitClipRegion();
             if ( mbInitLineColor )
                 InitLineColor();
             if ( mbInitFillColor )
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 9fe3df56c1b7..e65fe3824608 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -406,7 +406,7 @@ bool Window::AcquireGraphics() const
     return mpGraphics ? true : false;
 }
 
-void Window::ImplInitClipRegion()
+void Window::InitClipRegion()
 {
     DBG_TESTSOLARMUTEX();
 
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 1567aed10144..3795f5cacfed 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -377,7 +377,7 @@ void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags )
     }
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if ( mbOutputClipped )
         return;
@@ -411,7 +411,7 @@ void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags )
     }
 
     if ( mbInitClipRegion )
-        ImplInitClipRegion();
+        InitClipRegion();
 
     if ( mbOutputClipped )
         return;
@@ -486,7 +486,7 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags )
         }
 
         if ( mbInitClipRegion )
-            ImplInitClipRegion();
+            InitClipRegion();
 
         if ( mbOutputClipped )
             return;
@@ -550,7 +550,7 @@ void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags )
         }
 
         if ( mbInitClipRegion )
-            ImplInitClipRegion();
+            InitClipRegion();
 
         if ( mbOutputClipped )
             return;