From ad00a72115d20dbfb14bada1a6f6ee2c79bb1ac9 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Thu, 28 Aug 2025 10:21:52 +0200
Subject: [PATCH] BitmapEx->Bitmap in Wallpaper

Now that Bitmap supports transparency

Change-Id: I1934f1a4776ee8b54aa7758ea0da2eadc0b4a698
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190316
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
---
 include/vcl/wall.hxx                    | 5 ++---
 svtools/source/control/valueset.cxx     | 1 +
 sw/source/core/view/viewsh.cxx          | 2 +-
 vcl/backendtest/outputdevice/common.cxx | 1 +
 vcl/source/gdi/wall.cxx                 | 6 ------
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx
index c28cbce1c78a..7586fbf8f4cc 100644
--- a/include/vcl/wall.hxx
+++ b/include/vcl/wall.hxx
@@ -22,7 +22,7 @@
 
 #include <tools/color.hxx>
 #include <tools/gen.hxx>
-#include <vcl/bitmapex.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/dllapi.h>
 #include <optional>
@@ -60,8 +60,7 @@ public:
                     Wallpaper( const Wallpaper& rWallpaper );
                     Wallpaper( Wallpaper&& rWallpaper );
                     Wallpaper( const Color& rColor );
-                    explicit Wallpaper( const BitmapEx& rBmpEx );
-                    explicit Wallpaper( const Bitmap& rBmpEx );
+                    explicit Wallpaper( const Bitmap& rBmp );
                     ~Wallpaper();
 
     void            SetColor( const Color& rColor );
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 8d7edca7de00..7e9604b75169 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -23,6 +23,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <tools/debug.hxx>
+#include <vcl/bitmapex.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 01c142016089..6b02ae85da34 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1866,7 +1866,7 @@ bool SwViewShell::DrawAppBackgroundBitmap(vcl::RenderContext* rRenderContext, co
     if (aAppBackImg.IsEmpty())
         return false;
 
-    Wallpaper aWallpaper((BitmapEx(aAppBackImg)));
+    Wallpaper aWallpaper(aAppBackImg);
     if (ThemeColors::GetAppBackBmpDrawType() == u"Tiled"_ustr)
         aWallpaper.SetStyle(WallpaperStyle::Tile);
     else if (ThemeColors::GetAppBackBmpDrawType() == u"Stretched"_ustr)
diff --git a/vcl/backendtest/outputdevice/common.cxx b/vcl/backendtest/outputdevice/common.cxx
index 0a212f579291..8b9d4b865ef7 100644
--- a/vcl/backendtest/outputdevice/common.cxx
+++ b/vcl/backendtest/outputdevice/common.cxx
@@ -11,6 +11,7 @@
 #include <test/outputdevice.hxx>
 
 #include <vcl/BitmapWriteAccess.hxx>
+#include <vcl/bitmapex.hxx>
 #include <salgdi.hxx>
 
 #include <map>
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 3952452f028c..4ceb353a9d78 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -130,12 +130,6 @@ Wallpaper::Wallpaper( const Color& rColor )
     meStyle    = WallpaperStyle::Tile;
 }
 
-Wallpaper::Wallpaper( const BitmapEx& rBmpEx )
-{
-    maBitmap   = Bitmap(rBmpEx);
-    meStyle    = WallpaperStyle::Tile;
-}
-
 Wallpaper::Wallpaper( const Bitmap& rBmp )
 {
     maBitmap   = rBmp;