vcl: remove BitmapColor Color() operator

BitmapColor has a Color() operator. However, this is confusing and
tends to hide that the two classes aren't the same. I have converted this
to GetColor().

Disable some tests that are failing to build due to missing << operator.

Reviewed-on: https://gerrit.libreoffice.org/48245
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 01e470f0ab49e458c57b0f28636a517b2bfb1b4a)

Change-Id: I0be2dcb3fc420e7be9c8d04330e7a3fe69a5412a

1 files changed, 6 insertions, 4 deletions

diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
index bb297c922a05..1c6acece40d9 100644
--- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx
@@ -78,11 +78,13 @@ void FramePainter::AdaptColor (
     // Get the source color.
     if (maCenter.maBitmap.IsEmpty())
         return;
-    BitmapReadAccess* pReadAccess = maCenter.maBitmap.GetBitmap().AcquireReadAccess();
-    if (pReadAccess == nullptr)
+    Bitmap aBitmap = maCenter.maBitmap.GetBitmap();
+    Bitmap::ScopedReadAccess pReadAccess(aBitmap);
+    if (!pReadAccess)
         return;
-    const Color aSourceColor = pReadAccess->GetColor(0,0);
-    Bitmap::ReleaseAccess(pReadAccess);
+    const BitmapColor aBmpSourceColor = pReadAccess->GetColor(0,0);
+    const Color aSourceColor = aBmpSourceColor.GetColor();
+    pReadAccess.reset();
 
     // Erase the center bitmap.
     maCenter.maBitmap.SetEmpty();