diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-04-09 09:58:27 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-04-09 12:07:36 +0200 |
| commit | 05a8749ee6f251d4b92eecb97763fa1fe94c68c8 (patch) | |
| tree | 78c2be178e4e7fe3206cbe94a4751e16e8026d0a /cui | |
| parent | 13f449221e550c84bb60c368b2520148104e6da9 (diff) | |
remove some usages of BitmapColor outside of VCL
You get BitmapColor only from reading pixels from a Bitmap and
we want to avoid usage of Bitmap outside of VCL (and use BitmapEx
as the alternative which will eventually replace Bitmap).
Change-Id: Iddfa3ef739bfdd4dce5fb47fd9f67a5a36f3388b
Reviewed-on: https://gerrit.libreoffice.org/70447
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/tppattern.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 878c1ae8b98d..0bb433f00c65 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -296,9 +296,9 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, SvtValueSet*, void) if(pGraphicObject) { - BitmapColor aBack; - BitmapColor aFront; - bool bIs8x8(vcl::bitmap::isHistorical8x8(pGraphicObject->GetGraphic().GetBitmapEx(), aBack, aFront)); + Color aBackColor; + Color aPixelColor; + bool bIs8x8(vcl::bitmap::isHistorical8x8(pGraphicObject->GetGraphic().GetBitmapEx(), aBackColor, aPixelColor)); m_xLbColor->SetNoSelection(); m_xLbBackgroundColor->SetNoSelection(); @@ -313,9 +313,6 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, SvtValueSet*, void) m_xCtlPixel->SetXBitmap(pGraphicObject->GetGraphic().GetBitmapEx()); - Color aPixelColor = aFront.GetColor(); - Color aBackColor = aBack.GetColor(); - m_xLbColor->SelectEntry( aPixelColor ); m_xLbBackgroundColor->SelectEntry( aBackColor ); |