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 | |
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')
-rw-r--r-- | vcl/source/app/settings.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/button.cxx | 24 | ||||
-rw-r--r-- | vcl/source/gdi/gdimetafiletools.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/pngread.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/decoview.cxx | 2 |
6 files changed, 19 insertions, 19 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index f7c35931ee60..f9eaf47ce645 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2159,7 +2159,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot if ( nIndex > 0 ) { OUString aColor = aPersonaSettings.getToken( 0, ';', ++nIndex ); - rMenuBarTextColor = Color( aColor.toUInt64( 16 ) ); + rMenuBarTextColor = Color( aColor.toUInt32( 16 ) ); } } 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) diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index 389a323f5d21..2170f2a9be2a 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -165,7 +165,7 @@ namespace aVDev->SetOutputSizePixel(aSizePixel); aVDev->EnableMapMode(false); - aVDev->SetFillColor(COL_WHITE); + aVDev->SetFillColor( COL_WHITE); aVDev->SetLineColor(); if(rBitmapEx.IsTransparent()) diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index a9996b08d105..42bad03edd9e 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -2412,7 +2412,7 @@ BitmapChecksum GDIMetaFile::GetChecksum() const BCToBCOA( pAct->GetBitmap().GetChecksum(), aBCOA ); nCrc = vcl_get_checksum( nCrc, aBCOA, BITMAP_CHECKSUM_SIZE ); - UInt32ToSVBT32( pAct->GetColor().GetColor(), aBT32 ); + UInt32ToSVBT32( sal_uInt32(pAct->GetColor()), aBT32 ); nCrc = vcl_get_checksum( nCrc, aBT32, 4 ); UInt32ToSVBT32( pAct->GetPoint().X(), aBT32 ); @@ -2433,7 +2433,7 @@ BitmapChecksum GDIMetaFile::GetChecksum() const BCToBCOA( pAct->GetBitmap().GetChecksum(), aBCOA ); nCrc = vcl_get_checksum( nCrc, aBCOA, BITMAP_CHECKSUM_SIZE ); - UInt32ToSVBT32( pAct->GetColor().GetColor(), aBT32 ); + UInt32ToSVBT32( sal_uInt32(pAct->GetColor()), aBT32 ); nCrc = vcl_get_checksum( nCrc, aBT32, 4 ); UInt32ToSVBT32( pAct->GetPoint().X(), aBT32 ); @@ -2460,7 +2460,7 @@ BitmapChecksum GDIMetaFile::GetChecksum() const BCToBCOA( pAct->GetBitmap().GetChecksum(), aBCOA ); nCrc = vcl_get_checksum( nCrc, aBCOA, BITMAP_CHECKSUM_SIZE ); - UInt32ToSVBT32( pAct->GetColor().GetColor(), aBT32 ); + UInt32ToSVBT32( sal_uInt32(pAct->GetColor()), aBT32 ); nCrc = vcl_get_checksum( nCrc, aBT32, 4 ); UInt32ToSVBT32( pAct->GetDestPoint().X(), aBT32 ); diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 49844f028cd6..446dd6784904 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -804,7 +804,7 @@ bool PNGReaderImpl::ImplReadTransparent() return false; mcOpaqueColor = BitmapColor( 0x00 ); mcTranspColor = BitmapColor( 0xFF ); - mpMaskAcc->Erase( 0x00 ); + mpMaskAcc->Erase( Color(0,0,0) ); } return true; diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index 7d007b4d6dd7..e44eba19e727 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -438,7 +438,7 @@ void ImplDrawButton( OutputDevice *const pDev, tools::Rectangle aFillRect, if ( (nStyle & DrawButtonFlags::Mono) || (rStyleSettings.GetOptions() & StyleSettingsOptions::Mono) ) { - const Color aBlackColor( COL_BLACK ); + const Color aBlackColor(COL_BLACK); if ( nStyle & DrawButtonFlags::Default ) { |