tdf#92600: Restore ability to apply font settings to controls

SmShowSymbol handles font/fg/bg settings by itself, so make
ApplySettings noop there.

This partially reverts commit b010e4074e5d5ee3a3905f1351f04efafe937c2a

Change-Id: Ib5074684ef1277d9b9b4646bd73dce4cbff3943e
Reviewed-on: https://gerrit.libreoffice.org/17288
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 5 insertions, 15 deletions

diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 61a1ad787df6..6062d1a49d4d 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -36,8 +36,6 @@ using namespace vcl;
 void Control::ImplInitControlData()
 {
     mbHasControlFocus       = false;
-    mbFont                  = false;
-    mbForeground            = false;
     mbShowAccelerator       = false;
     mpControlData   = new ImplControlData;
 }
@@ -425,23 +423,15 @@ void Control::ApplySettings(vcl::RenderContext& rRenderContext)
 {
     const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
 
-    if (mbFont)
-    {
-        vcl::Font rFont(GetCanonicalFont(rStyleSettings));
-        ApplyControlFont(rRenderContext, rFont);
-    }
+    vcl::Font rFont(GetCanonicalFont(rStyleSettings));
+    ApplyControlFont(rRenderContext, rFont);
 
-    if (mbFont || mbForeground)
-    {
-        ApplyControlForeground(rRenderContext, GetCanonicalTextColor(rStyleSettings));
-        rRenderContext.SetTextFillColor();
-    }
+    ApplyControlForeground(rRenderContext, GetCanonicalTextColor(rStyleSettings));
+    rRenderContext.SetTextFillColor();
 }
 
-void Control::ImplInitSettings(const bool _bFont, const bool _bForeground)
+void Control::ImplInitSettings(const bool, const bool)
 {
-    mbFont = _bFont;
-    mbForeground = _bForeground;
     ApplySettings(*this);
 }