framework/source/fwe/classes/addonsoptions.cxx | 12 ++++++------ svx/inc/galobj.hxx | 2 +- svx/source/gallery2/galbrws1.cxx | 2 +- svx/source/gallery2/galctrl.cxx | 2 +- svx/source/gallery2/galobj.cxx | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit e53368d44dc2771b0fc5f2f6e80b1034b6ef0c84 Author: Noel Grandin <[email protected]> AuthorDate: Sat Aug 30 20:27:47 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sun Aug 31 07:38:18 2025 +0200 BitmapEx->Bitmap in SgaObject now that Bitmap supports transparency Change-Id: I1e93374ec4afa30c7c7a699d9658912e3933fa3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190422 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index 13b118924708..8a984e9206fb 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -85,7 +85,7 @@ public: friend SvStream& WriteSgaObject( SvStream& rOut, const SgaObject& rObj ); friend SvStream& ReadSgaObject( SvStream& rIn, SgaObject& rObj ); - BitmapEx createPreviewBitmapEx(const Size& rSizePixel) const; + Bitmap createPreviewBitmap(const Size& rSizePixel) const; }; class SgaObjectSound final : public SgaObject diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 2cb1399a2c1b..8f9834a35cf2 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -1114,7 +1114,7 @@ void GalleryBrowser::UpdateRows(bool bVisibleOnly) std::unique_ptr<SgaObject> xObj = mpCurTheme->AcquireObject(i); if (xObj) { - aBitmap = Bitmap(xObj->createPreviewBitmapEx(maPreviewSize)); + aBitmap = xObj->createPreviewBitmap(maPreviewSize); sItemTextTitle = GalleryBrowser::GetItemText(*xObj, GalleryItemFlags::Title); sItemTextPath = GalleryBrowser::GetItemText(*xObj, GalleryItemFlags::Path); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 1f514e0fe4b3..3f720318d5ea 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -339,7 +339,7 @@ void GalleryIconView::UserDraw(const UserDrawEvent& rUDEvt) if(pObj) { - aBitmap = Bitmap(pObj->createPreviewBitmapEx(aSize)); + aBitmap = pObj->createPreviewBitmap(aSize); aItemTextTitle = GalleryBrowser::GetItemText(*pObj, GalleryItemFlags::Title); mpTheme->SetPreviewBitmapAndStrings(nId - 1, aBitmap, aSize, aItemTextTitle, aItemTextPath); diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 418b04c6fbe7..950c30f7b673 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -55,9 +55,9 @@ SgaObject::SgaObject(const SgaObject& aObject) { } -BitmapEx SgaObject::createPreviewBitmapEx(const Size& rSizePixel) const +Bitmap SgaObject::createPreviewBitmap(const Size& rSizePixel) const { - BitmapEx aRetval; + Bitmap aRetval; if(rSizePixel.Width() && rSizePixel.Height()) { commit d5df923644a49cb9b5bf2f52e7066f7f98ebf92e Author: Noel Grandin <[email protected]> AuthorDate: Sat Aug 30 20:25:11 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sun Aug 31 07:38:07 2025 +0200 BitmapEx->Bitmap in framework now that Bitmap supports transparency Change-Id: I70cac13970f657770c5b739010bae8b17f4faed0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190421 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 694a6fefa524..57d9f43be908 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -319,7 +319,7 @@ class AddonsOptions_Impl : public ConfigItem Sequence< OUString > GetPropertyNamesStatusbarItem( std::u16string_view aPropertyRootNode ) const; Sequence< OUString > GetPropertyNamesImages( std::u16string_view aPropertyRootNode ) const; - static bool CreateImageFromSequence( BitmapEx& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ); + static bool CreateImageFromSequence( Bitmap& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ); DECL_LINK(NotifyEvent, void*, void); @@ -1626,14 +1626,14 @@ std::unique_ptr<AddonsOptions_Impl::ImageEntry> AddonsOptions_Impl::ReadImageDat if ( i < PROPERTYCOUNT_EMBEDDED_IMAGES ) { // Extract image data from the embedded hex binary sequence - BitmapEx aImage; + Bitmap aImage; if (( aPropertyData[i] >>= aImageDataSeq ) && aImageDataSeq.hasElements() && ( CreateImageFromSequence( aImage, aImageDataSeq ) ) ) { if ( !pEntry ) pEntry.reset(new ImageEntry); - pEntry->addImage(i == OFFSET_IMAGES_SMALL ? IMGSIZE_SMALL : IMGSIZE_BIG, Bitmap(aImage)); + pEntry->addImage(i == OFFSET_IMAGES_SMALL ? IMGSIZE_SMALL : IMGSIZE_BIG, aImage); } } else if ( i == OFFSET_IMAGES_SMALL_URL || i == OFFSET_IMAGES_BIG_URL ) @@ -1655,7 +1655,7 @@ std::unique_ptr<AddonsOptions_Impl::ImageEntry> AddonsOptions_Impl::ReadImageDat } // static -bool AddonsOptions_Impl::CreateImageFromSequence( BitmapEx& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) +bool AddonsOptions_Impl::CreateImageFromSequence( Bitmap& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) { bool bResult = false; @@ -1665,10 +1665,10 @@ bool AddonsOptions_Impl::CreateImageFromSequence( BitmapEx& rImage, Sequence< sa ReadDIBBitmapEx(rImage, aMemStream); - if( !rImage.IsAlpha() ) + if( !rImage.HasAlpha() ) { // Support non-transparent bitmaps to be downward compatible with OOo 1.1.x addons - rImage = BitmapEx( rImage.GetBitmap(), COL_LIGHTMAGENTA ); + rImage = Bitmap( rImage, COL_LIGHTMAGENTA ); } bResult = true;
