1 files changed, 80 insertions, 118 deletions

diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 075a8b1b95e2..faeb460c46e4 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -30,6 +30,7 @@
 
 #include <vcl/event.hxx>
 #include <vcl/imgctrl.hxx>
+#include <tools/rcid.h>
 
 #include <com/sun/star/awt/ImageScaleMode.hdl>
 
@@ -37,10 +38,18 @@ namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode;
 
 // -----------------------------------------------------------------------
 
-ImageControl::ImageControl( Window* pParent, WinBits nStyle ) :
-    FixedImage( pParent, nStyle )
+ImageControl::ImageControl( Window* pParent, WinBits nStyle )
+    :FixedImage( pParent, nStyle )
+    ,mnScaleMode( ImageScaleMode::Anisotropic )
+{
+}
+
+// -----------------------------------------------------------------------
+
+ImageControl::ImageControl( Window* pParent, const ResId& rResId )
+    :FixedImage( pParent, rResId )
+    ,mnScaleMode( ImageScaleMode::Anisotropic )
 {
-    mnScaleMode = ImageScaleMode::Anisotropic;
 }
 
 // -----------------------------------------------------------------------
@@ -86,154 +95,86 @@ namespace
 
 // -----------------------------------------------------------------------
 
-void ImageControl::UserDraw( const UserDrawEvent& rUDEvt )
+void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) const
 {
-    USHORT nStyle = 0;
-    BitmapEx* pBitmap = &maBmp;
-    if( !!maBmpHC )
+    sal_uInt16 nStyle = 0;
+    if ( !(nDrawFlags & WINDOW_DRAW_NODISABLE) )
     {
-        if( GetSettings().GetStyleSettings().GetHighContrastMode() )
-            pBitmap = &maBmpHC;
+        if ( !IsEnabled() )
+            nStyle |= IMAGE_DRAW_DISABLE;
     }
 
-    if ( !*pBitmap )
+    const Image& rImage( GetModeImage( BMP_COLOR_NORMAL ) );
+    const Image& rImageHC( GetModeImage( BMP_COLOR_HIGHCONTRAST ) );
+
+    const Image* pImage = &rImage;
+    if ( !!rImageHC && GetSettings().GetStyleSettings().GetHighContrastMode() )
+        pImage = &rImageHC;
+
+    const Rectangle aDrawRect( rPos, rSize );
+    if ( !*pImage )
     {
         String  sText( GetText() );
         if ( !sText.Len() )
             return;
 
         WinBits nWinStyle = GetStyle();
-        USHORT nTextStyle = FixedText::ImplGetTextStyle( nWinStyle );
-        if ( !IsEnabled() )
-            nTextStyle |= TEXT_DRAW_DISABLE;
+        sal_uInt16 nTextStyle = FixedText::ImplGetTextStyle( nWinStyle );
+        if ( !(nDrawFlags & WINDOW_DRAW_NODISABLE) )
+            if ( !IsEnabled() )
+                nTextStyle |= TEXT_DRAW_DISABLE;
 
-        DrawText( rUDEvt.GetRect(), sText, nTextStyle );
+        rDev.DrawText( aDrawRect, sText, nTextStyle );
         return;
     }
 
-    const Rectangle& rPaintRect = rUDEvt.GetRect();
-    const Size&      rBitmapSize = maBmp.GetSizePixel();
+    const Size&      rBitmapSize = pImage->GetSizePixel();
 
-    if( nStyle & IMAGE_DRAW_COLORTRANSFORM )
+    switch ( mnScaleMode )
     {
-        // only images support IMAGE_DRAW_COLORTRANSFORM
-        Image aImage( *pBitmap );
-        if ( !!aImage )
-        {
-            switch ( mnScaleMode )
-            {
-            case ImageScaleMode::None:
-            {
-                rUDEvt.GetDevice()->DrawImage(
-                    lcl_centerWithin( rPaintRect, rBitmapSize ), aImage, nStyle );
-            }
-            break;
-
-            case ImageScaleMode::Isotropic:
-            {
-                const Size aPaintSize = lcl_calcPaintSize( rPaintRect, rBitmapSize );
-                rUDEvt.GetDevice()->DrawImage(
-                    lcl_centerWithin( rPaintRect, aPaintSize ),
-                    aPaintSize,
-                    aImage, nStyle );
-            }
-            break;
-
-            case ImageScaleMode::Anisotropic:
-            {
-                rUDEvt.GetDevice()->DrawImage(
-                    rPaintRect.TopLeft(),
-                    rPaintRect.GetSize(),
-                    aImage, nStyle );
-            }
-            break;
-
-            default:
-                OSL_ENSURE( false, "ImageControl::UserDraw: unhandled scale mode!" );
-                break;
-
-            }   // switch ( mnScaleMode )
-        }
-    }
-    else
+    case ImageScaleMode::None:
     {
-        switch ( mnScaleMode )
-        {
-        case ImageScaleMode::None:
-        {
-            pBitmap->Draw( rUDEvt.GetDevice(), lcl_centerWithin( rPaintRect, rBitmapSize ) );
-        }
-        break;
-
-        case ImageScaleMode::Isotropic:
-        {
-            const Size aPaintSize = lcl_calcPaintSize( rPaintRect, rBitmapSize );
-            pBitmap->Draw( rUDEvt.GetDevice(),
-                           lcl_centerWithin( rPaintRect, aPaintSize ),
-                           aPaintSize );
-        }
-        break;
-
-        case ImageScaleMode::Anisotropic:
-        {
-            pBitmap->Draw( rUDEvt.GetDevice(),
-                           rPaintRect.TopLeft(),
-                           rPaintRect.GetSize() );
-        }
-        break;
-
-        default:
-            OSL_ENSURE( false, "ImageControl::UserDraw: unhandled scale mode!" );
-            break;
-
-        }   // switch ( mnScaleMode )
+        rDev.DrawImage( lcl_centerWithin( aDrawRect, rBitmapSize ), *pImage, nStyle );
     }
-}
+    break;
 
-// -----------------------------------------------------------------------
-
-void ImageControl::SetBitmap( const BitmapEx& rBmp )
-{
-    maBmp = rBmp;
-    StateChanged( STATE_CHANGE_DATA );
-}
-
-// -----------------------------------------------------------------------
+    case ImageScaleMode::Isotropic:
+    {
+        const Size aPaintSize = lcl_calcPaintSize( aDrawRect, rBitmapSize );
+        rDev.DrawImage(
+            lcl_centerWithin( aDrawRect, aPaintSize ),
+            aPaintSize,
+            *pImage, nStyle );
+    }
+    break;
 
-BOOL ImageControl::SetModeBitmap( const BitmapEx& rBitmap, BmpColorMode eMode )
-{
-    if( eMode == BMP_COLOR_NORMAL )
-        SetBitmap( rBitmap );
-    else if( eMode == BMP_COLOR_HIGHCONTRAST )
+    case ImageScaleMode::Anisotropic:
     {
-        maBmpHC = rBitmap;
-        StateChanged( STATE_CHANGE_DATA );
+        rDev.DrawImage(
+            aDrawRect.TopLeft(),
+            aDrawRect.GetSize(),
+            *pImage, nStyle );
     }
-    else
-        return FALSE;
-    return TRUE;
-}
+    break;
 
-// -----------------------------------------------------------------------
+    default:
+        OSL_ENSURE( false, "ImageControl::ImplDraw: unhandled scale mode!" );
+        break;
 
-const BitmapEx& ImageControl::GetModeBitmap( BmpColorMode eMode ) const
-{
-    if( eMode == BMP_COLOR_HIGHCONTRAST )
-        return maBmpHC;
-    else
-        return maBmp;
+    }   // switch ( mnScaleMode )
 }
 
 // -----------------------------------------------------------------------
 
-void    ImageControl::Paint( const Rectangle& rRect )
+void ImageControl::Paint( const Rectangle& /*rRect*/ )
 {
-    FixedImage::Paint( rRect );
+    ImplDraw( *this, 0, Point(), GetOutputSizePixel() );
+
     if( HasFocus() )
     {
         Window *pWin = GetWindow( WINDOW_BORDER );
 
-        BOOL bFlat = (GetBorderStyle() == 2);
+        sal_Bool bFlat = (GetBorderStyle() == 2);
         Rectangle aRect( Point(0,0), pWin->GetOutputSizePixel() );
         Color oldLineCol = pWin->GetLineColor();
         Color oldFillCol = pWin->GetFillColor();
@@ -252,6 +193,27 @@ void    ImageControl::Paint( const Rectangle& rRect )
 }
 
 // -----------------------------------------------------------------------
+void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
+{
+    const Point     aPos  = pDev->LogicToPixel( rPos );
+    const Size      aSize = pDev->LogicToPixel( rSize );
+          Rectangle aRect( aPos, aSize );
+
+    pDev->Push();
+    pDev->SetMapMode();
+
+    // Border
+    if ( !(nFlags & WINDOW_DRAW_NOBORDER) && (GetStyle() & WB_BORDER) )
+    {
+        ImplDrawFrame( pDev, aRect );
+    }
+    pDev->IntersectClipRegion( aRect );
+    ImplDraw( *pDev, nFlags, aRect.TopLeft(), aRect.GetSize() );
+
+    pDev->Pop();
+}
+
+// -----------------------------------------------------------------------
 
 void ImageControl::GetFocus()
 {