LOK: custom widgets: reduce Color into an int to reduce API surface

Change-Id: Ib1afbb0b5647048f24d4ea6f9859b76328568dac

1 files changed, 37 insertions, 37 deletions

diff --git a/vcl/headless/CustomWidgetDraw.cxx b/vcl/headless/CustomWidgetDraw.cxx
index d1454911489f..cadc41e85452 100644
--- a/vcl/headless/CustomWidgetDraw.cxx
+++ b/vcl/headless/CustomWidgetDraw.cxx
@@ -318,55 +318,55 @@ bool CustomWidgetDraw::updateSettings(AllSettings& rSettings)
         StyleSettings aStyleSet = rSettings.GetStyleSettings();
 
         aStyleSet.SetFaceColor(aStyle.maFaceColor);
-        aStyleSet.SetCheckedColor(Color(0xCC, 0xCC, 0xCC));
+        aStyleSet.SetCheckedColor(aStyle.maCheckedColor);
         aStyleSet.SetLightColor(aStyle.maLightColor);
         aStyleSet.SetLightBorderColor(aStyle.maLightBorderColor);
         aStyleSet.SetShadowColor(aStyle.maShadowColor);
         aStyleSet.SetDarkShadowColor(aStyle.maDarkShadowColor);
-        aStyleSet.SetButtonTextColor(Color(COL_BLACK));
-        aStyleSet.SetButtonRolloverTextColor(Color(COL_BLACK));
-        aStyleSet.SetRadioCheckTextColor(Color(COL_BLACK));
-        aStyleSet.SetGroupTextColor(Color(COL_BLACK));
-        aStyleSet.SetLabelTextColor(Color(COL_BLACK));
+        aStyleSet.SetButtonTextColor(aStyle.maButtonTextColor);
+        aStyleSet.SetButtonRolloverTextColor(aStyle.maButtonRolloverTextColor);
+        aStyleSet.SetRadioCheckTextColor(aStyle.maRadioCheckTextColor);
+        aStyleSet.SetGroupTextColor(aStyle.maGroupTextColor);
+        aStyleSet.SetLabelTextColor(aStyle.maLabelTextColor);
         aStyleSet.SetWindowColor(aStyle.maWindowColor);
         aStyleSet.SetWindowTextColor(aStyle.maWindowTextColor);
         aStyleSet.SetDialogColor(aStyle.maDialogColor);
         aStyleSet.SetDialogTextColor(aStyle.maDialogTextColor);
-        aStyleSet.SetWorkspaceColor(Color(0xDF, 0xDF, 0xDE));
-        aStyleSet.SetMonoColor(Color(COL_BLACK));
-        aStyleSet.SetFieldColor(Color(aStyle.maFaceColor));
-        aStyleSet.SetFieldTextColor(Color(COL_BLACK));
-        aStyleSet.SetFieldRolloverTextColor(Color(COL_BLACK));
-        aStyleSet.SetActiveColor(Color(COL_BLUE));
-        aStyleSet.SetActiveTextColor(Color(COL_WHITE));
-        aStyleSet.SetActiveBorderColor(Color(COL_LIGHTGRAY));
-        aStyleSet.SetDeactiveColor(Color(COL_GRAY));
-        aStyleSet.SetDeactiveTextColor(Color(COL_LIGHTGRAY));
-        aStyleSet.SetDeactiveBorderColor(Color(COL_LIGHTGRAY));
-        aStyleSet.SetMenuColor(Color(COL_WHITE));
-        aStyleSet.SetMenuBarColor(Color(COL_WHITE));
-        aStyleSet.SetMenuBarRolloverColor(aStyle.maHighlightColor);
-        aStyleSet.SetMenuBorderColor(Color(COL_LIGHTGRAY));
-        aStyleSet.SetMenuTextColor(Color(COL_BLACK));
-        aStyleSet.SetMenuBarTextColor(Color(COL_BLACK));
-        aStyleSet.SetMenuBarRolloverTextColor(Color(COL_BLACK));
-        aStyleSet.SetMenuBarHighlightTextColor(Color(COL_BLACK));
-        aStyleSet.SetMenuHighlightColor(aStyle.maHighlightColor);
-        aStyleSet.SetMenuHighlightTextColor(Color(COL_BLACK));
+        aStyleSet.SetWorkspaceColor(aStyle.maWorkspaceColor);
+        aStyleSet.SetMonoColor(aStyle.maMonoColor);
+        aStyleSet.SetFieldColor(Color(aStyle.maFieldColor));
+        aStyleSet.SetFieldTextColor(aStyle.maFieldTextColor);
+        aStyleSet.SetFieldRolloverTextColor(aStyle.maFieldRolloverTextColor);
+        aStyleSet.SetActiveColor(aStyle.maActiveColor);
+        aStyleSet.SetActiveTextColor(aStyle.maActiveTextColor);
+        aStyleSet.SetActiveBorderColor(aStyle.maActiveBorderColor);
+        aStyleSet.SetDeactiveColor(aStyle.maDeactiveColor);
+        aStyleSet.SetDeactiveTextColor(aStyle.maDeactiveTextColor);
+        aStyleSet.SetDeactiveBorderColor(aStyle.maDeactiveBorderColor);
+        aStyleSet.SetMenuColor(aStyle.maMenuColor);
+        aStyleSet.SetMenuBarColor(aStyle.maMenuBarColor);
+        aStyleSet.SetMenuBarRolloverColor(aStyle.maMenuBarRolloverColor);
+        aStyleSet.SetMenuBorderColor(aStyle.maMenuBorderColor);
+        aStyleSet.SetMenuTextColor(aStyle.maMenuTextColor);
+        aStyleSet.SetMenuBarTextColor(aStyle.maMenuBarTextColor);
+        aStyleSet.SetMenuBarRolloverTextColor(aStyle.maMenuBarRolloverTextColor);
+        aStyleSet.SetMenuBarHighlightTextColor(aStyle.maMenuBarHighlightTextColor);
+        aStyleSet.SetMenuHighlightColor(aStyle.maMenuHighlightColor);
+        aStyleSet.SetMenuHighlightTextColor(aStyle.maMenuHighlightTextColor);
         aStyleSet.SetHighlightColor(aStyle.maHighlightColor);
         aStyleSet.SetHighlightTextColor(aStyle.maHighlightTextColor);
         aStyleSet.SetActiveTabColor(aStyle.maActiveTabColor);
         aStyleSet.SetInactiveTabColor(aStyle.maInactiveTabColor);
-        aStyleSet.SetTabTextColor(Color(COL_BLACK));
-        aStyleSet.SetTabRolloverTextColor(Color(COL_BLACK));
-        aStyleSet.SetTabHighlightTextColor(Color(COL_BLACK));
-        aStyleSet.SetDisableColor(Color(COL_GRAY));
-        aStyleSet.SetHelpColor(Color(0xFF, 0xFF, 0xE0));
-        aStyleSet.SetHelpTextColor(Color(COL_BLACK));
-        aStyleSet.SetLinkColor(Color(COL_BLUE));
-        aStyleSet.SetVisitedLinkColor(Color(0x00, 0x00, 0xCC));
-        aStyleSet.SetToolTextColor(Color(COL_BLACK));
-        aStyleSet.SetFontColor(Color(COL_BLACK));
+        aStyleSet.SetTabTextColor(aStyle.maTabTextColor);
+        aStyleSet.SetTabRolloverTextColor(aStyle.maTabRolloverTextColor);
+        aStyleSet.SetTabHighlightTextColor(aStyle.maTabHighlightTextColor);
+        aStyleSet.SetDisableColor(aStyle.maDisableColor);
+        aStyleSet.SetHelpColor(aStyle.maHelpColor);
+        aStyleSet.SetHelpTextColor(aStyle.maHelpTextColor);
+        aStyleSet.SetLinkColor(aStyle.maLinkColor);
+        aStyleSet.SetVisitedLinkColor(aStyle.maVisitedLinkColor);
+        aStyleSet.SetToolTextColor(aStyle.maToolTextColor);
+        aStyleSet.SetFontColor(aStyle.maFontColor);
 
         rSettings.SetStyleSettings(aStyleSet);