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 /forms | |
| 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 'forms')
| -rw-r--r-- | forms/source/component/formcontrolfont.cxx | 4 | ||||
| -rw-r--r-- | forms/source/component/imgprod.cxx | 4 | ||||
| -rw-r--r-- | forms/source/richtext/richtextcontrol.cxx | 2 | ||||
| -rw-r--r-- | forms/source/solar/component/navbarcontrol.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index d2c63d077193..c23f598e3976 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -172,7 +172,7 @@ namespace frm sal_Int32 FontControlModel::getTextColor( ) const { - sal_Int32 nColor = COL_TRANSPARENT; + sal_Int32 nColor(COL_TRANSPARENT); m_aTextColor >>= nColor; return nColor; } @@ -180,7 +180,7 @@ namespace frm sal_Int32 FontControlModel::getTextLineColor( ) const { - sal_Int32 nColor = COL_TRANSPARENT; + sal_Int32 nColor(COL_TRANSPARENT); m_aTextLineColor >>= nColor; return nColor; } diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 3985351032a1..3b161e3d6d2c 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -428,7 +428,7 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) if( pBmpAcc->HasPalette() ) { - const BitmapColor aWhite( pMskAcc->GetBestMatchingColor( Color(COL_WHITE) ) ); + const BitmapColor aWhite( pMskAcc->GetBestMatchingColor( COL_WHITE ) ); if( mnTransIndex < 256 ) { @@ -479,7 +479,7 @@ void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic ) else { css::uno::Sequence<sal_Int32> aData( nPartWidth * nPartHeight ); - const BitmapColor aWhite( pMskAcc->GetBestMatchingColor( Color(COL_WHITE) ) ); + const BitmapColor aWhite( pMskAcc->GetBestMatchingColor( COL_WHITE ) ); sal_Int32* pTmp = aData.getArray(); for( long nY = nStartY; nY <= nEndY; nY++ ) diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 08238d452db8..3939e1778160 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -357,7 +357,7 @@ namespace frm } else { - sal_Int32 nColor = COL_TRANSPARENT; + sal_Int32 nColor(COL_TRANSPARENT); _rValue >>= nColor; pControl->SetBackgroundColor( Color( nColor ) ); } diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 9c3d538340cb..e74d921a4b82 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -271,7 +271,7 @@ namespace frm bool bVoid = !_rValue.hasValue(); bool bBoolValue = false; - sal_Int32 nColor = COL_TRANSPARENT; + sal_Int32 nColor(COL_TRANSPARENT); // TODO: more generic mechanisms for this (the grid control implementation, // when used herein, will do the same stuff for lot of these) |