delegate RenderContext - fixed, group, imgctrl

Change-Id: I438eaaa7959465d264ab248234a99c9e37bc56d9

3 files changed, 14 insertions, 14 deletions

diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index e4858f163c3d..c8acbd1aaa1d 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -234,9 +234,9 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
     );
 }
 
-void FixedText::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void FixedText::Paint( vcl::RenderContext& rRenderContext, const Rectangle& )
 {
-    ImplDraw( this, 0, Point(), GetOutputSizePixel() );
+    ImplDraw(&rRenderContext, 0, Point(), GetOutputSizePixel());
 }
 
 void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
@@ -543,7 +543,7 @@ void FixedLine::ImplInitSettings( bool bFont,
     }
 }
 
-void FixedLine::ImplDraw( bool bLayout )
+void FixedLine::ImplDraw(vcl::RenderContext& /*rRenderContext*/, bool bLayout)
 {
     Size                    aOutSize = GetOutputSizePixel();
     OUString                aText = GetText();
@@ -638,12 +638,12 @@ FixedLine::FixedLine( vcl::Window* pParent, const ResId& rResId ) :
 void  FixedLine::FillLayoutData() const
 {
     mpControlData->mpLayoutData = new vcl::ControlLayoutData();
-    const_cast<FixedLine*>(this)->ImplDraw( true );
+    const_cast<FixedLine*>(this)->Invalidate();
 }
 
-void FixedLine::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void FixedLine::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
 {
-    ImplDraw();
+    ImplDraw(rRenderContext);
 }
 
 void FixedLine::Draw( OutputDevice*, const Point&, const Size&, sal_uLong )
@@ -773,9 +773,9 @@ void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */,
     }
 }
 
-void FixedBitmap::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void FixedBitmap::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
 {
-    ImplDraw( this, 0, Point(), GetOutputSizePixel() );
+    ImplDraw(&rRenderContext, 0, Point(), GetOutputSizePixel());
 }
 
 void FixedBitmap::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
@@ -943,9 +943,9 @@ void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
     }
 }
 
-void FixedImage::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void FixedImage::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
 {
-    ImplDraw( this, 0, Point(), GetOutputSizePixel() );
+    ImplDraw(&rRenderContext, 0, Point(), GetOutputSizePixel());
 }
 
 Size FixedImage::GetOptimalSize() const
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index 77cd1a6f994e..e6b0b9a83bdc 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -188,9 +188,9 @@ void GroupBox::FillLayoutData() const
     const_cast<GroupBox*>(this)->   ImplDraw( const_cast<GroupBox*>(this), 0, Point(), GetOutputSizePixel(), true );
 }
 
-void GroupBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void GroupBox::Paint( vcl::RenderContext& rRenderContext, const Rectangle& )
 {
-    ImplDraw( this, 0, Point(), GetOutputSizePixel() );
+    ImplDraw(&rRenderContext, 0, Point(), GetOutputSizePixel());
 }
 
 void GroupBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 288cb04b835e..baaaa20e9d84 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -131,9 +131,9 @@ void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Poi
     }   // switch ( mnScaleMode )
 }
 
-void ImageControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ )
+void ImageControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
 {
-    ImplDraw( *this, 0, Point(), GetOutputSizePixel() );
+    ImplDraw(rRenderContext, 0, Point(), GetOutputSizePixel());
 
     if( HasFocus() )
     {