include/svx/xtable.hxx | 4 ++-- svx/source/dialog/dlgctrl.cxx | 2 +- svx/source/xoutdev/xtabdash.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 078e511a7b0ef20d7d88e48b577d5d50e19f6407 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed Jul 30 14:49:55 2025 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Jul 31 11:09:48 2025 +0200 Bitmap->BitmapEx in XDashList now that Bitmap can handle transparency Change-Id: Id0b3bae21471f530640e9024431eb3050cb16167 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188610 Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Jenkins diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index ac7b9c7b764e..4819fba2ca3f 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -278,7 +278,7 @@ public: class SVXCORE_DLLPUBLIC XDashList final : public XPropertyList { private: - BitmapEx maBitmapSolidLine; + Bitmap maBitmapSolidLine; OUString maStringSolidLine; OUString maStringNoLine; @@ -298,7 +298,7 @@ public: // Special call to get a bitmap for the solid line representation. It // creates a bitmap fitting in size and style to the ones you get by // using GetUiBitmap for existing entries. - BitmapEx const & GetBitmapForUISolidLine() const; + Bitmap const & GetBitmapForUISolidLine() const; static Bitmap CreateBitmapForXDash(const XDash* pDash, double fLineThickness); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 54bf6f398e76..9826795eecd1 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -941,7 +941,7 @@ void SvxLineLB::Fill( const XDashListRef &pList ) m_xControl->append_text(pList->GetStringForUiNoLine()); // entry for solid line - const BitmapEx aBitmap = pList->GetBitmapForUISolidLine(); + const Bitmap aBitmap = pList->GetBitmapForUISolidLine(); const Size aBmpSize(aBitmap.GetSizePixel()); pVD->SetOutputSizePixel(aBmpSize, false); pVD->DrawBitmapEx(Point(), aBitmap); diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index 390abd10be4a..3a5b16444e9a 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -189,7 +189,7 @@ Bitmap XDashList::CreateBitmapForUI( tools::Long nIndex ) return CreateBitmapForXDash(&rDash, ImpGetDefaultLineThickness()); } -BitmapEx const & XDashList::GetBitmapForUISolidLine() const +Bitmap const & XDashList::GetBitmapForUISolidLine() const { if(maBitmapSolidLine.IsEmpty()) {