diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-10-12 10:58:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-10-13 10:02:57 +0200 |
| commit | d28942e5b8f0c58a724e52133eb58b261949266e (patch) | |
| tree | 1be2d67d5eed9aea979775864d216efed536164c /vcl/qa/cppunit | |
| parent | b45867766184ad1200df4183dab537fac9e83ea2 (diff) | |
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>
Diffstat (limited to 'vcl/qa/cppunit')
| -rw-r--r-- | vcl/qa/cppunit/drawmode.cxx | 10 | ||||
| -rw-r--r-- | vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx | 3 | ||||
| -rw-r--r-- | vcl/qa/cppunit/widgetdraw/data/definition1.xml | 1 |
3 files changed, 7 insertions, 7 deletions
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"> |