Fix DISPLAY build

Seen:

	error: non-const lvalue reference to type 'Bitmap' cannot bind to a value of unrelated type 'BitmapEx'

on Linux, with DISPLAY set to a non-empty value (X11).

Change-Id: I92102409275a1be748d924bbd551cb805bdf0abf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188492
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

cppcanvas/qa/extras/emfplus/emfplus.cxx

@@ -33,7 +33,7 @@ public:
         CPPUNIT_ASSERT(pModel);
         SfxObjectShell* pShell = pModel->GetObjectShell();
         std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
-        BitmapEx aResultBitmap;
+        Bitmap aResultBitmap;
         CPPUNIT_ASSERT(xMetaFile->CreateThumbnail(aResultBitmap));
         // If this is set, the metafile will be dumped as a PNG one for debug purposes.
         char* pEnv = getenv("CPPCANVAS_DEBUG_EMFPLUS_DUMP_TO");
@@ -44,7 +44,7 @@ public:
             CPPUNIT_ASSERT(aWriter.write(aResultBitmap));
         }
 
-        return aResultBitmap.GetBitmap();
+        return aResultBitmap;
     }
 };
 

vcl/qa/cppunit/gen/gen.cxx

@@ -34,9 +34,9 @@ public:
         CPPUNIT_ASSERT(pModel);
         SfxObjectShell* pShell = pModel->GetObjectShell();
         std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
-        BitmapEx aResultBitmap;
+        Bitmap aResultBitmap;
         CPPUNIT_ASSERT(xMetaFile->CreateThumbnail(aResultBitmap));
-        return aResultBitmap.GetBitmap();
+        return aResultBitmap;
     }
 };