diff options
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tppattern.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 5299989c9e57..1dadaeff3b52 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -448,7 +448,7 @@ void ColorFieldControl::ShowPosition( const Point& rPos, bool bUpdate ) if (pReadAccess != nullptr) { // mpBitmap always has a bit count of 24 => use of GetPixel(...) is safe - maColor = pReadAccess->GetPixel(nY, nX); + maColor = pReadAccess->GetPixel(nY, nX).GetColor(); Bitmap::ReleaseAccess(pReadAccess); pReadAccess = nullptr; } diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index cb4c7a3d7b88..74354dbdf904 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -321,8 +321,8 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, ValueSet*, void) m_pCtlPixel->SetXBitmap(pGraphicObject->GetGraphic().GetBitmapEx()); - Color aPixelColor = aFront; - Color aBackColor = aBack; + Color aPixelColor = aFront.GetColor(); + Color aBackColor = aBack.GetColor(); m_pLbColor->SelectEntry( aPixelColor ); m_pLbBackgroundColor->SelectEntry( aBackColor ); |