summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-03 08:41:25 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-03 11:03:31 +0200
commit487fc22690c274c824264602212c4549b9b07b15 (patch)
tree0d20ac25269e2efa0e0eb453a6ab05de2a1a4ecb /svx
parent4967d498c486800b72ba34192c82c232bc0685bd (diff)
loplugin:unusedfields
Change-Id: I3d2cdd80b542dbdbd29971ef837111191809f081 Reviewed-on: https://gerrit.libreoffice.org/61282 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/fontlb.cxx12
1 files changed, 4 insertions, 8 deletions
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 3aacda90bec2..2df75372dffd 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -27,7 +27,6 @@
SvLBoxFontString::SvLBoxFontString()
: SvLBoxString()
- , mbUseColor(false)
{
}
@@ -44,13 +43,10 @@ void SvLBoxFontString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::Render
const SvViewDataEntry* pView, const SvTreeListEntry& rEntry)
{
rRenderContext.Push(PushFlags::FONT);
- vcl::Font aNewFont(maFont);
+ vcl::Font aNewFont;
bool bSel = pView->IsSelected();
- if (!mbUseColor || bSel) // selection always gets highlight color
- {
- const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
- aNewFont.SetColor(bSel ? rStyleSettings.GetHighlightTextColor() : rStyleSettings.GetFieldTextColor());
- }
+ const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
+ aNewFont.SetColor(bSel ? rStyleSettings.GetHighlightTextColor() : rStyleSettings.GetFieldTextColor());
rRenderContext.SetFont(aNewFont);
SvLBoxString::Paint(rPos, rDev, rRenderContext, pView, rEntry);
@@ -60,7 +56,7 @@ void SvLBoxFontString::Paint(const Point& rPos, SvTreeListBox& rDev, vcl::Render
void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData )
{
vcl::Font aOldFont( pView->GetFont() );
- pView->Control::SetFont( maFont );
+ pView->Control::SetFont( vcl::Font() );
SvLBoxString::InitViewData( pView, pEntry, pViewData);
pView->Control::SetFont( aOldFont );
}