diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 17:13:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-28 07:34:27 +0100 |
| commit | e2cb154195fdc2ffccdb6f5e87cae8b29640b3eb (patch) | |
| tree | 7c3d53d78e0867aa879b98d84211d1e73602520f /toolkit | |
| parent | 0ea41fea75cd1ac1d81fa57c4411e75a6b4001f0 (diff) | |
convert COL_ constants to be of type Color
Change-Id: I0e25c8950ac26b851ff42f71e1471fcbe4770d48
Reviewed-on: https://gerrit.libreoffice.org/50373
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/helper/formpdfexport.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index e0d435abdf7c..b03e081767d9 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -129,7 +129,7 @@ namespace toolkit aStyleSettings.SetCheckedColor( aBackground ); sal_Int32 nBackgroundLuminance = Color( nBackgroundColor ).GetLuminance(); - sal_Int32 nWhiteLuminance = Color(COL_WHITE).GetLuminance(); + sal_Int32 nWhiteLuminance = COL_WHITE.GetLuminance(); Color aLightShadow( nBackgroundColor ); aLightShadow.IncreaseLuminance( static_cast<sal_uInt8>( ( nWhiteLuminance - nBackgroundLuminance ) * 2 / 3 ) ); diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index 567f0a0d91e2..3d790c70b11e 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -314,9 +314,9 @@ namespace toolkitform OUString sBorderColorPropertyName( "BorderColor" ); if ( xPSI->hasPropertyByName( sBorderColorPropertyName ) ) { - sal_Int32 nBorderColor = COL_TRANSPARENT; + Color nBorderColor = COL_TRANSPARENT; if ( xModelProps->getPropertyValue( sBorderColorPropertyName ) >>= nBorderColor ) - Descriptor->BorderColor = Color( nBorderColor ); + Descriptor->BorderColor = nBorderColor; else Descriptor->BorderColor = COL_BLACK; } @@ -328,10 +328,10 @@ namespace toolkitform static const char FM_PROP_BACKGROUNDCOLOR[] = "BackgroundColor"; if ( xPSI->hasPropertyByName( FM_PROP_BACKGROUNDCOLOR ) ) { - sal_Int32 nBackColor = COL_TRANSPARENT; + Color nBackColor = COL_TRANSPARENT; xModelProps->getPropertyValue( FM_PROP_BACKGROUNDCOLOR ) >>= nBackColor; Descriptor->Background = true; - Descriptor->BackgroundColor = Color( nBackColor ); + Descriptor->BackgroundColor = nBackColor; } @@ -339,9 +339,9 @@ namespace toolkitform static const char FM_PROP_TEXTCOLOR[] = "TextColor"; if ( xPSI->hasPropertyByName( FM_PROP_TEXTCOLOR ) ) { - sal_Int32 nTextColor = COL_TRANSPARENT; + Color nTextColor = COL_TRANSPARENT; xModelProps->getPropertyValue( FM_PROP_TEXTCOLOR ) >>= nTextColor; - Descriptor->TextColor = Color( nTextColor ); + Descriptor->TextColor = nTextColor; } |