BitmapEx->Bitmap in MetaBmpExScaleAction

now that Bitmap supports transparency

Disable part of the redaction test. I have
verified that the visual result of auto-image redaction
is the same before and after this change, but we
seem to end up with more rectangles than before.

Probably something weird inside the EMF/WMF machinery.
(see the fixMetaFile function).

Change-Id: I85f308ae66ddf7592e41fde1ab9e49f9c882146e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190338
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 4 insertions, 4 deletions

diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 82972b64e6cc..040f4d91231a 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -370,7 +370,7 @@ CPPUNIT_TEST_FIXTURE(VclOutdevTest, testDrawTransformedBitmapEx)
     MetaAction* pAction = aMtf.GetAction(0);
     CPPUNIT_ASSERT_EQUAL(MetaActionType::BMPEXSCALE, pAction->GetType());
     auto pBitmapAction = static_cast<MetaBmpExScaleAction*>(pAction);
-    const BitmapEx& rBitmapEx = pBitmapAction->GetBitmapEx();
+    const Bitmap& rBitmapEx = pBitmapAction->GetBitmap();
     Size aTransformedSize = rBitmapEx.GetSizePixel();
     // Without the accompanying fix in place, this test would have failed with:
     // - Expected: 16x16
@@ -378,7 +378,7 @@ CPPUNIT_TEST_FIXTURE(VclOutdevTest, testDrawTransformedBitmapEx)
     // I.e. the bitmap before scaling was already scaled down, just because it was rotated.
     CPPUNIT_ASSERT_EQUAL(Size(16, 16), aTransformedSize);
 
-    aBitmap = rBitmapEx.GetBitmap();
+    aBitmap = rBitmapEx.CreateColorBitmap();
     BitmapScopedReadAccess pAccess(aBitmap);
     for (int i = 0; i < 16; ++i)
     {
@@ -435,9 +435,9 @@ CPPUNIT_TEST_FIXTURE(VclOutdevTest, testDrawTransformedBitmapExFlip)
     MetaAction* pAction = aMtf.GetAction(0);
     CPPUNIT_ASSERT_EQUAL(MetaActionType::BMPEXSCALE, pAction->GetType());
     auto pBitmapAction = static_cast<MetaBmpExScaleAction*>(pAction);
-    const BitmapEx& rBitmapEx = pBitmapAction->GetBitmapEx();
+    const Bitmap& rBitmapEx = pBitmapAction->GetBitmap();
 
-    aBitmap = rBitmapEx.GetBitmap();
+    aBitmap = rBitmapEx.CreateColorBitmap();
     BitmapScopedReadAccess pAccess(aBitmap);
     int nX = 8 * 0.25;
     int nY = 8 * 0.25;