diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index da1e40a5cc64..fd740aa16a64 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/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;
     }
 };
 
diff --git a/vcl/qa/cppunit/gen/gen.cxx b/vcl/qa/cppunit/gen/gen.cxx
index 600541d22c00..75a058b86c5e 100644
--- a/vcl/qa/cppunit/gen/gen.cxx
+++ b/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;
     }
 };