2 files changed, 26 insertions, 21 deletions
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index ecf8cd4a5a5c..92fe33d96356 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -938,27 +938,6 @@ void OutputDevice::ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const
 }
 
 
-void OutputDevice::InitFillColor()
-{
-    DBG_TESTSOLARMUTEX();
-
-    if( mbFillColor )
-    {
-        if( ROP_0 == meRasterOp )
-            mpGraphics->SetROPFillColor( SAL_ROP_0 );
-        else if( ROP_1 == meRasterOp )
-            mpGraphics->SetROPFillColor( SAL_ROP_1 );
-        else if( ROP_INVERT == meRasterOp )
-            mpGraphics->SetROPFillColor( SAL_ROP_INVERT );
-        else
-            mpGraphics->SetFillColor( ImplColorToSal( maFillColor ) );
-    }
-    else
-        mpGraphics->SetFillColor();
-
-    mbInitFillColor = false;
-}
-
 void OutputDevice::SetDrawMode( sal_uLong nDrawMode )
 {
 
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index 43636991b028..64cb97bd4c2e 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -21,6 +21,7 @@
 
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
+
 #include <vcl/settings.hxx>
 
 #include <vcl/mapmod.hxx>
@@ -33,6 +34,9 @@
 #include <tools/fontenum.hxx>
 
 #include <vcl/outdevstate.hxx>
+
+#include "outdata.hxx"
+#include "salgdi.hxx"
 #include "sallayout.hxx"
 
 OutDevState::~OutDevState()
@@ -59,6 +63,28 @@ OutDevState::~OutDevState()
         delete mpRefPoint;
 }
 
+void OutputDevice::InitFillColor()
+{
+    DBG_TESTSOLARMUTEX();
+
+    if( mbFillColor )
+    {
+        if( ROP_0 == meRasterOp )
+            mpGraphics->SetROPFillColor( SAL_ROP_0 );
+        else if( ROP_1 == meRasterOp )
+            mpGraphics->SetROPFillColor( SAL_ROP_1 );
+        else if( ROP_INVERT == meRasterOp )
+            mpGraphics->SetROPFillColor( SAL_ROP_INVERT );
+        else
+            mpGraphics->SetFillColor( ImplColorToSal( maFillColor ) );
+    }
+    else
+        mpGraphics->SetFillColor();
+
+    mbInitFillColor = false;
+}
+
+
 void OutputDevice::SetFont( const Font& rNewFont )
 {