refactor BrowseBox, IconChoice to use RenderContext

Change-Id: I7bc3982895fa118616330ee9df88abae96abbe14

7 files changed, 211 insertions, 362 deletions

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 03c35f09a8be..6c3465544e4c 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -362,9 +362,8 @@ protected:
     */
     virtual bool    SeekRow( long nRow ) = 0;
     void            DrawCursor();
-    void            PaintData( vcl::Window& rWin, const Rectangle& rRect );
-    virtual void    PaintField( OutputDevice& rDev, const Rectangle& rRect,
-                                sal_uInt16 nColumnId ) const = 0;
+    void            PaintData(vcl::Window& rWin, vcl::RenderContext& rRenderContext, const Rectangle& rRect);
+    virtual void    PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const = 0;
     // Advice for the subclass: the visible scope of rows has changed.
     // The subclass is able to announce changes of the model with the
     // help of the methods RowInserted and RowRemoved. Because of the
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index f4e6fc960b05..e115d7bc475c 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -1088,25 +1088,21 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool
     _rOut.SetLineColor( aOldLineColor );
 }
 
-
-
-void BrowseBox::PaintData( vcl::Window& rWin, const Rectangle& rRect )
+void BrowseBox::PaintData( vcl::Window& rWin, vcl::RenderContext& rRenderContext, const Rectangle& rRect )
 {
-    if ( !bBootstrapped && IsReallyVisible() )
-        BrowseBox::StateChanged( StateChangedType::InitShow );
+    if (!bBootstrapped && IsReallyVisible())
+        BrowseBox::StateChanged(StateChangedType::InitShow);
 
     // initializations
-    if ( !pCols || pCols->empty() || !rWin.IsUpdateMode() )
+    if (!pCols || pCols->empty() || !rWin.IsUpdateMode())
         return;
-    if ( getDataWindow()->bResizeOnPaint )
+    if (getDataWindow()->bResizeOnPaint)
         Resize();
     // MI: who was that? Window::Update();
 
-    ImplPaintData(rWin, rRect, false, true);
+    ImplPaintData(rRenderContext, rRect, false, true);
 }
 
-
-
 void BrowseBox::UpdateScrollbars()
 {
 
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 0fa73d6f184f..e3396d14b7ed 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -318,22 +318,24 @@ void BrowserDataWin::DataChanged( const DataChangedEvent& rDCEvt )
 }
 
 
-void BrowserDataWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
+void BrowserDataWin::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
 {
-    if ( !nUpdateLock && GetUpdateMode() )
+    if (!nUpdateLock && GetUpdateMode())
     {
-        if ( bInPaint )
+        if (bInPaint)
         {
-            aInvalidRegion.push_back( new Rectangle( rRect ) );
+            aInvalidRegion.push_back(new Rectangle(rRect));
             return;
         }
         bInPaint = true;
-        ( (BrowseBox*) GetParent() )->PaintData( *this, rRect );
+        ((BrowseBox*) GetParent())->PaintData(*this, rRenderContext, rRect);
         bInPaint = false;
         DoOutstandingInvalidations();
     }
     else
-        aInvalidRegion.push_back( new Rectangle( rRect ) );
+    {
+        aInvalidRegion.push_back(new Rectangle(rRect));
+    }
 }
 
 
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index 8374e5e50b53..5a1ade0ff0ae 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -141,7 +141,7 @@ public:
     virtual void    dispose() SAL_OVERRIDE;
 
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
-    virtual void    Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void    Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
     virtual void    RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
     virtual void    Command( const CommandEvent& rEvt ) SAL_OVERRIDE;
     virtual void    MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE;
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index ff7a37274708..9673800b2e8c 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -317,7 +317,7 @@ class SvxIconChoiceCtrl_Impl
                         DECL_LINK(TextEditEndedHdl, void *);
 
     void                ShowFocus ( Rectangle& rRect );
-    void                DrawFocusRect ( OutputDevice* pOut );
+    void                DrawFocusRect(vcl::RenderContext& rRenderContext);
 
     bool                IsMnemonicChar( sal_Unicode cChar, sal_uLong& rPos ) const;
 
@@ -346,7 +346,7 @@ public:
                             bool bAddToSelection = false,
                             bool bSyncPaint = false
                         );
-    void                Paint( const Rectangle& rRect );
+    void                Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
     bool                MouseButtonDown( const MouseEvent& );
     bool                MouseButtonUp( const MouseEvent& );
     bool                MouseMove( const MouseEvent&);
@@ -364,17 +364,8 @@ public:
     void                LoseFocus();
     void                SetUpdateMode( bool bUpdate );
     bool                GetUpdateMode() const { return bUpdateMode; }
-    void                PaintEntry(
-                            SvxIconChoiceCtrlEntry* pEntry,
-                            bool bIsBackgroundPainted=false
-                        );
-    void                PaintEntry(
-                            SvxIconChoiceCtrlEntry*,
-                            const Point&,
-                            OutputDevice* pOut = 0,
-                            bool bIsBackgroundPainted = false
-                        );
-    void                PaintEntryVirtOutDev( SvxIconChoiceCtrlEntry* );
+    void                PaintEntry(SvxIconChoiceCtrlEntry* pEntry, bool bIsBackgroundPainted = false);
+    void                PaintEntry(SvxIconChoiceCtrlEntry*, const Point&, vcl::RenderContext& rRenderContext, bool bIsBackgroundPainted = false);
 
     void                SetEntryPos(
                             SvxIconChoiceCtrlEntry* pEntry,
@@ -435,25 +426,13 @@ public:
                         }
     static bool         IsBoundingRectValid( const Rectangle& rRect ) { return ( rRect.Right() != LONG_MAX ); }
 
-    void                PaintEmphasis(
-                            const Rectangle& rRect1,
-                            const Rectangle& rRect2,
-                            bool bSelected,
-                            bool bDropTarget,
-                            bool bCursored,
-                            OutputDevice* pOut,
-                            bool bIsBackgroundPainted = false
-                        );
+    void                PaintEmphasis(const Rectangle& rRect1, const Rectangle& rRect2, bool bSelected,
+                                      bool bDropTarget, bool bCursored, vcl::RenderContext& rRenderContext,
+                                      bool bIsBackgroundPainted = false);
 
-    void                PaintItem(
-                            const Rectangle& rRect,
-                            IcnViewFieldType eItem,
-                            SvxIconChoiceCtrlEntry* pEntry,
-                            sal_uInt16 nPaintFlags,
-                            OutputDevice* pOut,
-                            const OUString* pStr = 0,
-                            vcl::ControlLayoutData* _pLayoutData = NULL
-                        );
+    void                PaintItem(const Rectangle& rRect, IcnViewFieldType eItem, SvxIconChoiceCtrlEntry* pEntry,
+                            sal_uInt16 nPaintFlags, vcl::RenderContext& rRenderContext, const OUString* pStr = 0,
+                            vcl::ControlLayoutData* _pLayoutData = NULL);
 
     // recalculates all BoundingRects if bMustRecalcBoundingRects == true
     void                CheckBoundingRects() { if (bBoundRectsDirty) RecalcAllBoundingRectsSmart(); }
@@ -549,11 +528,7 @@ public:
                             bool bKeepHighlightFlags = false
                         );
     void                HideEntryHighlightFrame();
-    void                DrawHighlightFrame(
-                            OutputDevice* pOut,
-                            const Rectangle& rBmpRect,
-                            bool bHide
-                        );
+    void                DrawHighlightFrame(vcl::RenderContext& rRenderContext, const Rectangle& rBmpRect, bool bHide);
     void                StopSelectTimer() { aCallSelectHdlIdle.Stop(); }
 
     void                CallEventListeners( sal_uLong nEvent, void* pData = NULL );
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 34e35bacbd8c..b5d9ca55bb96 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -402,43 +402,34 @@ void SvxIconChoiceCtrl_Impl::SelectEntry( SvxIconChoiceCtrlEntry* pEntry, bool b
     }
 }
 
-void SvxIconChoiceCtrl_Impl::EntrySelected( SvxIconChoiceCtrlEntry* pEntry, bool bSelect,
-    bool bSyncPaint )
+void SvxIconChoiceCtrl_Impl::EntrySelected(SvxIconChoiceCtrlEntry* pEntry, bool bSelect, bool /*bSyncPaint*/)
 {
     // When using SingleSelection, make sure that the cursor is always placed
     // over the (only) selected entry. (But only if a cursor exists.)
-    if( bSelect && pCursor &&
+    if (bSelect && pCursor &&
         eSelectionMode == SINGLE_SELECTION &&
-        pEntry != pCursor )
+        pEntry != pCursor)
     {
-        SetCursor( pEntry );
-        //DBG_ASSERT(pView->GetSelectionCount()==1,"selection count?")
+        SetCursor(pEntry);
     }
 
     // Not when dragging though, else the loop in SelectRect doesn't work
     // correctly!
-    if( !(nFlags & F_SELECTING_RECT) )
-        ToTop( pEntry );
-    if( bUpdateMode )
-    {
-        if( pEntry == pCursor )
-            ShowCursor( false );
-        if( pView->IsTracking() ) // always synchronous when tracking
-            PaintEntry( pEntry );
-        else if( bSyncPaint ) // synchronous & with a virtual OutDev!
-            PaintEntryVirtOutDev( pEntry );
-        else
-        {
-            pView->Invalidate( CalcFocusRect( pEntry ) );
-        }
-        if( pEntry == pCursor )
-            ShowCursor( true );
+    if (!(nFlags & F_SELECTING_RECT))
+        ToTop(pEntry);
+    if (bUpdateMode)
+    {
+        if (pEntry == pCursor)
+            ShowCursor(false);
+        pView->Invalidate(CalcFocusRect(pEntry));
+        if (pEntry == pCursor)
+            ShowCursor(true);
     }
 
     // #i101012# emit vcl event LISTBOX_SELECT only in case that the given entry is selected.
-    if ( bSelect )
+    if (bSelect)
     {
-        CallEventListeners( VCLEVENT_LISTBOX_SELECT, pEntry );
+        CallEventListeners(VCLEVENT_LISTBOX_SELECT, pEntry);
     }
 }
 
@@ -607,104 +598,103 @@ void SvxIconChoiceCtrl_Impl::ImpArrange( bool bKeepPredecessors )
     ShowCursor( true );
 }
 
-void SvxIconChoiceCtrl_Impl::Paint( const Rectangle& rRect )
+void SvxIconChoiceCtrl_Impl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
 {
     bEndScrollInvalidate = false;
 
 #if defined(OV_DRAWGRID)
-    Color aOldColor ( pView->GetLineColor() );
-    Color aColor( COL_BLACK );
-    pView->SetLineColor( aColor );
-    Point aOffs( pView->GetMapMode().GetOrigin());
-    Size aXSize( pView->GetOutputSizePixel() );
-
-    {
-    Point aStart( LROFFS_WINBORDER, 0 );
-    Point aEnd( LROFFS_WINBORDER, aXSize.Height());
-    aStart -= aOffs;
-    aEnd -= aOffs;
-    pView->DrawLine( aStart, aEnd );
+    Color aOldColor (rRenderContext.GetLineColor());
+    Color aColor(COL_BLACK);
+    rRenderContext.SetLineColor( aColor );
+    Point aOffs(rRenderContext.GetMapMode().GetOrigin());
+    Size aXSize(rRenderContext.GetOutputSizePixel());
+    {
+        Point aStart(LROFFS_WINBORDER, 0);
+        Point aEnd(LROFFS_WINBORDER, aXSize.Height());
+        aStart -= aOffs;
+        aEnd -= aOffs;
+        rRenderContext.DrawLine(aStart, aEnd);
     }
     {
-    Point aStart( 0, TBOFFS_WINBORDER );
-    Point aEnd( aXSize.Width(), TBOFFS_WINBORDER );
-    aStart -= aOffs;
-    aEnd -= aOffs;
-    pView->DrawLine( aStart, aEnd );
+        Point aStart(0, TBOFFS_WINBORDER);
+        Point aEnd(aXSize.Width(), TBOFFS_WINBORDER);
+        aStart -= aOffs;
+        aEnd -= aOffs;
+        rRenderContext.DrawLine(aStart, aEnd);
     }
 
-    for( long nDX = nGridDX; nDX <= aXSize.Width(); nDX += nGridDX )
+    for (long nDX = nGridDX; nDX <= aXSize.Width(); nDX += nGridDX)
     {
         Point aStart( nDX+LROFFS_WINBORDER, 0 );
         Point aEnd( nDX+LROFFS_WINBORDER, aXSize.Height());
         aStart -= aOffs;
         aEnd -= aOffs;
-        pView->DrawLine( aStart, aEnd );
+        rRenderContext.DrawLine(aStart, aEnd);
     }
-    for( long nDY = nGridDY; nDY <= aXSize.Height(); nDY += nGridDY )
+    for (long nDY = nGridDY; nDY <= aXSize.Height(); nDY += nGridDY)
     {
-        Point aStart( 0, nDY+TBOFFS_WINBORDER );
-        Point aEnd( aXSize.Width(), nDY+TBOFFS_WINBORDER );
+        Point aStart(0, nDY + TBOFFS_WINBORDER);
+        Point aEnd(aXSize.Width(), nDY + TBOFFS_WINBORDER);
         aStart -= aOffs;
         aEnd -= aOffs;
-        pView->DrawLine( aStart, aEnd );
+        rRenderContext.DrawLine(aStart, aEnd);
     }
-    pView->SetLineColor( aOldColor );
+    rRenderContext.SetLineColor(aOldColor);
 #endif
     nFlags |= F_PAINTED;
 
-    if( !aEntries.size() )
+    if (!aEntries.size())
         return;
-    if( !pCursor )
+    if (!pCursor)
     {
         // set cursor to item with focus-flag
         bool bfound = false;
-        for ( sal_uLong i = 0; i < pView->GetEntryCount() && !bfound; i++)
+        for (sal_uLong i = 0; i < pView->GetEntryCount() && !bfound; i++)
         {
-            SvxIconChoiceCtrlEntry* pEntry = pView->GetEntry ( i );
-            if( pEntry->IsFocused() )
+            SvxIconChoiceCtrlEntry* pEntry = pView->GetEntry (i);
+            if (pEntry->IsFocused())
             {
                 pCursor = pEntry;
                 bfound = true;
             }
         }
 
-        if( !bfound )
+        if (!bfound)
             pCursor = aEntries[ 0 ];
     }
 
     // Show Focus at Init-Time
-    if ( pView->HasFocus() )
+    if (pView->HasFocus())
         GetFocus();
 
     size_t nCount = pZOrderList->size();
-    if( !nCount )
+    if (!nCount)
         return;
 
     bool bResetClipRegion = false;
-    if( !pView->IsClipRegion() )
+    if (!rRenderContext.IsClipRegion())
     {
-        vcl::Region const aOutputArea( GetOutputRect() );
+        vcl::Region const aOutputArea(GetOutputRect());
         bResetClipRegion = true;
-        pView->SetClipRegion( aOutputArea );
+        rRenderContext.SetClipRegion(aOutputArea);
     }
 
     SvxIconChoiceCtrlEntryList_impl* pNewZOrderList = new SvxIconChoiceCtrlEntryList_impl();
     boost::scoped_ptr<SvxIconChoiceCtrlEntryList_impl> pPaintedEntries(new SvxIconChoiceCtrlEntryList_impl());
 
     size_t nPos = 0;
-    while( nCount )
+    while(nCount)
     {
-        SvxIconChoiceCtrlEntry* pEntry = (*pZOrderList)[ nPos ];
-        const Rectangle& rBoundRect = GetEntryBoundRect( pEntry );
-        if( rRect.IsOver( rBoundRect ) )
+        SvxIconChoiceCtrlEntry* pEntry = (*pZOrderList)[nPos];
+        const Rectangle& rBoundRect = GetEntryBoundRect(pEntry);
+        if (rRect.IsOver(rBoundRect))
         {
-            PaintEntry( pEntry, rBoundRect.TopLeft(), pView, true );
+            PaintEntry(pEntry, rBoundRect.TopLeft(), rRenderContext, true);
             // set entries to Top if they are being repainted
-            pPaintedEntries->push_back( pEntry );
+            pPaintedEntries->push_back(pEntry);
         }
         else
-            pNewZOrderList->push_back( pEntry );
+            pNewZOrderList->push_back(pEntry);
 
         nCount--;
         nPos++;
@@ -712,42 +702,20 @@ void SvxIconChoiceCtrl_Impl::Paint( const Rectangle& rRect )
     delete pZOrderList;
     pZOrderList = pNewZOrderList;
     nCount = pPaintedEntries->size();
-    if( nCount )
+    if (nCount)
     {
-        for( size_t nCur = 0; nCur < nCount; nCur++ )
-            pZOrderList->push_back( (*pPaintedEntries)[ nCur ] );
+        for (size_t nCur = 0; nCur < nCount; nCur++)
+            pZOrderList->push_back((*pPaintedEntries)[nCur]);
     }
     pPaintedEntries.reset();
 
-    if( bResetClipRegion )
-        pView->SetClipRegion();
+    if (bResetClipRegion)
+        rRenderContext.SetClipRegion();
 }
 
-void SvxIconChoiceCtrl_Impl::RepaintEntries( SvxIconViewFlags nEntryFlagsMask )
+void SvxIconChoiceCtrl_Impl::RepaintEntries(SvxIconViewFlags /*nEntryFlagsMask*/)
 {
-    const size_t nCount = pZOrderList->size();
-    if( !nCount )
-        return;
-
-    bool bResetClipRegion = false;
-    Rectangle aOutRect( GetOutputRect() );
-    if( !pView->IsClipRegion() )
-    {
-        bResetClipRegion = true;
-        pView->SetClipRegion(vcl::Region(aOutRect));
-    }
-    for( size_t nCur = 0; nCur < nCount; nCur++ )
-    {
-        SvxIconChoiceCtrlEntry* pEntry = (*pZOrderList)[ nCur ];
-        if( pEntry->GetFlags() & nEntryFlagsMask )
-        {
-            const Rectangle& rBoundRect = GetEntryBoundRect( pEntry );
-            if( aOutRect.IsOver( rBoundRect ) )
-                PaintEntry( pEntry, rBoundRect.TopLeft() );
-        }
-    }
-    if( bResetClipRegion )
-        pView->SetClipRegion();
+    pView->Invalidate();
 }
 
 
@@ -1550,274 +1518,205 @@ void SvxIconChoiceCtrl_Impl::SetUpdateMode( bool bUpdate )
     }
 }
 
-void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, bool bIsBackgroundPainted )
+void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, bool /*bIsBackgroundPainted*/)
 {
-    Point aPos( GetEntryPos( pEntry ) );
-    PaintEntry( pEntry, aPos, 0, bIsBackgroundPainted );
+    pView->Invalidate(CalcFocusRect(pEntry));
 }
 
 // priorities of the emphasis:  bDropTarget => bCursored => bSelected
-void SvxIconChoiceCtrl_Impl::PaintEmphasis(
-    const Rectangle& rTextRect, const Rectangle& rImageRect,
-    bool bSelected, bool bDropTarget, bool bCursored, OutputDevice* pOut,
-    bool bIsBackgroundPainted )
+void SvxIconChoiceCtrl_Impl::PaintEmphasis(const Rectangle& rTextRect, const Rectangle& rImageRect, bool bSelected,
+                                           bool bDropTarget, bool bCursored, vcl::RenderContext& rRenderContext, bool bIsBackgroundPainted)
 {
-    static Color aTransparent( COL_TRANSPARENT );
-
-    if( !pOut )
-        pOut = pView;
+    static Color aTransparent(COL_TRANSPARENT);
 
-    const StyleSettings& rSettings = pOut->GetSettings().GetStyleSettings();
-    Color aOldFillColor( pOut->GetFillColor() );
+    const StyleSettings& rSettings = rRenderContext.GetSettings().GetStyleSettings();
+    Color aOldFillColor(rRenderContext.GetFillColor());
 
     bool bSolidTextRect = false;
     bool bSolidImageRect = false;
 
-    if( bDropTarget && ( eSelectionMode != NO_SELECTION ) )
+    if(bDropTarget && (eSelectionMode != NO_SELECTION))
     {
-        pOut->SetFillColor( rSettings.GetHighlightColor() );
+        rRenderContext.SetFillColor(rSettings.GetHighlightColor());
         bSolidTextRect = true;
         bSolidImageRect = true;
     }
     else
     {
-        if ( !bSelected || bCursored )
+        if (!bSelected || bCursored)
         {
-            const Color& rFillColor = pView->GetFont().GetFillColor();
-            pOut->SetFillColor( rFillColor );
-            if( rFillColor != aTransparent )
+            const Color& rFillColor = rRenderContext.GetFont().GetFillColor();
+            rRenderContext.SetFillColor(rFillColor);
+            if (rFillColor != aTransparent)
                 bSolidTextRect = true;
         }
     }
 
     // draw text rectangle
-    if( !bSolidTextRect )
+    if (!bSolidTextRect)
     {
-        if( !bIsBackgroundPainted )
-            pOut->Erase( rTextRect );
+        if (!bIsBackgroundPainted)
+            rRenderContext.Erase(rTextRect);
     }
     else
     {
         Color aOldLineColor;
-        if( bCursored )
+        if (bCursored)
         {
-            aOldLineColor = pOut->GetLineColor();
-            pOut->SetLineColor( Color( COL_GRAY ) );
+            aOldLineColor = rRenderContext.GetLineColor();
+            rRenderContext.SetLineColor(Color(COL_GRAY));
         }
-        pOut->DrawRect( rTextRect );
-        if( bCursored )
-            pOut->SetLineColor( aOldLineColor );
+        rRenderContext.DrawRect(rTextRect);
+        if (bCursored)
+            rRenderContext.SetLineColor(aOldLineColor);
     }
 
     // draw image rectangle
-    if( !bSolidImageRect )
+    if (!bSolidImageRect)
     {
-        if( !bIsBackgroundPainted )
-            pOut->Erase( rImageRect );
+        if (!bIsBackgroundPainted)
+            rRenderContext.Erase(rImageRect);
     }
-// the emphasis of the images has to be drawn by the derived class (in the
-// virtual function DrawEntryImage)
-//  else
-//      pOut->DrawRect( rImageRect );
 
-    pOut->SetFillColor( aOldFillColor );
+    rRenderContext.SetFillColor(aOldFillColor);
 }
 
 
-void SvxIconChoiceCtrl_Impl::PaintItem( const Rectangle& rRect,
+void SvxIconChoiceCtrl_Impl::PaintItem(const Rectangle& rRect,
     IcnViewFieldType eItem, SvxIconChoiceCtrlEntry* pEntry, sal_uInt16 nPaintFlags,
-    OutputDevice* pOut, const OUString* pStr, vcl::ControlLayoutData* _pLayoutData )
+    vcl::RenderContext& rRenderContext, const OUString* pStr, vcl::ControlLayoutData* _pLayoutData )
 {
-    if( eItem == IcnViewFieldTypeText )
+    if (eItem == IcnViewFieldTypeText)
     {
         OUString aText;
-        if( !pStr )
-            aText = SvtIconChoiceCtrl::GetEntryText( pEntry, false );
+        if (!pStr)
+            aText = SvtIconChoiceCtrl::GetEntryText(pEntry, false);
         else
             aText = *pStr;
 
-        if ( _pLayoutData )
+        if (_pLayoutData)
         {
-            pOut->DrawText( rRect, aText, nCurTextDrawFlags,
-                &_pLayoutData->m_aUnicodeBoundRects, &_pLayoutData->m_aDisplayText );
+            rRenderContext.DrawText(rRect, aText, nCurTextDrawFlags, &_pLayoutData->m_aUnicodeBoundRects, &_pLayoutData->m_aDisplayText);
         }
         else
         {
-            Color aOldFontColor = pOut->GetTextColor();
-            if ( pView->AutoFontColor() )
+            Color aOldFontColor = rRenderContext.GetTextColor();
+            if (pView->AutoFontColor())
             {
-                Color aBkgColor( pOut->GetBackground().GetColor() );
+                Color aBkgColor(rRenderContext.GetBackground().GetColor());
                 Color aFontColor;
-                sal_uInt16 nColor = ( aBkgColor.GetRed() + aBkgColor.GetGreen() + aBkgColor.GetBlue() ) / 3;
-                if ( nColor > 127 )
-                    aFontColor.SetColor ( COL_BLACK );
+                sal_uInt16 nColor = (aBkgColor.GetRed() + aBkgColor.GetGreen() + aBkgColor.GetBlue()) / 3;
+                if (nColor > 127)
+                    aFontColor.SetColor(COL_BLACK);
                 else
-                    aFontColor.SetColor( COL_WHITE );
-                pOut->SetTextColor( aFontColor );
+                    aFontColor.SetColor(COL_WHITE);
+                rRenderContext.SetTextColor(aFontColor);
             }
 
-            pOut->DrawText( rRect, aText, nCurTextDrawFlags );
+            rRenderContext.DrawText(rRect, aText, nCurTextDrawFlags);
 
-            if ( pView->AutoFontColor() )
-                pOut->SetTextColor( aOldFontColor );
+            if (pView->AutoFontColor())
+                rRenderContext.SetTextColor(aOldFontColor);
 
-            if( pEntry->IsFocused() )
+            if (pEntry->IsFocused())
             {
-                Rectangle aRect ( CalcFocusRect( pEntry ) );
-                /*pView->*/ShowFocus( aRect );
-                DrawFocusRect( pOut );
+                Rectangle aRect (CalcFocusRect(pEntry));
+                ShowFocus(aRect);
+                DrawFocusRect(rRenderContext);
             }
         }
     }
     else
     {
-        Point aPos( rRect.TopLeft() );
-        if( nPaintFlags & PAINTFLAG_HOR_CENTERED )
-            aPos.X() += (rRect.GetWidth() - aImageSize.Width() ) / 2;
-        if( nPaintFlags & PAINTFLAG_VER_CENTERED )
-            aPos.Y() += (rRect.GetHeight() - aImageSize.Height() ) / 2;
-        SvtIconChoiceCtrl::DrawEntryImage( pEntry, aPos, *pOut );
+        Point aPos(rRect.TopLeft());
+        if (nPaintFlags & PAINTFLAG_HOR_CENTERED)
+            aPos.X() += (rRect.GetWidth() - aImageSize.Width()) / 2;
+        if (nPaintFlags & PAINTFLAG_VER_CENTERED)
+            aPos.Y() += (rRect.GetHeight() - aImageSize.Height()) / 2;
+        SvtIconChoiceCtrl::DrawEntryImage(pEntry, aPos, rRenderContext);
     }
 }
 
-void SvxIconChoiceCtrl_Impl::PaintEntryVirtOutDev( SvxIconChoiceCtrlEntry* pEntry )
-{
-    if( !pEntryPaintDev )
-    {
-        pEntryPaintDev = VclPtr<VirtualDevice>::Create( *pView );
-        pEntryPaintDev->SetFont( pView->GetFont() );
-        pEntryPaintDev->SetLineColor();
-        //pEntryPaintDev->SetBackground( pView->GetBackground() );
-    }
-    const Rectangle& rRect = GetEntryBoundRect( pEntry );
-    Rectangle aOutRect( GetOutputRect() );
-    if( !rRect.IsOver( aOutRect ) )
-        return;
-    Wallpaper aPaper( pView->GetBackground() );
-    Rectangle aRect( aPaper.GetRect() );
-
-    // move rectangle, so the bounding rectangle of the entry lies in
-    // VirtOut-Dev at 0,0
-    aRect.Move( -rRect.Left(), -rRect.Top() );
-    aPaper.SetRect( aRect );
-    pEntryPaintDev->SetBackground( aPaper );
-    pEntryPaintDev->SetFont( pView->GetFont() );
-
-    Size aSize( rRect.GetSize() );
-    pEntryPaintDev->SetOutputSizePixel( aSize );
-    pEntryPaintDev->DrawOutDev(
-        Point(), aSize, rRect.TopLeft(), aSize, *pView );
-
-    PaintEntry( pEntry, Point(), pEntryPaintDev );
-
-    pView->DrawOutDev(
-        rRect.TopLeft(),
-        aSize,
-        Point(),
-        aSize,
-        *pEntryPaintDev );
-}
-
-
-void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos,
-    OutputDevice* pOut, bool bIsBackgroundPainted )
+void SvxIconChoiceCtrl_Impl::PaintEntry(SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, vcl::RenderContext& rRenderContext, bool bIsBackgroundPainted)
 {
-    if( !pOut )
-        pOut = pView;
-
     bool bSelected = false;
 
-    if( eSelectionMode != NO_SELECTION )
+    if (eSelectionMode != NO_SELECTION)
         bSelected = pEntry->IsSelected();
 
     bool bCursored = pEntry->IsCursored();
     bool bDropTarget = pEntry->IsDropTarget();
     bool bNoEmphasis = pEntry->IsBlockingEmphasis();
 
-    vcl::Font aTempFont( pOut->GetFont() );
+    vcl::Font aTempFont(rRenderContext.GetFont());
 
-    // AutoFontColor
-    /*
-    if ( pView->AutoFontColor() )
-    {
-        aTempFont.SetColor ( aFontColor );
-    }
-    */
+    OUString aEntryText(SvtIconChoiceCtrl::GetEntryText(pEntry, false));
+    Rectangle aTextRect(CalcTextRect(pEntry, &rPos, false, &aEntryText));
+    Rectangle aBmpRect(CalcBmpRect(pEntry, &rPos));
 
-    OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry, false ) );
-    Rectangle aTextRect( CalcTextRect(pEntry,&rPos,false,&aEntryText));
-    Rectangle aBmpRect( CalcBmpRect(pEntry, &rPos ) );
-
-    bool    bShowSelection =
-        (   (   ( bSelected && !bCursored )
-            ||  bDropTarget
-            )
-        &&  !bNoEmphasis
-        &&  ( eSelectionMode != NO_SELECTION )
-        );
-    bool bActiveSelection = ( 0 != ( nWinBits & WB_NOHIDESELECTION ) ) || pView->HasFocus();
+    bool bShowSelection = (((bSelected && !bCursored) || bDropTarget) && !bNoEmphasis && (eSelectionMode != NO_SELECTION));
 
-    if ( bShowSelection )
+    bool bActiveSelection = (0 != (nWinBits & WB_NOHIDESELECTION)) || pView->HasFocus();
+
+    if (bShowSelection)
     {
-        const StyleSettings& rSettings = pOut->GetSettings().GetStyleSettings();
-        vcl::Font aNewFont( aTempFont );
+        const StyleSettings& rSettings = rRenderContext.GetSettings().GetStyleSettings();
+        vcl::Font aNewFont(aTempFont);
 
         // font fill colors that are attributed "hard" need corresponding "hard"
         // attributed highlight colors
-        if( (nWinBits & WB_NOHIDESELECTION) || pView->HasFocus() )
-            aNewFont.SetFillColor( rSettings.GetHighlightColor() );
+        if ((nWinBits & WB_NOHIDESELECTION) || pView->HasFocus())
+            aNewFont.SetFillColor(rSettings.GetHighlightColor());
         else
-            aNewFont.SetFillColor( rSettings.GetDeactiveColor() );
+            aNewFont.SetFillColor(rSettings.GetDeactiveColor());
 
         Color aWinCol = rSettings.GetWindowTextColor();
-        if ( !bActiveSelection && rSettings.GetFaceColor().IsBright() == aWinCol.IsBright() )
-            aNewFont.SetColor( rSettings.GetWindowTextColor() );
+        if (!bActiveSelection && rSettings.GetFaceColor().IsBright() == aWinCol.IsBright())
+            aNewFont.SetColor(rSettings.GetWindowTextColor());
         else
-            aNewFont.SetColor( rSettings.GetHighlightTextColor() );
+            aNewFont.SetColor(rSettings.GetHighlightTextColor());
 
-        pOut->SetFont( aNewFont );
+        rRenderContext.SetFont(aNewFont);
 
-        pOut->SetFillColor( pOut->GetBackground().GetColor() );
-        pOut->DrawRect( CalcFocusRect( pEntry ) );
-        pOut->SetFillColor( );
+        rRenderContext.SetFillColor(rRenderContext.GetBackground().GetColor());
+        rRenderContext.DrawRect(CalcFocusRect(pEntry));
+        rRenderContext.SetFillColor();
     }
 
     bool bResetClipRegion = false;
-    if( !pView->IsClipRegion() && (aVerSBar->IsVisible() || aHorSBar->IsVisible()) )
+    if (!rRenderContext.IsClipRegion() && (aVerSBar->IsVisible() || aHorSBar->IsVisible()))
     {
-        Rectangle aOutputArea( GetOutputRect() );
-        if( aOutputArea.IsOver(aTextRect) || aOutputArea.IsOver(aBmpRect) )
+        Rectangle aOutputArea(GetOutputRect());
+        if (aOutputArea.IsOver(aTextRect) || aOutputArea.IsOver(aBmpRect))
         {
-            pView->SetClipRegion(vcl::Region(aOutputArea));
+            rRenderContext.SetClipRegion(vcl::Region(aOutputArea));
             bResetClipRegion = true;
         }
     }
 
     bool bLargeIconMode = WB_ICON == ( nWinBits & (VIEWMODE_MASK) );
     sal_uInt16 nBmpPaintFlags = PAINTFLAG_VER_CENTERED;
-    if ( bLargeIconMode )
+    if (bLargeIconMode)
         nBmpPaintFlags |= PAINTFLAG_HOR_CENTERED;
     sal_uInt16 nTextPaintFlags = bLargeIconMode ? PAINTFLAG_HOR_CENTERED : PAINTFLAG_VER_CENTERED;
 
     if( !bNoEmphasis )
-        PaintEmphasis(aTextRect,aBmpRect,bSelected,bDropTarget,bCursored,pOut,bIsBackgroundPainted);
+        PaintEmphasis(aTextRect, aBmpRect, bSelected, bDropTarget, bCursored, rRenderContext, bIsBackgroundPainted);
 
     if ( bShowSelection )
-        pView->DrawSelectionBackground( CalcFocusRect( pEntry ),
-        bActiveSelection ? 1 : 2 /* highlight */, false /* check */, true /* border */, false /* ext border only */ );
+        pView->DrawSelectionBackground(CalcFocusRect(pEntry), bActiveSelection ? 1 : 2, false, true, false);
 
-    PaintItem( aBmpRect, IcnViewFieldTypeImage, pEntry, nBmpPaintFlags, pOut );
+    PaintItem(aBmpRect, IcnViewFieldTypeImage, pEntry, nBmpPaintFlags, rRenderContext);
 
-    PaintItem( aTextRect, IcnViewFieldTypeText, pEntry,
-        nTextPaintFlags, pOut );
+    PaintItem(aTextRect, IcnViewFieldTypeText, pEntry, nTextPaintFlags, rRenderContext);
 
     // draw highlight frame
-    if( pEntry == pCurHighlightFrame && !bNoEmphasis )
-        DrawHighlightFrame( pOut, CalcFocusRect( pEntry ), false );
+    if (pEntry == pCurHighlightFrame && !bNoEmphasis)
+        DrawHighlightFrame(rRenderContext, CalcFocusRect(pEntry), false);
 
-    pOut->SetFont( aTempFont );
-    if( bResetClipRegion )
-        pView->SetClipRegion();
+    rRenderContext.SetFont(aTempFont);
+    if (bResetClipRegion)
+        rRenderContext.SetClipRegion();
 }
 
 void SvxIconChoiceCtrl_Impl::SetEntryPos( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos,
@@ -3025,34 +2924,33 @@ SvxIconChoiceCtrlTextMode SvxIconChoiceCtrl_Impl::GetEntryTextModeSmart( const S
 
 void SvxIconChoiceCtrl_Impl::ShowFocus ( Rectangle& rRect )
 {
-    Color aBkgColor ( pView->GetBackground().GetColor() );
+    Color aBkgColor(pView->GetBackground().GetColor());
     Color aPenColor;
     sal_uInt16 nColor = ( aBkgColor.GetRed() + aBkgColor.GetGreen() + aBkgColor.GetBlue() ) / 3;
-    if ( nColor > 128 )
-        aPenColor.SetColor ( COL_BLACK );
+    if (nColor > 128)
+        aPenColor.SetColor(COL_BLACK);
     else
-        aPenColor.SetColor( COL_WHITE );
+        aPenColor.SetColor(COL_WHITE);
 
     aFocus.bOn = true;
     aFocus.aPenColor = aPenColor;
     aFocus.aRect = rRect;
 }
 
-void SvxIconChoiceCtrl_Impl::DrawFocusRect ( OutputDevice* pOut )
+void SvxIconChoiceCtrl_Impl::DrawFocusRect(vcl::RenderContext& rRenderContext)
 {
-    pOut->SetLineColor( aFocus.aPenColor );
-    pOut->SetFillColor();
-    Polygon aPolygon ( aFocus.aRect );
-
-    LineInfo aLineInfo ( LINE_DASH );
+    rRenderContext.SetLineColor(aFocus.aPenColor);
+    rRenderContext.SetFillColor();
+    Polygon aPolygon (aFocus.aRect);
 
-    aLineInfo.SetDashLen ( 1 );
+    LineInfo aLineInfo(LINE_DASH);
 
-    aLineInfo.SetDotLen ( 1L );
-    aLineInfo.SetDistance ( 1L );
-    aLineInfo.SetDotCount ( 1 );
+    aLineInfo.SetDashLen(1);
+    aLineInfo.SetDotLen(1L);
+    aLineInfo.SetDistance(1L);
+    aLineInfo.SetDotCount(1);
 
-    pOut->DrawPolyLine ( aPolygon, aLineInfo );
+    rRenderContext.DrawPolyLine(aPolygon, aLineInfo);
 }
 
 bool SvxIconChoiceCtrl_Impl::IsMnemonicChar( sal_Unicode cChar, sal_uLong& rPos ) const
@@ -3658,29 +3556,28 @@ const SvxIconChoiceCtrlColumnInfo* SvxIconChoiceCtrl_Impl::GetColumn( sal_uInt16
     return it->second;
 }
 
-void SvxIconChoiceCtrl_Impl::DrawHighlightFrame(
-    OutputDevice* pOut, const Rectangle& rBmpRect, bool bHide )
+void SvxIconChoiceCtrl_Impl::DrawHighlightFrame(vcl::RenderContext& rRenderContext, const Rectangle& rBmpRect, bool bHide)
 {
-    Rectangle aBmpRect( rBmpRect );
+    Rectangle aBmpRect(rBmpRect);
     long nBorder = 2;
-    if( aImageSize.Width() < 32 )
+    if (aImageSize.Width() < 32)
         nBorder = 1;
     aBmpRect.Right() += nBorder;
     aBmpRect.Left() -= nBorder;
     aBmpRect.Bottom() += nBorder;
     aBmpRect.Top() -= nBorder;
 
-    if ( bHide )
-        pView->Invalidate( aBmpRect );
+    if (bHide)
+        pView->Invalidate(aBmpRect);
     else
     {
-        DecorationView aDecoView( pOut );
+        DecorationView aDecoView(&rRenderContext);
         sal_uInt16 nDecoFlags;
-        if ( bHighlightFramePressed )
+        if (bHighlightFramePressed)
             nDecoFlags = FRAME_HIGHLIGHT_TESTBACKGROUND | FRAME_HIGHLIGHT_IN;
         else
             nDecoFlags = FRAME_HIGHLIGHT_TESTBACKGROUND | FRAME_HIGHLIGHT_OUT;
-        aDecoView.DrawHighlightFrame( aBmpRect, nDecoFlags );
+        aDecoView.DrawHighlightFrame(aBmpRect, nDecoFlags);
     }
 }
 
@@ -3697,8 +3594,8 @@ void SvxIconChoiceCtrl_Impl::SetEntryHighlightFrame( SvxIconChoiceCtrlEntry* pEn
     pCurHighlightFrame = pEntry;
     if( pEntry )
     {
-        Rectangle aBmpRect( CalcFocusRect(pEntry) );
-        DrawHighlightFrame( pView, aBmpRect, false );
+        Rectangle aBmpRect(CalcFocusRect(pEntry));
+        pView->Invalidate(aBmpRect);
     }
 }
 
@@ -3709,8 +3606,8 @@ void SvxIconChoiceCtrl_Impl::HideEntryHighlightFrame()
 
     SvxIconChoiceCtrlEntry* pEntry = pCurHighlightFrame;
     pCurHighlightFrame = 0;
-    Rectangle aBmpRect( CalcFocusRect(pEntry) );
-    DrawHighlightFrame( pView, aBmpRect, true );
+    Rectangle aBmpRect(CalcFocusRect(pEntry));
+    pView->Invalidate(aBmpRect);
 }
 
 void SvxIconChoiceCtrl_Impl::CallSelectHandler( SvxIconChoiceCtrlEntry* )
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 4bdb4bc87115..fe721c4f939f 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -121,9 +121,9 @@ OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, bool )
     return pEntry->GetText();
 }
 
-void SvtIconChoiceCtrl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
+void SvtIconChoiceCtrl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
 {
-    _pImp->Paint( rRect );
+    _pImp->Paint(rRenderContext, rRect);
 }
 
 void SvtIconChoiceCtrl::MouseButtonDown( const MouseEvent& rMEvt )
@@ -427,27 +427,7 @@ Rectangle SvtIconChoiceCtrl::GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) co
 void SvtIconChoiceCtrl::FillLayoutData() const
 {
     CreateLayoutData();
-
-    SvtIconChoiceCtrl* pNonConstMe = const_cast< SvtIconChoiceCtrl* >( this );
-
-    // loop through all entries
-    sal_uInt16 nCount = (sal_uInt16)GetEntryCount();
-    sal_uInt16 nPos = 0;
-    while ( nPos < nCount )
-    {
-        SvxIconChoiceCtrlEntry* pEntry = GetEntry( nPos );
-
-        Point aPos = _pImp->GetEntryBoundRect( pEntry ).TopLeft();
-        OUString sEntryText = pEntry->GetDisplayText( );
-        Rectangle aTextRect = _pImp->CalcTextRect( pEntry, &aPos, false, &sEntryText );
-
-        bool bLargeIconMode = WB_ICON == ( _pImp->GetStyle() & ( VIEWMODE_MASK ) );
-        sal_uInt16 nTextPaintFlags = bLargeIconMode ? PAINTFLAG_HOR_CENTERED : PAINTFLAG_VER_CENTERED;
-
-        _pImp->PaintItem( aTextRect, IcnViewFieldTypeText, pEntry, nTextPaintFlags, pNonConstMe, &sEntryText, GetLayoutData() );
-
-        ++nPos;
-    }
+    const_cast<SvtIconChoiceCtrl*>(this)->Invalidate();
 }
 
 Rectangle SvtIconChoiceCtrl::GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const