core.git: cppcanvas/qa vcl/qa

[Miklos Vajna (via logerrit)]

 cppcanvas/qa/extras/emfplus/emfplus.cxx |    4 ++--
 vcl/qa/cppunit/gen/gen.cxx              |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 819230575d336f100a23cd08e99d0c3fe5b0b446
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jul 28 20:17:50 2025 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Jul 29 09:02:55 2025 +0200

    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 <vmik...@collabora.com>

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;
     }
 };