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

@@ -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 );

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>

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)

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>

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;