diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-06 10:42:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-07 07:08:34 +0100 |
| commit | b3ee860e523dce3df16350a4053a67f39c2f92f8 (patch) | |
| tree | 357c48461b3f62cc2773c959a5a11daf3c60c636 /vcl/source/control | |
| parent | 2407c183092d6559771738891d57d6375c4212ab (diff) | |
use more Color in vcl
Change-Id: Ia92c52d26b90898c1f7860128b478d1fada9d406
Reviewed-on: https://gerrit.libreoffice.org/50795
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/button.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index bffbd1e93b66..35400b70ed8a 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2756,15 +2756,15 @@ Image RadioButton::GetRadioImage( const AllSettings& rSettings, DrawButtonFlags if ( pSVData->maCtrlData.maRadioImgList.empty() || (pSVData->maCtrlData.mnRadioStyle != nStyle) || - (pSVData->maCtrlData.mnLastRadioFColor != rStyleSettings.GetFaceColor().GetColor()) || - (pSVData->maCtrlData.mnLastRadioWColor != rStyleSettings.GetWindowColor().GetColor()) || - (pSVData->maCtrlData.mnLastRadioLColor != rStyleSettings.GetLightColor().GetColor()) ) + (pSVData->maCtrlData.mnLastRadioFColor != rStyleSettings.GetFaceColor()) || + (pSVData->maCtrlData.mnLastRadioWColor != rStyleSettings.GetWindowColor()) || + (pSVData->maCtrlData.mnLastRadioLColor != rStyleSettings.GetLightColor()) ) { pSVData->maCtrlData.maRadioImgList.clear(); - pSVData->maCtrlData.mnLastRadioFColor = rStyleSettings.GetFaceColor().GetColor(); - pSVData->maCtrlData.mnLastRadioWColor = rStyleSettings.GetWindowColor().GetColor(); - pSVData->maCtrlData.mnLastRadioLColor = rStyleSettings.GetLightColor().GetColor(); + pSVData->maCtrlData.mnLastRadioFColor = rStyleSettings.GetFaceColor(); + pSVData->maCtrlData.mnLastRadioWColor = rStyleSettings.GetWindowColor(); + pSVData->maCtrlData.mnLastRadioLColor = rStyleSettings.GetLightColor(); std::vector<OUString> aResources; if (nStyle) @@ -3580,15 +3580,15 @@ Image CheckBox::GetCheckImage( const AllSettings& rSettings, DrawButtonFlags nFl if ( pSVData->maCtrlData.maCheckImgList.empty() || (pSVData->maCtrlData.mnCheckStyle != nStyle) || - (pSVData->maCtrlData.mnLastCheckFColor != rStyleSettings.GetFaceColor().GetColor()) || - (pSVData->maCtrlData.mnLastCheckWColor != rStyleSettings.GetWindowColor().GetColor()) || - (pSVData->maCtrlData.mnLastCheckLColor != rStyleSettings.GetLightColor().GetColor()) ) + (pSVData->maCtrlData.mnLastCheckFColor != rStyleSettings.GetFaceColor()) || + (pSVData->maCtrlData.mnLastCheckWColor != rStyleSettings.GetWindowColor()) || + (pSVData->maCtrlData.mnLastCheckLColor != rStyleSettings.GetLightColor()) ) { pSVData->maCtrlData.maCheckImgList.clear(); - pSVData->maCtrlData.mnLastCheckFColor = rStyleSettings.GetFaceColor().GetColor(); - pSVData->maCtrlData.mnLastCheckWColor = rStyleSettings.GetWindowColor().GetColor(); - pSVData->maCtrlData.mnLastCheckLColor = rStyleSettings.GetLightColor().GetColor(); + pSVData->maCtrlData.mnLastCheckFColor = rStyleSettings.GetFaceColor(); + pSVData->maCtrlData.mnLastCheckWColor = rStyleSettings.GetWindowColor(); + pSVData->maCtrlData.mnLastCheckLColor = rStyleSettings.GetLightColor(); std::vector<OUString> aResources; if (nStyle) |