refactor ValueSet to use RenderContext

Change-Id: I3985804f8cfd1b6807bc02bef5af3e24e5cb3cbf

cui/source/tabpages/numpages.cxx

@@ -840,7 +840,8 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent,
     else
     {
         m_pExamplesVS->Show();
-        m_pExamplesVS->Format();
+        m_pExamplesVS->SetFormat();
+        m_pExamplesVS->Invalidate();
     }
 }
 

include/svtools/valueset.hxx

@@ -197,7 +197,7 @@ class SVT_DLLPUBLIC ValueSet : public Control
 {
 private:
 
-    ScopedVclPtr<VirtualDevice>   maVirDev;
+    ScopedVclPtr<VirtualDevice> maVirDev;
     Timer           maTimer;
     ValueItemList   mItemList;
     ValueSetItemPtr mpNoneItem;
@@ -248,13 +248,13 @@ private:
     SVT_DLLPRIVATE void         ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
     SVT_DLLPRIVATE void         ImplInitScrollBar();
     SVT_DLLPRIVATE void         ImplDeleteItems();
-    SVT_DLLPRIVATE void         ImplFormatItem( ValueSetItem* pItem, Rectangle aRect );
-    SVT_DLLPRIVATE void         ImplDrawItemText(const OUString& rStr);
-    SVT_DLLPRIVATE void         ImplDrawSelect( sal_uInt16 nItemId, const bool bFocus, const bool bDrawSel );
-    SVT_DLLPRIVATE void         ImplDrawSelect();
-    SVT_DLLPRIVATE void         ImplHideSelect( sal_uInt16 nItemId );
-    SVT_DLLPRIVATE void         ImplHighlightItem( sal_uInt16 nItemId, bool bIsSelection = true );
-    SVT_DLLPRIVATE void         ImplDraw();
+    SVT_DLLPRIVATE void         ImplFormatItem(vcl::RenderContext& rRenderContext, ValueSetItem* pItem, Rectangle aRect);
+    SVT_DLLPRIVATE void         ImplDrawItemText(vcl::RenderContext& rRenderContext, const OUString& rStr);
+    SVT_DLLPRIVATE void         ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nItemId, const bool bFocus, const bool bDrawSel);
+    SVT_DLLPRIVATE void         ImplDrawSelect(vcl::RenderContext& rRenderContext);
+    SVT_DLLPRIVATE void         ImplHideSelect(sal_uInt16 nItemId);
+    SVT_DLLPRIVATE void         ImplHighlightItem(sal_uInt16 nItemId, bool bIsSelection = true);
+    SVT_DLLPRIVATE void         ImplDraw(vcl::RenderContext& rRenderContext);
     using Window::ImplScroll;
     SVT_DLLPRIVATE bool         ImplScroll( const Point& rPos );
     SVT_DLLPRIVATE size_t       ImplGetItem( const Point& rPoint, bool bMove = false ) const;
@@ -274,10 +274,7 @@ private:
     ValueSet & operator= (const ValueSet &) SAL_DELETED_FUNCTION;
 
 protected:
-
-    bool            StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion );
-
-protected:
+    bool StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion );
 
     virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE;
 
@@ -293,7 +290,7 @@ public:
     virtual void    Tracking( const TrackingEvent& rMEvt ) SAL_OVERRIDE;
     virtual void    KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
     virtual void    Command( const CommandEvent& rCEvt ) 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    GetFocus() SAL_OVERRIDE;
     virtual void    LoseFocus() SAL_OVERRIDE;
     virtual void    Resize() SAL_OVERRIDE;
@@ -306,19 +303,14 @@ public:
     void            DoubleClick();
     virtual void    UserDraw( const UserDrawEvent& rUDEvt );
 
-    void            InsertItem( sal_uInt16 nItemId, const Image& rImage,
-                                size_t nPos = VALUESET_APPEND );
-    void            InsertItem( sal_uInt16 nItemId,
-                                const Image& rImage, const OUString& rStr,
-                                size_t nPos = VALUESET_APPEND );
-    void            InsertItem( sal_uInt16 nItemId,
-                                const Color& rColor, const OUString& rStr,
-                                size_t nPos = VALUESET_APPEND );
-    void            InsertItem( sal_uInt16 nItemId,
-                                size_t nPos = VALUESET_APPEND );
-    void            InsertItem( sal_uInt16 nItemId, const OUString& rStr,
-                                size_t nPos = VALUESET_APPEND );
-    void            RemoveItem( sal_uInt16 nItemId );
+    void            InsertItem(sal_uInt16 nItemId, const Image& rImage, size_t nPos = VALUESET_APPEND);
+    void            InsertItem(sal_uInt16 nItemId, const Image& rImage,
+                               const OUString& rStr, size_t nPos = VALUESET_APPEND);
+    void            InsertItem(sal_uInt16 nItemId, const Color& rColor,
+                               const OUString& rStr, size_t nPos = VALUESET_APPEND);
+    void            InsertItem(sal_uInt16 nItemId, size_t nPos = VALUESET_APPEND);
+    void            InsertItem(sal_uInt16 nItemId, const OUString& rStr, size_t nPos = VALUESET_APPEND);
+    void            RemoveItem(sal_uInt16 nItemId);
 
     void            Clear();
 
@@ -329,23 +321,49 @@ public:
     Rectangle       GetItemRect( sal_uInt16 nItemId ) const;
 
     void            EnableFullItemMode( bool bFullMode = true );
-    bool            IsFullItemModeEnabled() const { return mbFullMode; }
+    bool IsFullItemModeEnabled() const
+    {
+        return mbFullMode;
+    }
     void            SetColCount( sal_uInt16 nNewCols = 1 );
-    sal_uInt16          GetColCount() const { return mnUserCols; }
+    sal_uInt16 GetColCount() const
+    {
+        return mnUserCols;
+    }
     void            SetLineCount( sal_uInt16 nNewLines = 0 );
-    sal_uInt16          GetLineCount() const { return mnUserVisLines; }
-    void            SetItemWidth( long nItemWidth = 0 );
-    long            GetItemWidth() const { return mnUserItemWidth; }
-    void            SetItemHeight( long nLineHeight = 0 );
-    long            GetItemHeight() const { return mnUserItemHeight; }
-    sal_uInt16          GetFirstLine() const { return mnFirstLine; }
-
-    void            SelectItem( sal_uInt16 nItemId );
-    sal_uInt16          GetSelectItemId() const { return mnSelItemId; }
-    bool            IsItemSelected( sal_uInt16 nItemId ) const
-                        { return !mbNoSelection && (nItemId == mnSelItemId); }
-    void            SetNoSelection();
-    bool            IsNoSelection() const { return mbNoSelection; }
+    sal_uInt16 GetLineCount() const
+    {
+        return mnUserVisLines;
+    }
+    void SetItemWidth( long nItemWidth = 0 );
+    long GetItemWidth() const
+    {
+        return mnUserItemWidth;
+    }
+    void SetItemHeight( long nLineHeight = 0 );
+    long GetItemHeight() const
+    {
+        return mnUserItemHeight;
+    }
+    sal_uInt16          GetFirstLine() const
+    {
+        return mnFirstLine;
+    }
+
+    void SelectItem( sal_uInt16 nItemId );
+    sal_uInt16 GetSelectItemId() const
+    {
+        return mnSelItemId;
+    }
+    bool IsItemSelected( sal_uInt16 nItemId ) const
+    {
+        return !mbNoSelection && (nItemId == mnSelItemId);
+    }
+    void SetNoSelection();
+    bool IsNoSelection() const
+    {
+        return mbNoSelection;
+    }
 
     void            SetItemImage( sal_uInt16 nItemId, const Image& rImage );
     Image           GetItemImage( sal_uInt16 nItemId ) const;
@@ -356,32 +374,60 @@ public:
     void            SetItemText( sal_uInt16 nItemId, const OUString& rStr );
     OUString        GetItemText( sal_uInt16 nItemId ) const;
     void            SetColor( const Color& rColor );
-    void            SetColor() { SetColor( Color( COL_TRANSPARENT ) ); }
-    Color           GetColor() const { return maColor; }
-    bool            IsColor() const { return maColor.GetTransparency() == 0; }
+    void            SetColor()
+    {
+        SetColor(Color(COL_TRANSPARENT));
+    }
+    Color           GetColor() const
+    {
+        return maColor;
+    }
+    bool            IsColor() const
+    {
+        return maColor.GetTransparency() == 0;
+    }
 
     void            SetExtraSpacing( sal_uInt16 nNewSpacing );
-    sal_uInt16      GetExtraSpacing() { return mnSpacing; }
+    sal_uInt16      GetExtraSpacing()
+    {
+        return mnSpacing;
+    }
 
-    void            Format();
+    void            Format(vcl::RenderContext& rRenderContext);
+    void            SetFormat(bool bFormat = true);
 
     void            StartSelection();
     void            EndSelection();
 
-    Size            CalcWindowSizePixel( const Size& rItemSize,
-                                         sal_uInt16 nCalcCols = 0,
-                                         sal_uInt16 nCalcLines = 0 ) const;
-    Size            CalcItemSizePixel( const Size& rSize, bool bOut = true ) const;
+    Size            CalcWindowSizePixel(const Size& rItemSize,
+                                        sal_uInt16 nCalcCols = 0,
+                                        sal_uInt16 nCalcLines = 0) const;
+    Size            CalcItemSizePixel(const Size& rSize, bool bOut = true) const;
     long            GetScrollWidth() const;
 
-    void            SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
-    const Link<>&   GetSelectHdl() const { return maSelectHdl; }
-    void            SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
-    const Link<>&   GetDoubleClickHdl() const { return maDoubleClickHdl; }
-
-    void            SetHighlightHdl( const Link<>& rLink );
-
-    bool GetEdgeBlending() const { return mbEdgeBlending; }
+    void            SetSelectHdl(const Link<>& rLink)
+    {
+        maSelectHdl = rLink;
+    }
+    const Link<>&   GetSelectHdl() const
+    {
+        return maSelectHdl;
+    }
+    void            SetDoubleClickHdl(const Link<>& rLink)
+    {
+        maDoubleClickHdl = rLink;
+    }
+    const Link<>&   GetDoubleClickHdl() const
+    {
+        return maDoubleClickHdl;
+    }
+
+    void            SetHighlightHdl(const Link<>& rLink);
+
+    bool GetEdgeBlending() const
+    {
+        return mbEdgeBlending;
+    }
     void SetEdgeBlending(bool bNew);
 };
 

sc/source/ui/sidebar/CellLineStyleControl.cxx

@@ -110,7 +110,8 @@ void CellLineStyleControl::SetAllNoSel()
 {
     maCellLineStyleValueSet->SelectItem(0);
     maCellLineStyleValueSet->SetNoSelection();
-    maCellLineStyleValueSet->Format();
+    maCellLineStyleValueSet->SetFormat();
+    maCellLineStyleValueSet->Invalidate();
     Invalidate();
     maCellLineStyleValueSet->StartSelection();
 }
@@ -251,8 +252,8 @@ void CellLineStyleControl::SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal
         maCellLineStyleValueSet->SetSelItem(0);
         mbVSfocus = false;
     }
-
-    maCellLineStyleValueSet->Format();
+    maCellLineStyleValueSet->SetFormat();
+    maCellLineStyleValueSet->Invalidate();
     maCellLineStyleValueSet->StartSelection();
 }
 

svx/source/dialog/svxbmpnumvalueset.cxx

@@ -503,7 +503,7 @@ void SvxBmpNumValueSet::dispose()
     SvxNumValueSet::dispose();
 }
 
-void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
+void SvxBmpNumValueSet::UserDraw(const UserDrawEvent& rUDEvt)
 {
     SvxNumValueSet::UserDraw(rUDEvt);
 
@@ -536,10 +536,10 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 IMPL_LINK_NOARG_TYPED(SvxBmpNumValueSet, FormatHdl_Impl, Idle *, void)
 {
     // only when a graphics was not there, it needs to be formatted
-    if(bGrfNotFound)
+    if (bGrfNotFound)
     {
+        SetFormat();
         bGrfNotFound = false;
-        Format();
     }
     Invalidate();
 }

svx/source/sidebar/line/LineWidthControl.cxx

@@ -265,7 +265,8 @@ void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit e
         mbVSFocus = false;
         maVSWidth->SetSelItem(0);
     }
-    maVSWidth->Format();
+    maVSWidth->SetFormat();
+    maVSWidth->Invalidate();
     maVSWidth->StartSelection();
 }
 
@@ -304,7 +305,8 @@ IMPL_LINK(LineWidthControl, VSSelectHdl, void *, pControl)
             else
             {
                 maVSWidth->SetNoSelection();     //add , set no selection and keep the last select item
-                maVSWidth->Format();
+                maVSWidth->SetFormat();
+                maVSWidth->Invalidate();
                 Invalidate();
                 maVSWidth->StartSelection();
             }
@@ -326,7 +328,8 @@ IMPL_LINK(LineWidthControl, MFModifyHdl, void *, pControl)
         if(maVSWidth->GetSelItem())
         {
             maVSWidth->SetSelItem(0);
-            maVSWidth->Format();
+            maVSWidth->SetFormat();
+            maVSWidth->Invalidate();
             Invalidate();
             maVSWidth->StartSelection();
         }

svx/source/sidebar/text/TextCharacterSpacingControl.cxx

@@ -300,7 +300,8 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l
         maFTBy->Disable();
     }
     GetFocus();
-    maVSSpacing->Format();
+    maVSSpacing->SetFormat();
+    maVSSpacing->Invalidate();
     maVSSpacing->StartSelection();
 }
 IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl)
@@ -365,7 +366,8 @@ IMPL_LINK(TextCharacterSpacingControl, VSSelHdl, void *, pControl)
             else
             {
                 maVSSpacing->SetNoSelection();       //add , set no selection and keep the last select item
-                maVSSpacing->Format();
+                maVSSpacing->SetFormat();
+                maVSSpacing->Invalidate();
                 Invalidate();
                 maVSSpacing->StartSelection();
             }
@@ -399,7 +401,8 @@ IMPL_LINK(TextCharacterSpacingControl, KerningSelectHdl, ListBox*,)
     {
         maVSSpacing->SetNoSelection();
         maVSSpacing->SelectItem(0);
-        maVSSpacing->Format();
+        maVSSpacing->SetFormat();
+        maVSSpacing->Invalidate();
         Invalidate();
         maVSSpacing->StartSelection();
     }
@@ -412,7 +415,8 @@ IMPL_LINK(TextCharacterSpacingControl, KerningModifyHdl, MetricField*,)
     {
         maVSSpacing->SetNoSelection();
         maVSSpacing->SelectItem(0);
-        maVSSpacing->Format();
+        maVSSpacing->SetFormat();
+        maVSSpacing->Invalidate();
         Invalidate();
         maVSSpacing->StartSelection();
     }

sw/source/ui/frmdlg/column.cxx

@@ -1349,9 +1349,9 @@ void SwColumnPage::SetInSection(bool bSet)
     m_pTextDirectionLB->Show(bSet);
 }
 
-void ColumnValueSet::UserDraw( const UserDrawEvent& rUDEvt )
+void ColumnValueSet::UserDraw(const UserDrawEvent& rUDEvt)
 {
-    OutputDevice*  pDev = rUDEvt.GetDevice();
+    OutputDevice* pDev = rUDEvt.GetDevice();
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
 
     Rectangle aRect = rUDEvt.GetRect();
@@ -1419,7 +1419,8 @@ void ColumnValueSet::DataChanged( const DataChangedEvent& rDCEvt )
     if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
          (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
     {
-        Format();
+        SetFormat();
+        Invalidate();
     }
     ValueSet::DataChanged( rDCEvt );
 }

sw/source/uibase/sidebar/PageColumnControl.cxx

@@ -66,7 +66,8 @@ PageColumnControl::PageColumnControl(
     mpColumnValueSet->SetSelectHdl( LINK(this, PageColumnControl,ImplColumnHdl ) );
     mpColumnValueSet->Show();
     mpColumnValueSet->SelectItem( mnColumnType );
-    mpColumnValueSet->Format();
+    mpColumnValueSet->SetFormat();
+    mpColumnValueSet->Invalidate();
     mpColumnValueSet->StartSelection();
 
     maMoreButton->SetClickHdl( LINK( this, PageColumnControl, MoreButtonClickHdl_Impl ) );

sw/source/uibase/sidebar/PageMarginControl.cxx

@@ -318,8 +318,8 @@ void PageMarginControl::SelectValueSetItem()
     {
         mpMarginValueSet->SelectItem(0);
     }
-
-    mpMarginValueSet->Format();
+    mpMarginValueSet->SetFormat();
+    mpMarginValueSet->Invalidate();
     mpMarginValueSet->StartSelection();
 };
 
@@ -405,7 +405,8 @@ IMPL_LINK( PageMarginControl, ModifyLRMarginHdl, MetricField *, )
 {
     mpMarginValueSet->SetNoSelection();
     mpMarginValueSet->SelectItem(0);
-    mpMarginValueSet->Format();
+    mpMarginValueSet->SetFormat();
+    mpMarginValueSet->Invalidate();
     mpMarginValueSet->StartSelection();
 
     mnPageLeftMargin = GetCoreValue( *maLeftMarginEdit.get(), meUnit );
@@ -419,7 +420,8 @@ IMPL_LINK( PageMarginControl, ModifyULMarginHdl, MetricField *, )
 {
     mpMarginValueSet->SetNoSelection();
     mpMarginValueSet->SelectItem(0);
-    mpMarginValueSet->Format();
+    mpMarginValueSet->SetFormat();
+    mpMarginValueSet->Invalidate();
     mpMarginValueSet->StartSelection();
 
     mnPageTopMargin = GetCoreValue( *maTopMarginEdit.get(), meUnit );

sw/source/uibase/sidebar/PageOrientationControl.cxx

@@ -55,7 +55,8 @@ PageOrientationControl::PageOrientationControl(
     mpOrientationValueSet->Show();
     mpOrientationValueSet->SelectItem( mbLandscape ? 2 : 1 );
     mpOrientationValueSet->GrabFocus();
-    mpOrientationValueSet->Format();
+    mpOrientationValueSet->SetFormat();
+    mpOrientationValueSet->Invalidate();
     mpOrientationValueSet->StartSelection();
 
     FreeResource();

sw/source/uibase/sidebar/PageSizeControl.cxx

@@ -132,7 +132,8 @@ PageSizeControl::PageSizeControl(
     mpSizeValueSet->Show();
 
     mpSizeValueSet->SelectItem( nSelectedItem );
-    mpSizeValueSet->Format();
+    mpSizeValueSet->SetFormat();
+    mpSizeValueSet->Invalidate();
     mpSizeValueSet->StartSelection();
 
     maMoreButton->SetClickHdl( LINK( this, PageSizeControl, MoreButtonClickHdl_Impl ) );