From 690b655f06af5717ecb79f0cb804342a78a6ba43 Mon Sep 17 00:00:00 2001
From: Chris Sherlock <chris.sherlock79@gmail.com>
Date: Mon, 28 Apr 2014 20:25:25 +1000
Subject: VCL move SetRasterOp & SetDrawMode from outdev.cxx to outdevstate.cxx

Change-Id: I8c597e5b9049cd23223ecf4376a4449ca1effb38
---
 vcl/source/outdev/outdev.cxx      | 28 ----------------------------
 vcl/source/outdev/outdevstate.cxx | 29 ++++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 29 deletions(-)

(limited to 'vcl')

diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index bd2ad9a1f23a..7eb435ec9b82 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -753,34 +753,6 @@ void OutputDevice::ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const
 }
 
 
-void OutputDevice::SetDrawMode( sal_uLong nDrawMode )
-{
-
-    mnDrawMode = nDrawMode;
-
-    if( mpAlphaVDev )
-        mpAlphaVDev->SetDrawMode( nDrawMode );
-}
-
-void OutputDevice::SetRasterOp( RasterOp eRasterOp )
-{
-
-    if ( mpMetaFile )
-        mpMetaFile->AddAction( new MetaRasterOpAction( eRasterOp ) );
-
-    if ( meRasterOp != eRasterOp )
-    {
-        meRasterOp = eRasterOp;
-        mbInitLineColor = mbInitFillColor = true;
-
-        if( mpGraphics || AcquireGraphics() )
-            mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
-    }
-
-    if( mpAlphaVDev )
-        mpAlphaVDev->SetRasterOp( eRasterOp );
-}
-
 Color OutputDevice::ImplDrawModeToColor( const Color& rColor ) const
 {
     Color aColor( rColor );
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index 7a1ae462bd1f..7ce35cf10b6f 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -262,7 +262,6 @@ void OutputDevice::EnableOutput( bool bEnable )
         mpAlphaVDev->EnableOutput( bEnable );
 }
 
-
 void OutputDevice::SetAntialiasing( sal_uInt16 nMode )
 {
     if ( mnAntialiasing != nMode )
@@ -280,6 +279,34 @@ void OutputDevice::SetAntialiasing( sal_uInt16 nMode )
         mpAlphaVDev->SetAntialiasing( nMode );
 }
 
+void OutputDevice::SetDrawMode( sal_uLong nDrawMode )
+{
+
+    mnDrawMode = nDrawMode;
+
+    if( mpAlphaVDev )
+        mpAlphaVDev->SetDrawMode( nDrawMode );
+}
+
+void OutputDevice::SetRasterOp( RasterOp eRasterOp )
+{
+
+    if ( mpMetaFile )
+        mpMetaFile->AddAction( new MetaRasterOpAction( eRasterOp ) );
+
+    if ( meRasterOp != eRasterOp )
+    {
+        meRasterOp = eRasterOp;
+        mbInitLineColor = mbInitFillColor = true;
+
+        if( mpGraphics || AcquireGraphics() )
+            mpGraphics->SetXORMode( (ROP_INVERT == meRasterOp) || (ROP_XOR == meRasterOp), ROP_INVERT == meRasterOp );
+    }
+
+    if( mpAlphaVDev )
+        mpAlphaVDev->SetRasterOp( eRasterOp );
+}
+
 
 void OutputDevice::SetFillColor()
 {
-- 
cgit