From 25a0bd7b909fb8c87387d1413060f6c4ba5a51bd Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date: Mon, 11 May 2015 09:41:13 +0900
Subject: refactor TreeListBox to use RenderContext

Change-Id: I901a1f1f9732fb66718dca34c698a851e5b0d87f
---
 dbaccess/source/ui/app/AppDetailView.cxx     |  2 +-
 dbaccess/source/ui/control/listviewitems.cxx | 19 ++++++++++---------
 dbaccess/source/ui/inc/listviewitems.hxx     |  4 ++--
 dbaccess/source/ui/misc/WNameMatch.cxx       | 16 ++++++++++------
 4 files changed, 23 insertions(+), 18 deletions(-)

(limited to 'dbaccess')

diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 9e55993df84f..8fa399e363d2 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -85,7 +85,7 @@ OCreationList::OCreationList( OTasksWindow& _rParent )
     EnableEntryMnemonics();
 }
 
-void OCreationList::Paint( vcl::RenderContext& rRenderContext, const Rectangle& _rRect )
+void OCreationList::Paint(vcl::RenderContext& rRenderContext, const Rectangle& _rRect )
 {
     if ( m_pMouseDownEntry )
         m_aOriginalFont = GetFont();
diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx
index c81018cb0720..3120d08d89e9 100644
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@ -44,22 +44,23 @@ namespace dbaui
         return SV_ITEM_ID_BOLDLBSTRING;
     }
 
-    void OBoldListboxString::Paint(
-        const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView,
-        const SvTreeListEntry* pEntry)
+    void OBoldListboxString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
+                                   const SvViewDataEntry* pView, const SvTreeListEntry* pEntry)
     {
         if (m_bEmphasized)
         {
-            rDev.Push(PushFlags::ALL);
-            vcl::Font aFont( rDev.GetFont());
+            rRenderContext.Push(PushFlags::ALL);
+            vcl::Font aFont(rRenderContext.GetFont());
             aFont.SetWeight(WEIGHT_BOLD);
-            rDev.SetFont( aFont );
+            rRenderContext.SetFont(aFont);
             Point aPos(rPos);
-            rDev.DrawText( aPos, GetText() );
-            rDev.Pop();
+            rRenderContext.DrawText(aPos, GetText());
+            rRenderContext.Pop();
         }
         else
-            SvLBoxString::Paint(rPos, rDev, pView, pEntry);
+        {
+            SvLBoxString::Paint(rPos, rDev, rRenderContext, pView, pEntry);
+        }
     }
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx
index 240e12f479e7..8703e34c85de 100644
--- a/dbaccess/source/ui/inc/listviewitems.hxx
+++ b/dbaccess/source/ui/inc/listviewitems.hxx
@@ -41,8 +41,8 @@ namespace dbaui
 
         virtual sal_uInt16 GetType() const SAL_OVERRIDE;
 
-        virtual void Paint(
-            const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE;
+        virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext,
+                           const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE;
         virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* _pViewData) SAL_OVERRIDE;
 
         bool    isEmphasized() const { return m_bEmphasized; }
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index b1763b47356f..cf2c49f7b5c1 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -349,18 +349,22 @@ public:
     {
     }
 
-    virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE;
+    virtual void Paint(const Point& rPos, SvTreeListBox& /*rDev*/, vcl::RenderContext& rRenderContext,
+                       const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE;
 };
 
-void OColumnString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/)
+void OColumnString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext,
+                          const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/)
 {
+    rRenderContext.Push(PushFlags::TEXTCOLOR | PushFlags::TEXTFILLCOLOR);
     if(m_bReadOnly)
     {
-        const StyleSettings& rStyleSettings = rDev.GetSettings().GetStyleSettings();
-        rDev.SetTextColor( rStyleSettings.GetDisableColor() );
-        rDev.SetTextFillColor( rStyleSettings.GetFieldColor() );
+        const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
+        rRenderContext.SetTextColor(rStyleSettings.GetDisableColor());
+        rRenderContext.SetTextFillColor(rStyleSettings.GetFieldColor());
     }
-    rDev.DrawText( rPos, GetText() );
+    rRenderContext.DrawText(rPos, GetText());
+    rRenderContext.Pop();
 }
 
 OColumnTreeBox::OColumnTreeBox( vcl::Window* pParent, WinBits nBits )
-- 
cgit