include/svx/gallery.hxx | 6 +++---
include/svx/galtheme.hxx | 2 +-
svx/source/gallery2/galexpl.cxx | 4 ++--
svx/source/gallery2/galtheme.cxx | 2 +-
svx/source/tbxctrls/fontworkgallery.cxx | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit e849e8297c585017ad3fdeadabef465e5d942da0
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Aug 1 20:29:17 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Aug 1 21:39:54 2025 +0200
BitmapEx->Bitmap in GalleryTheme
Now that Bitmap can handle transparency
Change-Id: Iebe2c5d51304acf4ed0db08f2ac498043d6497ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188781
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx
index b03b31a5d322..0776ba6e1d2f 100644
--- a/include/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
@@ -91,7 +91,7 @@
class SdrModel;
class Graphic;
-class BitmapEx;
+class Bitmap;
class SVXCORE_DLLPUBLIC GalleryExplorer
{
@@ -118,9 +118,9 @@ public:
static sal_uInt32 GetSdrObjCount( sal_uInt32 nThemeId );
static bool GetSdrObj( std::u16string_view rThemeName,
sal_uInt32 nSdrModelPos,
- SdrModel* pModel, BitmapEx* pThumb
= nullptr );
+ SdrModel* pModel, Bitmap* pThumb =
nullptr );
static bool GetSdrObj( sal_uInt32 nThemeId, sal_uInt32
nSdrModelPos,
- SdrModel* pModel, BitmapEx* pThumb
= nullptr );
+ SdrModel* pModel, Bitmap* pThumb =
nullptr );
static bool BeginLocking( std::u16string_view rThemeName );
static bool BeginLocking( sal_uInt32 nThemeId );
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 94582d77a86f..6f8f38e1d1bd 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -131,7 +131,7 @@ public:
return maGalleryObjectCollection.getURLForPosition(nPos);
}
- SAL_DLLPRIVATE bool GetThumb(sal_uInt32 nPos, BitmapEx& rBmp);
+ SAL_DLLPRIVATE bool GetThumb(sal_uInt32 nPos, Bitmap& rBmp);
bool GetGraphic(sal_uInt32 nPos, Graphic& rGraphic);
bool InsertGraphic(const Graphic& rGraphic,
sal_uInt32 nInsertPos);
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index b1e70919c928..9da8b88302f8 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -195,7 +195,7 @@ sal_uInt32 GalleryExplorer::GetSdrObjCount( sal_uInt32
nThemeId )
}
bool GalleryExplorer::GetSdrObj( std::u16string_view rThemeName, sal_uInt32
nSdrModelPos,
- SdrModel* pModel, BitmapEx* pThumb )
+ SdrModel* pModel, Bitmap* pThumb )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
bool bRet = false;
@@ -230,7 +230,7 @@ bool GalleryExplorer::GetSdrObj( std::u16string_view
rThemeName, sal_uInt32 nSdr
}
bool GalleryExplorer::GetSdrObj( sal_uInt32 nThemeId, sal_uInt32 nSdrModelPos,
- SdrModel* pModel, BitmapEx* pThumb )
+ SdrModel* pModel, Bitmap* pThumb )
{
Gallery* pGal = ::Gallery::GetGalleryInstance();
return pGal && GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos,
pModel, pThumb );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 7c9914dc2880..45ed61730d55 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -295,7 +295,7 @@ void GalleryTheme::Actualize( const Link<const
INetURLObject&, void>& rActualize
UnlockBroadcaster();
}
-bool GalleryTheme::GetThumb(sal_uInt32 nPos, BitmapEx& rBmp)
+bool GalleryTheme::GetThumb(sal_uInt32 nPos, Bitmap& rBmp)
{
std::unique_ptr<SgaObject> pObj = AcquireObject( nPos );
bool bRet = false;
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx
b/svx/source/tbxctrls/fontworkgallery.cxx
index a549698f1336..a6181d3acf8b 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -96,7 +96,7 @@ void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId)
for( nModelPos = 0; nModelPos < nFavCount; nModelPos++ )
{
- BitmapEx aThumb;
+ Bitmap aThumb;
if (GalleryExplorer::GetSdrObj(nThemeId, nModelPos, pModel, &aThumb)
&& !aThumb.IsEmpty())
{
