sd/source/ui/inc/PreviewRenderer.hxx | 2 +- sd/source/ui/sidebar/MasterPageDescriptor.cxx | 4 ++-- sd/source/ui/tools/PreviewRenderer.cxx | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit b9391182e3e70f1d932a99a7862fd6222f7ee649 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Fri Aug 29 10:02:20 2025 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Fri Aug 29 19:52:45 2025 +0200 BitmapEx->Bitmap in PreviewRenderer now that Bitmap supports transparency Change-Id: Ibf7f54710de47cef139f78c98b8c36ee0f9f4277 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190385 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index 90822014760b..3ecb60ac8dbd 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -94,7 +94,7 @@ public: width. Add a frame to it afterwards. */ Image ScaleBitmap ( - const BitmapEx& rBitmap, + const Bitmap& rBitmap, int nWidth); protected: diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx index fc678645ac65..b7edf1270bb4 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx @@ -215,13 +215,13 @@ bool MasterPageDescriptor::UpdatePreview ( { // Create the small preview by scaling the large one down. maSmallPreview = rRenderer.ScaleBitmap( - BitmapEx(maLargePreview.GetBitmap()), + maLargePreview.GetBitmap(), rSmallSize.Width()); // The large preview may not have the desired width. Scale it // accordingly. if (maLargePreview.GetSizePixel().Width() != rLargeSize.Width()) maLargePreview = rRenderer.ScaleBitmap( - BitmapEx(maLargePreview.GetBitmap()), + maLargePreview.GetBitmap(), rLargeSize.Width()); bModified = true; } diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 1ee5c3b660e3..d4f470e7ac87 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -408,7 +408,7 @@ void PreviewRenderer::ProvideView (DrawDocShell* pDocShell) } Image PreviewRenderer::ScaleBitmap ( - const BitmapEx& rBitmapEx, + const Bitmap& rBitmap, int nWidth) { Image aPreview; @@ -423,7 +423,7 @@ Image PreviewRenderer::ScaleBitmap ( : sd::OUTPUT_DRAWMODE_COLOR); // Set output size. - Size aSize (rBitmapEx.GetSizePixel()); + Size aSize (rBitmap.GetSizePixel()); if (aSize.Width() <= 0) break; Size aFrameSize ( @@ -444,7 +444,7 @@ Image PreviewRenderer::ScaleBitmap ( mpPreviewDevice->DrawRect (::tools::Rectangle(Point(0,0), aFrameSize)); // Paint the bitmap scaled to the desired width. - BitmapEx aScaledBitmap(rBitmapEx); + Bitmap aScaledBitmap(rBitmap); aScaledBitmap.Scale (aPreviewSize, BmpScaleFlag::BestQuality); mpPreviewDevice->DrawBitmapEx ( Point(1,1),