drop newly unused StyleSettings::GetFontColor

Change-Id: Icd20283207e9ac0392d11d74553d7c607330dbe1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140895
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

9 files changed, 7 insertions, 62 deletions

diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 4926c4b4c509..9d865544bd51 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -546,9 +546,6 @@ public:
 
     static bool                     GetDockingFloatsSupported();
 
-    void                            SetFontColor( const Color& rColor );
-    const Color&                    GetFontColor() const;
-
     void                            SetToolbarIconSize( ToolbarIconSize nSize );
     ToolbarIconSize                 GetToolbarIconSize() const;
     Size                            GetToolbarIconSizePixel() const;
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 72556dd106dd..48889833f716 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -97,8 +97,6 @@ public:
     bool GetAutoDetectSystemHC() const {return m_bAutoDetectSystemHC;}
 
     DECL_LINK( DataChangedEventListener, VclSimpleEvent&, void );
-
-    void ImplUpdateApplicationSettings();
 };
 
 namespace {
@@ -196,8 +194,6 @@ ColorConfig_Impl::ColorConfig_Impl() :
     if (!utl::ConfigManager::IsFuzzing())
         Load(OUString());
 
-    ImplUpdateApplicationSettings();
-
     ::Application::AddEventListener( LINK(this, ColorConfig_Impl, DataChangedEventListener) );
 
 }
@@ -331,8 +327,6 @@ void ColorConfig_Impl::SettingsChanged()
 {
     SolarMutexGuard aVclGuard;
 
-    ImplUpdateApplicationSettings();
-
     NotifyListeners(ConfigurationHints::NONE);
 }
 
@@ -349,32 +343,6 @@ IMPL_LINK( ColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent,
     }
 }
 
-
-/** updates the font color in the vcl window settings */
-void ColorConfig_Impl::ImplUpdateApplicationSettings()
-{
-    Application* pApp = GetpApp();
-    if( !pApp )
-        return;
-
-    AllSettings aSettings = Application::GetSettings();
-    StyleSettings aStyleSettings( aSettings.GetStyleSettings() );
-
-    ColorConfigValue aRet = GetColorConfigValue(svtools::FONTCOLOR);
-    if(COL_AUTO == aRet.nColor)
-        aRet.nColor = ColorConfig::GetDefaultColor(svtools::FONTCOLOR);
-
-    Color aFontColor(aRet.nColor);
-
-    if( aStyleSettings.GetFontColor() != aFontColor )
-    {
-        aStyleSettings.SetFontColor( aFontColor );
-
-        aSettings.SetStyleSettings( aStyleSettings );
-        Application::SetSettings( aSettings );
-    }
-}
-
 ColorConfig::ColorConfig()
 {
     if (utl::ConfigManager::IsFuzzing())
diff --git a/vcl/inc/widgetdraw/WidgetDefinition.hxx b/vcl/inc/widgetdraw/WidgetDefinition.hxx
index b38b985ca229..7ba1ce0e8ae6 100644
--- a/vcl/inc/widgetdraw/WidgetDefinition.hxx
+++ b/vcl/inc/widgetdraw/WidgetDefinition.hxx
@@ -278,7 +278,6 @@ public:
     Color maLinkColor;
     Color maVisitedLinkColor;
     Color maToolTextColor;
-    Color maFontColor;
 };
 
 class VCL_DLLPUBLIC WidgetDefinition
diff --git a/vcl/qa/cppunit/drawmode.cxx b/vcl/qa/cppunit/drawmode.cxx
index e3792ae1f29f..9a1408bb2ec9 100644
--- a/vcl/qa/cppunit/drawmode.cxx
+++ b/vcl/qa/cppunit/drawmode.cxx
@@ -60,7 +60,7 @@ void VclDrawModeTest::testDrawModeLineColor()
         Color(cLum, cLum, cLum),
         vcl::drawmode::GetLineColor(aColor, DrawModeFlags::GrayLine, aStyleSettings));
     CPPUNIT_ASSERT_EQUAL(
-        aStyleSettings.GetFontColor(),
+        aStyleSettings.GetWindowTextColor(),
         vcl::drawmode::GetLineColor(aColor, DrawModeFlags::SettingsLine, aStyleSettings));
 
     Color aTransparentRed = COL_RED;
@@ -180,7 +180,7 @@ void VclDrawModeTest::testDrawModeHatchColor()
         Color(cLum, cLum, cLum),
         vcl::drawmode::GetHatchColor(aColor, DrawModeFlags::GrayLine, aStyleSettings));
     CPPUNIT_ASSERT_EQUAL(
-        aStyleSettings.GetFontColor(),
+        aStyleSettings.GetWindowTextColor(),
         vcl::drawmode::GetHatchColor(aColor, DrawModeFlags::SettingsLine, aStyleSettings));
 
     // noops
@@ -224,7 +224,7 @@ void VclDrawModeTest::testDrawModeTextColor()
         Color(cLum, cLum, cLum),
         vcl::drawmode::GetTextColor(aColor, DrawModeFlags::GrayText, aStyleSettings));
     CPPUNIT_ASSERT_EQUAL(
-        aStyleSettings.GetFontColor(),
+        aStyleSettings.GetWindowTextColor(),
         vcl::drawmode::GetTextColor(aColor, DrawModeFlags::SettingsText, aStyleSettings));
 
     // noops
@@ -318,13 +318,13 @@ void VclDrawModeTest::testDrawModeFontColor()
     aFont.SetTransparent(false);
     aTestFont = vcl::drawmode::GetFont(
         aFont, DrawModeFlags::SettingsText | DrawModeFlags::SettingsFill, aStyleSettings);
-    CPPUNIT_ASSERT_EQUAL(aStyleSettings.GetFontColor(), aTestFont.GetColor());
+    CPPUNIT_ASSERT_EQUAL(aStyleSettings.GetWindowTextColor(), aTestFont.GetColor());
     CPPUNIT_ASSERT_EQUAL(aStyleSettings.GetWindowColor(), aTestFont.GetFillColor());
 
     aFont.SetTransparent(true);
     aTestFont = vcl::drawmode::GetFont(
         aFont, DrawModeFlags::SettingsText | DrawModeFlags::SettingsFill, aStyleSettings);
-    CPPUNIT_ASSERT_EQUAL(aStyleSettings.GetFontColor(), aTestFont.GetColor());
+    CPPUNIT_ASSERT_EQUAL(aStyleSettings.GetWindowTextColor(), aTestFont.GetColor());
     CPPUNIT_ASSERT_EQUAL(COL_RED, aTestFont.GetFillColor());
 }
 
diff --git a/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx b/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx
index 480ff411012f..29b98f0eb280 100644
--- a/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx
+++ b/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx
@@ -90,7 +90,8 @@ void WidgetDefinitionReaderTest::testRead()
     CPPUNIT_ASSERT_EQUAL(OUString("ffffff"),
                          aDefinition.mpStyle->maVisitedLinkColor.AsRGBHexString());
     CPPUNIT_ASSERT_EQUAL(OUString("ffffff"), aDefinition.mpStyle->maToolTextColor.AsRGBHexString());
-    CPPUNIT_ASSERT_EQUAL(OUString("ffffff"), aDefinition.mpStyle->maFontColor.AsRGBHexString());
+    CPPUNIT_ASSERT_EQUAL(OUString("ffffff"),
+                         aDefinition.mpStyle->maWindowTextColor.AsRGBHexString());
 
     // Pushbutton
     {
diff --git a/vcl/qa/cppunit/widgetdraw/data/definition1.xml b/vcl/qa/cppunit/widgetdraw/data/definition1.xml
index 041e8fc24754..34e219618195 100644
--- a/vcl/qa/cppunit/widgetdraw/data/definition1.xml
+++ b/vcl/qa/cppunit/widgetdraw/data/definition1.xml
@@ -50,7 +50,6 @@
         <linkColor value="#FFFFFF"/>
         <visitedLinkColor value="#FFFFFF"/>
         <toolTextColor value="#FFFFFF"/>
-        <fontColor value="#FFFFFF"/>
     </style>
     <pushbutton>
         <part value="Entire">
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 98d2d42a4d41..3c990bd95b39 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -108,7 +108,6 @@ struct ImplStyleData
     Color                           maFieldColor;
     Color                           maFieldTextColor;
     Color                           maFieldRolloverTextColor;
-    Color                           maFontColor;
     Color                           maGroupTextColor;
     Color                           maHelpColor;
     Color                           maHelpTextColor;
@@ -533,7 +532,6 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
     maFieldColor( rData.maFieldColor ),
     maFieldTextColor( rData.maFieldTextColor ),
     maFieldRolloverTextColor( rData.maFieldRolloverTextColor ),
-    maFontColor( rData.maFontColor ),
     maGroupTextColor( rData.maGroupTextColor ),
     maHelpColor( rData.maHelpColor ),
     maHelpTextColor( rData.maHelpTextColor ),
@@ -726,7 +724,6 @@ void ImplStyleData::SetStandardStyles()
     maLinkColor                 = COL_BLUE;
     maVisitedLinkColor          = Color( 0x00, 0x00, 0xCC );
     maToolTextColor             = COL_BLACK;
-    maFontColor                 = COL_BLACK;
     maAlternatingRowColor       = Color( 0xEE, 0xEE, 0xEE );
 
     mnTitleHeight                   = 18;
@@ -2126,19 +2123,6 @@ StyleSettings::GetDockingFloatsSupported()
 }
 
 void
-StyleSettings::SetFontColor( const Color& rColor )
-{
-    CopyData();
-    mxData->maFontColor = rColor;
-}
-
-const Color&
-StyleSettings::GetFontColor() const
-{
-    return mxData->maFontColor;
-}
-
-void
 StyleSettings::SetToolbarIconSize( ToolbarIconSize nSize )
 {
     CopyData();
@@ -2581,7 +2565,6 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const
          (mxData->mbPreferredContextMenuShortcuts  == rSet.mxData->mbPreferredContextMenuShortcuts)&&
          (mxData->meContextMenuShortcuts    == rSet.mxData->meContextMenuShortcuts)     &&
          (mxData->mbPrimaryButtonWarpsSlider == rSet.mxData->mbPrimaryButtonWarpsSlider) &&
-         (mxData->maFontColor               == rSet.mxData->maFontColor)                &&
          (mxData->mnEdgeBlending                    == rSet.mxData->mnEdgeBlending)                     &&
          (mxData->maEdgeBlendingTopLeftColor        == rSet.mxData->maEdgeBlendingTopLeftColor)         &&
          (mxData->maEdgeBlendingBottomRightColor    == rSet.mxData->maEdgeBlendingBottomRightColor)     &&
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 88f4d6189a57..046dbbd05873 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -1082,7 +1082,6 @@ bool FileDefinitionWidgetDraw::updateSettings(AllSettings& rSettings)
     aStyleSet.SetLinkColor(pDefinitionStyle->maLinkColor);
     aStyleSet.SetVisitedLinkColor(pDefinitionStyle->maVisitedLinkColor);
     aStyleSet.SetToolTextColor(pDefinitionStyle->maToolTextColor);
-    aStyleSet.SetFontColor(pDefinitionStyle->maFontColor);
 
     auto& pSettings = m_pWidgetDefinition->mpSettings;
 
diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx b/vcl/source/gdi/WidgetDefinitionReader.cxx
index 6227e15dad08..b635c5e3f9b0 100644
--- a/vcl/source/gdi/WidgetDefinitionReader.cxx
+++ b/vcl/source/gdi/WidgetDefinitionReader.cxx
@@ -418,7 +418,6 @@ bool WidgetDefinitionReader::read(WidgetDefinition& rWidgetDefinition)
         { "linkColor", &pStyle->maLinkColor },
         { "visitedLinkColor", &pStyle->maVisitedLinkColor },
         { "toolTextColor", &pStyle->maToolTextColor },
-        { "fontColor", &pStyle->maFontColor },
     };
 
     rWidgetDefinition.mpStyle = pStyle;