core.git: vcl/inc vcl/source

[Noel Grandin (via logerrit)]

 vcl/inc/svdata.hxx                          |    2 +-
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 44cb4fb1f3981ba6fcddd3ec2f896751c09ac4fa
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sat Aug 2 15:32:22 2025 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Aug 4 08:10:25 2025 +0200

    BitmapEx->Bitmap in maThemeImageCache
    
    now that Bitmap can handle transparency
    
    Change-Id: I344bb678dc55b9c76a14e27d362b6dc48e250a4d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188884
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index e32c3fdb9b28..89c8c98ef500 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -241,7 +241,7 @@ struct ImplSVGDIData
     tools::Long                    mnAppFontY = 0;                 // AppFont 
Y-Numenator for 80/tel Height
     bool                    mbFontSubChanged = false;       // true: 
FontSubstitution was changed between Begin/End
 
-    o3tl::lru_map<OUString, BitmapEx> maThemeImageCache = 
o3tl::lru_map<OUString, BitmapEx>(10);
+    o3tl::lru_map<OUString, Bitmap> maThemeImageCache = 
o3tl::lru_map<OUString, Bitmap>(10);
     o3tl::lru_map<OUString, gfx::DrawRoot> maThemeDrawCommandsCache = 
o3tl::lru_map<OUString, gfx::DrawRoot>(50);
 };
 
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index f394bbfda1b5..e87c825442d0 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -474,7 +474,7 @@ void 
munchDrawCommands(std::vector<std::shared_ptr<WidgetDrawAction>> const& rDr
                     vcl::bitmap::loadFromSvg(aFileStream, u""_ustr, aBitmap, 
nScaleFactor);
                     if (!aBitmap.IsEmpty())
                     {
-                        rCacheImages.insert(std::make_pair(rCacheKey, 
aBitmap));
+                        rCacheImages.insert(std::make_pair(rCacheKey, 
Bitmap(aBitmap)));
                     }
                 }
                 else