include/svx/svdhdl.hxx | 2 +- svx/source/svdraw/svdhdl.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 82081c5ab70f53264349e7450badb8541f443da1 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Sun Jul 27 20:32:53 2025 +0200 Commit: Noel Grandin <noelgran...@gmail.com> CommitDate: Mon Jul 28 19:28:12 2025 +0200 BitmapEx->Bitmap in SdrHdlColor::CreateColorDropper Now that Bitmap can handle transparency. Change-Id: I136e63c112d1c519f95727ce3cebb7b178d9de5d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188448 Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Jenkins diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index da82e1d64245..b703bc75e744 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -268,7 +268,7 @@ class SVXCORE_DLLPUBLIC SdrHdlColor final : public SdrHdl SVX_DLLPRIVATE virtual void CreateB2dIAObject() override; // help functions - SVX_DLLPRIVATE BitmapEx CreateColorDropper(Color aCol); + SVX_DLLPRIVATE Bitmap CreateColorDropper(Color aCol); SVX_DLLPRIVATE static Color GetLuminance(const Color& rCol); public: diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 9097fdf335ab..ccf1c811acd7 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1169,7 +1169,7 @@ void SdrHdlColor::CreateB2dIAObject() } } -BitmapEx SdrHdlColor::CreateColorDropper(Color aCol) +Bitmap SdrHdlColor::CreateColorDropper(Color aCol) { // get the Bitmap VclPtr<VirtualDevice> pWrite(VclPtr<VirtualDevice>::Create()); @@ -1206,7 +1206,7 @@ BitmapEx SdrHdlColor::CreateColorDropper(Color aCol) pWrite->DrawLine(Point(2, nHeight - 2), Point(nWidth - 2, nHeight - 2)); pWrite->DrawLine(Point(nWidth - 2, 2), Point(nWidth - 2, nHeight - 3)); - return BitmapEx(pWrite->GetBitmap(Point(0,0), m_aMarkerSize)); + return pWrite->GetBitmap(Point(0,0), m_aMarkerSize); } Color SdrHdlColor::GetLuminance(const Color& rCol)