Remove unnecessary OUTDEV_INIT() macro in VCL's outdev.hxx

Change-Id: I0eba1f88f607ba1faf40d8507bb184bdc88085be

include/vcl/outdev.hxx

@@ -50,22 +50,6 @@
 #define GLYPH_FONT_HEIGHT   256
 #endif
 
-#define OUTDEV_INIT()                       \
-{                                           \
-    if ( !IsDeviceOutputNecessary() )       \
-        return;                             \
-                                            \
-    if ( !mpGraphics )                      \
-        if ( !AcquireGraphics() )           \
-            return;                         \
-                                            \
-    if ( mbInitClipRegion )                 \
-        ImplInitClipRegion();               \
-                                            \
-    if ( mbOutputClipped )                  \
-        return;                             \
-}
-
 struct ImplOutDevData;
 class ImplFontEntry;
 struct ImplObjStack;

vcl/source/outdev/bitmap.cxx

@@ -121,7 +121,18 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize,
         }
     }
 
-    OUTDEV_INIT();
+    if ( !IsDeviceOutputNecessary() )
+        return;
+
+    if ( !mpGraphics )
+        if ( !AcquireGraphics() )
+            return;
+
+    if ( mbInitClipRegion )
+        ImplInitClipRegion();
+
+    if ( mbOutputClipped )
+        return;
 
     if( !aBmp.IsEmpty() )
     {
@@ -346,7 +357,18 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
             }
         }
 
-        OUTDEV_INIT();
+        if ( !IsDeviceOutputNecessary() )
+            return;
+
+        if ( !mpGraphics )
+            if ( !AcquireGraphics() )
+                return;
+
+        if ( mbInitClipRegion )
+            ImplInitClipRegion();
+
+        if ( mbOutputClipped )
+            return;
 
         DrawDeviceBitmap( rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel, aBmpEx );
     }

vcl/source/outdev/mask.cxx

@@ -94,7 +94,18 @@ void OutputDevice::DrawMask( const Point& rDestPt, const Size& rDestSize,
         }
     }
 
-    OUTDEV_INIT();
+    if ( !IsDeviceOutputNecessary() )
+        return;
+
+    if ( !mpGraphics )
+        if ( !AcquireGraphics() )
+            return;
+
+    if ( mbInitClipRegion )
+        ImplInitClipRegion();
+
+    if ( mbOutputClipped )
+        return;
 
     ApplyMask( rBitmap, rMaskColor, rDestPt, rDestSize, rSrcPtPixel, rSrcSizePixel );
 

vcl/source/outdev/outdev.cxx

@@ -566,7 +566,18 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
         mpMetaFile->AddAction( new MetaBmpScaleAction( rDestPt, rDestSize, aBmp ) );
     }
 
-    OUTDEV_INIT();
+    if ( !IsDeviceOutputNecessary() )
+        return;
+
+    if ( !mpGraphics )
+        if ( !AcquireGraphics() )
+            return;
+
+    if ( mbInitClipRegion )
+        ImplInitClipRegion();
+
+    if ( mbOutputClipped )
+        return;
 
     SalTwoRect aPosAry;
     aPosAry.mnSrcWidth   = ImplLogicWidthToDevicePixel( rSrcSize.Width() );
@@ -613,7 +624,18 @@ void OutputDevice::DrawOutDev( const Point& rDestPt, const Size& rDestSize,
         mpMetaFile->AddAction( new MetaBmpScaleAction( rDestPt, rDestSize, aBmp ) );
     }
 
-    OUTDEV_INIT();
+    if ( !IsDeviceOutputNecessary() )
+        return;
+
+    if ( !mpGraphics )
+        if ( !AcquireGraphics() )
+            return;
+
+    if ( mbInitClipRegion )
+        ImplInitClipRegion();
+
+    if ( mbOutputClipped )
+        return;
 
     SalTwoRect aPosAry;
     aPosAry.mnSrcX       = rOutDev.ImplLogicXToDevicePixel( rSrcPt.X() );
@@ -665,7 +687,18 @@ void OutputDevice::CopyArea( const Point& rDestPt,
     RasterOp eOldRop = GetRasterOp();
     SetRasterOp( ROP_OVERPAINT );
 
-    OUTDEV_INIT();
+    if ( !IsDeviceOutputNecessary() )
+        return;
+
+    if ( !mpGraphics )
+        if ( !AcquireGraphics() )
+            return;
+
+    if ( mbInitClipRegion )
+        ImplInitClipRegion();
+
+    if ( mbOutputClipped )
+        return;
 
     SalTwoRect aPosAry;
     aPosAry.mnSrcWidth   = ImplLogicWidthToDevicePixel( rSrcSize.Width() );