sfx2/inc/recentdocsview.hxx | 2 +- sfx2/source/control/recentdocsview.cxx | 10 +++++----- toolkit/source/awt/vclxbitmap.cxx | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit e957f0dfcb016c0b6ebe8f69d6f52e6bfbee0083 Author: Noel Grandin <[email protected]> AuthorDate: Mon Sep 1 09:53:07 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Sep 1 13:51:50 2025 +0200 BitmapEx->Bitmap in VCLXBitmap now that Bitmap supports transparency Change-Id: I526297240f6192d3ea8665a7ce6873f05c8c1363 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190465 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index 11be7610e339..4218f4c6ab90 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.cxx @@ -39,7 +39,7 @@ css::uno::Sequence< sal_Int8 > VCLXBitmap::getDIB() std::scoped_lock aGuard( GetMutex() ); SvMemoryStream aMem; - WriteDIB(BitmapEx(maBitmap).GetBitmap(), aMem, false, true); + WriteDIB(maBitmap.CreateColorBitmap(), aMem, false, true); return css::uno::Sequence<sal_Int8>( static_cast<sal_Int8 const *>(aMem.GetData()), aMem.Tell() ); } @@ -47,7 +47,7 @@ css::uno::Sequence< sal_Int8 > VCLXBitmap::getMaskDIB() { std::scoped_lock aGuard( GetMutex() ); - return vcl::bitmap::GetMaskDIB(BitmapEx(maBitmap)); + return vcl::bitmap::GetMaskDIB(maBitmap); } sal_Int64 SAL_CALL VCLXBitmap::estimateUsage() commit d99f6b2cb1c1da8a9261e85794094b2b83d8f63b Author: Noel Grandin <[email protected]> AuthorDate: Mon Sep 1 09:39:59 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Sep 1 13:51:38 2025 +0200 BitmapEx->Bitmap in RecentDocsView now that Bitmap supports transparency Change-Id: Id84ff918d1896e0834fc05152dd2c6e1e6883d8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190464 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/sfx2/inc/recentdocsview.hxx b/sfx2/inc/recentdocsview.hxx index 38199818a34e..39f3602fdece 100644 --- a/sfx2/inc/recentdocsview.hxx +++ b/sfx2/inc/recentdocsview.hxx @@ -104,7 +104,7 @@ private: size_t mnLastMouseDownItem; /// Image that appears when there is no recent document. - BitmapEx maWelcomeImage; + Bitmap maWelcomeImage; OUString maWelcomeLine1; OUString maWelcomeLine2; diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index e5a012477d68..9bbe59d57220 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -266,15 +266,15 @@ void RecentDocsView::Paint(vcl::RenderContext& rRenderContext, const tools::Rect tools::Long nTextHeight = rRenderContext.GetTextHeight(); - const Size& rImgSize = maWelcomeImage.GetSizePixel(); + const Size aImgSize = maWelcomeImage.GetSizePixel(); const Size& rSize = GetOutputSizePixel(); - const int nX = (rSize.Width() - rImgSize.Width())/2; - int nY = (rSize.Height() - 3 * nTextHeight - rImgSize.Height())/2; + const int nX = (rSize.Width() - aImgSize.Width())/2; + int nY = (rSize.Height() - 3 * nTextHeight - aImgSize.Height())/2; Point aImgPoint(nX, nY); - rRenderContext.DrawBitmapEx(aImgPoint, rImgSize, maWelcomeImage); + rRenderContext.DrawBitmapEx(aImgPoint, aImgSize, maWelcomeImage); - nY = nY + rImgSize.Height(); + nY = nY + aImgSize.Height(); rRenderContext.DrawText(tools::Rectangle(0, nY + 1 * nTextHeight, rSize.Width(), nY + nTextHeight), maWelcomeLine1, DrawTextFlags::Center);
