sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx | 4 ++-- sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx | 2 +- sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 4 ++-- sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx | 6 +++--- sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit 5b9da8b5c7050cb42f2556967a4530115adf4c5d Author: Noel Grandin <[email protected]> AuthorDate: Sat Aug 30 15:03:46 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Aug 30 21:21:28 2025 +0200 BitmapEx->Bitmap in TransferableData now that Bitmap supports transparency Change-Id: I2f22e10b7b1c342d35abab8d8bbeeb0cb1df52ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190410 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 57d995158dfd..b5f9a652f269 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -436,7 +436,7 @@ void Clipboard::CreateSlideTransferable ( model::SharedPageDescriptor pDescriptor (aSelectedPages.GetNextElement()); if ( ! pDescriptor || pDescriptor->GetPage()==nullptr) continue; - BitmapEx aPreview (pPreviewCache->GetPreviewBitmap(pDescriptor->GetPage(), false)); + Bitmap aPreview (pPreviewCache->GetPreviewBitmap(pDescriptor->GetPage(), false)); aRepresentatives.emplace_back( aPreview, pDescriptor->HasState(model::PageDescriptor::ST_Excluded)); @@ -551,7 +551,7 @@ std::shared_ptr<SdTransferable::UserData> Clipboard::CreateTransferableUserData model::SharedPageDescriptor pDescriptor (rSlideSorter.GetModel().GetPageDescriptor((nPageIndex-1)/2)); if ( ! pDescriptor || pDescriptor->GetPage()==nullptr) break; - BitmapEx aPreview (pPreviewCache->GetPreviewBitmap(pDescriptor->GetPage(), false)); + Bitmap aPreview (pPreviewCache->GetPreviewBitmap(pDescriptor->GetPage(), false)); aRepresentatives.emplace_back( aPreview, pDescriptor->HasState(model::PageDescriptor::ST_Excluded)); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index 863c2fe73fa0..09dc5e4a1f96 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -21,7 +21,7 @@ #include <sdxfer.hxx> -#include <vcl/bitmapex.hxx> +#include <vcl/bitmap.hxx> #include <vector> @@ -41,10 +41,10 @@ public: class Representative { public: - Representative (const BitmapEx& rBitmap, const bool bIsExcluded) + Representative (const Bitmap& rBitmap, const bool bIsExcluded) : maBitmap(rBitmap), mbIsExcluded(bIsExcluded) {} - BitmapEx maBitmap; + Bitmap maBitmap; bool mbIsExcluded; }; diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 131dce76e66c..4acb2ba0711c 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -177,7 +177,7 @@ Point InsertionIndicatorOverlay::PaintRepresentatives ( aPageOffset.AdjustY(gnShadowBorder ); // Paint the preview. - BitmapEx aPreview (rRepresentatives[nIndex].maBitmap); + Bitmap aPreview (rRepresentatives[nIndex].maBitmap); aPreview.Scale(rPreviewSize, BmpScaleFlag::BestQuality); rContent.DrawBitmapEx(aPageOffset, aPreview); commit 7dd5c5f9b84e5b10483ffc934a2670449cb6d945 Author: Noel Grandin <[email protected]> AuthorDate: Sat Aug 30 14:50:23 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Aug 30 21:21:20 2025 +0200 BitmapEx->Bitmap in BitmapFactory now that Bitmap can handle transparency Change-Id: Iaac9346e624b752f8a0671ae92cb28b8a31234a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190409 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx index 340895d1e6ca..f4927ce10801 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx @@ -39,7 +39,7 @@ BitmapFactory::~BitmapFactory() { } -BitmapEx BitmapFactory::CreateBitmap ( +Bitmap BitmapFactory::CreateBitmap ( const SdPage& rPage, const Size& rPixelSize, const bool bDoSuperSampling) @@ -53,7 +53,7 @@ BitmapEx BitmapFactory::CreateBitmap ( aSize.setHeight( aSize.Height() * aSuperSamplingFactor ); } - BitmapEx aPreview (maRenderer.RenderPage ( + Bitmap aPreview (maRenderer.RenderPage ( &rPage, aSize, true, diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx index c1733b8251fa..fae9c68715fe 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx @@ -35,7 +35,7 @@ public: BitmapFactory(); ~BitmapFactory(); - BitmapEx CreateBitmap(const SdPage& rPage, const Size& rPixelSize, const bool bDoSuperSampling); + Bitmap CreateBitmap(const SdPage& rPage, const Size& rPixelSize, const bool bDoSuperSampling); private: PreviewRenderer maRenderer;
