core.git: reportdesign/qa slideshow/source sw/source xmlsecurity/workben

[Noel Grandin (via logerrit)]

 reportdesign/qa/unit/data/roundTrip.odb        |binary
 slideshow/source/engine/shapes/gdimtftools.cxx |    9 ++++-----
 sw/source/filter/html/htmlreqifreader.cxx      |    4 ++--
 xmlsecurity/workben/pdfverify.cxx              |    4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 333ee4fdd4f8fabc5db1de7c3785555fad90dc6c
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Aug 25 15:40:43 2025 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Aug 25 18:12:03 2025 +0200

    BitmapEx->Bitmap in various
    
    now that Bitmap supports transparency
    
    Change-Id: Icd17e5ca5efda9828f7d99bbd5f44387cdb648ea
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190176
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/reportdesign/qa/unit/data/roundTrip.odb 
b/reportdesign/qa/unit/data/roundTrip.odb
index f4914f44c984..ee8585d4bed6 100644
Binary files a/reportdesign/qa/unit/data/roundTrip.odb and 
b/reportdesign/qa/unit/data/roundTrip.odb differ
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx 
b/slideshow/source/engine/shapes/gdimtftools.cxx
index 467da27811fa..c476c4f56898 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -133,12 +133,11 @@ public:
             // wrap bitmap into GDIMetafile
             GDIMetaFileSharedPtr xMtf = std::make_shared<GDIMetaFile>();
 
-            ::BitmapEx      aBmpEx( aGraphic.GetBitmapEx() );
+            ::Bitmap      aBmp( aGraphic.GetBitmap() );
 
-            xMtf->AddAction( new MetaBmpExAction( Point(),
-                                                 aBmpEx ) );
-            xMtf->SetPrefSize( aBmpEx.GetPrefSize() );
-            xMtf->SetPrefMapMode( aBmpEx.GetPrefMapMode() );
+            xMtf->AddAction( new MetaBmpExAction( Point(), BitmapEx(aBmp) ) );
+            xMtf->SetPrefSize( aBmp.GetPrefSize() );
+            xMtf->SetPrefMapMode( aBmp.GetPrefMapMode() );
 
             return xMtf;
         }
diff --git a/sw/source/filter/html/htmlreqifreader.cxx 
b/sw/source/filter/html/htmlreqifreader.cxx
index 9493be474282..d3a51e3911ca 100644
--- a/sw/source/filter/html/htmlreqifreader.cxx
+++ b/sw/source/filter/html/htmlreqifreader.cxx
@@ -548,8 +548,8 @@ bool WrapGraphicInRtf(const Graphic& rGraphic, const 
SwFrameFormat& rFormat, SvS
     SvMemoryStream aNativeData;
 
     // Set white background for the semi-transparent pixels.
-    BitmapEx aBitmapEx = rGraphic.GetBitmapEx();
-    Bitmap aBitmap = 
aBitmapEx.GetBitmap(/*aTransparentReplaceColor=*/COL_WHITE);
+    Bitmap aBitmap = rGraphic.GetBitmap();
+    aBitmap.ReplaceTransparency(/*aTransparentReplaceColor=*/COL_WHITE);
 
     if (aBitmap.getPixelFormat() != vcl::PixelFormat::N24_BPP)
     {
diff --git a/xmlsecurity/workben/pdfverify.cxx 
b/xmlsecurity/workben/pdfverify.cxx
index 09ac89ab4705..053de93fab2f 100644
--- a/xmlsecurity/workben/pdfverify.cxx
+++ b/xmlsecurity/workben/pdfverify.cxx
@@ -47,12 +47,12 @@ void generatePreview(std::string_view rPdfPath, 
std::string_view rPngPath)
         != ERRCODE_NONE)
         return;
 
-    BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
+    Bitmap aBitmap = aGraphic.GetBitmap();
     OUString aOutURL;
     osl::FileBase::getFileURLFromSystemPath(OUString::fromUtf8(rPngPath), 
aOutURL);
     SvFileStream aOutStream(aOutURL, StreamMode::WRITE);
     vcl::PngImageWriter aWriter(aOutStream);
-    aWriter.write(aBitmapEx);
+    aWriter.write(aBitmap);
 }
 
 int pdfVerify(int nArgc, char** pArgv)