diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-19 16:11:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-20 07:19:16 +0100 |
| commit | 19a906f09688f06ee90cac2a50126aeba749a331 (patch) | |
| tree | 66320878bd537b646f06afdbf2d2409e961f3024 /svtools | |
| parent | a7ee3cc31331353d307e4b7aaf7fe88721df6470 (diff) | |
drop Color::SetColor(ColorData) in favour of operator=
first stage of getting rid of ColorData
Change-Id: I5e4e95eb958722814c43c8d1ebfef17ad18c29ec
Reviewed-on: https://gerrit.libreoffice.org/49997
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/control/calendar.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/dialogs/colrdlg.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 266941dcf6d8..f8dbb98176e1 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -2713,9 +2713,9 @@ void SvxIconChoiceCtrl_Impl::ShowFocus ( tools::Rectangle const & rRect ) Color aPenColor; sal_uInt16 nColor = ( aBkgColor.GetRed() + aBkgColor.GetGreen() + aBkgColor.GetBlue() ) / 3; if (nColor > 128) - aPenColor.SetColor(COL_BLACK); + aPenColor = COL_BLACK; else - aPenColor.SetColor(COL_WHITE); + aPenColor = COL_WHITE; aFocus.aPenColor = aPenColor; aFocus.aRect = rRect; diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index c63e3ecf82de..962e35ade5c1 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -315,7 +315,7 @@ void Calendar::ImplFormat() // determine colours maOtherColor = Color( COL_LIGHTGRAY ); if ( maOtherColor.IsRGBEqual( GetBackground().GetColor() ) ) - maOtherColor.SetColor( COL_GRAY ); + maOtherColor = COL_GRAY; Date aLastDate = GetLastDate(); if ( (maOldFormatLastDate != aLastDate) || diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 941f9bbaa779..68aad12d8566 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -92,7 +92,7 @@ short SvColorDialog::Execute() sal_Int32 nColor = 0; if( props[n].Value >>= nColor ) { - maColor.SetColor( nColor ); + maColor = nColor; } } |