include/vcl/toolkit/fixed.hxx | 4 ++--
include/vcl/toolkit/roadmap.hxx | 2 +-
toolkit/source/awt/vclxtoolkit.cxx | 2 +-
vcl/inc/wizdlg.hxx | 2 +-
vcl/source/app/salvtables.cxx | 2 +-
vcl/source/control/fixed.cxx | 2 +-
vcl/source/control/roadmap.cxx | 8 ++++----
vcl/source/control/roadmapwizard.cxx | 2 +-
vcl/workben/icontest.cxx | 4 ++--
9 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit f3c68267ab05c07a5722de2ce96f26dc60515d26
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Jul 31 14:11:54 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jul 31 20:15:12 2025 +0200
BitmapEx->Bitmap in FixedBitmap
now that Bitmap can handle transparency
Change-Id: Ie466c6afa0d11b816dab994be08e22b934633dac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188666
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/include/vcl/toolkit/fixed.hxx b/include/vcl/toolkit/fixed.hxx
index 53bd97b4c2e8..88f88d691042 100644
--- a/include/vcl/toolkit/fixed.hxx
+++ b/include/vcl/toolkit/fixed.hxx
@@ -121,7 +121,7 @@ public:
class VCL_DLLPUBLIC FixedBitmap final : public Control
{
private:
- BitmapEx maBitmap;
+ Bitmap maBitmap;
using Control::ImplInitSettings;
using Window::ImplInit;
@@ -140,7 +140,7 @@ public:
SAL_DLLPRIVATE virtual void StateChanged( StateChangedType nType )
override;
SAL_DLLPRIVATE virtual void DataChanged( const DataChangedEvent& rDCEvt )
override;
- void SetBitmap( const BitmapEx& rBitmap );
+ void SetBitmap( const Bitmap& rBitmap );
};
class VCL_DLLPUBLIC FixedImage : public Control
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 242867319de2..d589e0a1fff1 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -802,7 +802,7 @@ void FixedBitmap::DataChanged( const DataChangedEvent&
rDCEvt )
}
}
-void FixedBitmap::SetBitmap( const BitmapEx& rBitmap )
+void FixedBitmap::SetBitmap( const Bitmap& rBitmap )
{
maBitmap = rBitmap;
CompatStateChanged( StateChangedType::Data );
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index f68ffd870c21..0d6146b6fc1d 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -103,11 +103,11 @@ void MyWorkWindow::Paint(vcl::RenderContext&
rRenderContext, const tools::Rectan
aSize.setWidth( aSize.Width() * (1 + (0.1*sin(mnPaintCount/60.))) );
aSize.setHeight( aSize.Height() * (1 + (0.1*sin(mnPaintCount/50.))) );
- BitmapEx aEmpty;
+ Bitmap aEmpty;
mpFixedBitmap->SetBitmap( aEmpty );
GraphicConversionParameters aConv( aSize );
mpBitmap = new BitmapEx(maGraphic.GetBitmapEx( aConv ));
- mpFixedBitmap->SetBitmap( *mpBitmap );
+ mpFixedBitmap->SetBitmap( Bitmap(*mpBitmap) );
mpFixedBitmap->SetSizePixel( aSize );
WorkWindow::Paint(rRenderContext, rRect);
commit 4515d4ced5019e449197e318446fb4192d1ccb2b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Jul 31 13:42:56 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jul 31 20:15:05 2025 +0200
BitmapEx->Bitmap in ORoadmap
now that Bitmap can handle transparency
Change-Id: I163ad1a2e5a6fa2598e17b20bbd44a1aab61e261
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188665
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/vcl/toolkit/roadmap.hxx b/include/vcl/toolkit/roadmap.hxx
index ef1cec25011d..7bfcd8711309 100644
--- a/include/vcl/toolkit/roadmap.hxx
+++ b/include/vcl/toolkit/roadmap.hxx
@@ -52,7 +52,7 @@ public:
virtual ~ORoadmap( ) override;
virtual void dispose() override;
- void SetRoadmapBitmap( const BitmapEx& maBitmap );
+ void SetRoadmapBitmap( const Bitmap& maBitmap );
void EnableRoadmapItem( ItemId _nItemId, bool _bEnable );
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 93de7b710139..85517b75ddc3 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1356,7 +1356,7 @@ void SVTXRoadmap::ImplSetNewImage()
{
OSL_PRECOND( GetWindow(), "SVTXRoadmap::ImplSetNewImage: window is
required to be not-NULL!" );
VclPtr< ::vcl::ORoadmap > pButton = GetAs< ::vcl::ORoadmap >();
- pButton->SetRoadmapBitmap( GetImage().GetBitmapEx() );
+ pButton->SetRoadmapBitmap( Bitmap(GetImage().GetBitmapEx()) );
}
void SVTXRoadmap::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index e37cd18af9de..e8a67d6f7b05 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -135,7 +135,7 @@ namespace vcl
const Size& GetPageSizePixel() const { return maPageSize; }
void SetRoadmapHelpId( const OUString& _rId );
- void SetRoadmapBitmap( const BitmapEx& maBitmap );
+ void SetRoadmapBitmap( const Bitmap& maBitmap );
void InsertRoadmapItem(int nIndex, const OUString& rLabel,
int nId, bool bEnabled);
void DeleteRoadmapItems();
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 0930618e5494..0f90a2fe7009 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2220,7 +2220,7 @@ void SalInstanceAssistant::set_page_side_help_id(const
OUString& rHelpId)
void SalInstanceAssistant::set_page_side_image(const OUString& rImage)
{
- m_xWizard->SetRoadmapBitmap(createImage(rImage).GetBitmapEx());
+ m_xWizard->SetRoadmapBitmap(Bitmap(createImage(rImage).GetBitmapEx()));
}
SalInstanceAssistant::~SalInstanceAssistant()
diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index 9216fb29a230..cbc5a132665c 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -95,7 +95,7 @@ class RoadmapImpl : public RoadmapTypes
protected:
const ORoadmap& m_rAntiImpl;
Link<LinkParamNone*,void> m_aSelectHdl;
- BitmapEx m_aPicture;
+ Bitmap m_aPicture;
HL_Vector m_aRoadmapSteps;
ItemId m_iCurItemID;
bool m_bInteractive : 1;
@@ -158,11 +158,11 @@ public:
return m_bComplete;
}
- void setPicture(const BitmapEx& _rPic)
+ void setPicture(const Bitmap& _rPic)
{
m_aPicture = _rPic;
}
- const BitmapEx& getPicture() const
+ const Bitmap& getPicture() const
{
return m_aPicture;
}
@@ -293,7 +293,7 @@ RoadmapItem* ORoadmap::InsertHyperLabel(ItemIndex Index,
const OUString& _sLabel
return pItem;
}
-void ORoadmap::SetRoadmapBitmap(const BitmapEx& _rBmp)
+void ORoadmap::SetRoadmapBitmap(const Bitmap& _rBmp)
{
m_pImpl->setPicture( _rBmp );
Invalidate( );
diff --git a/vcl/source/control/roadmapwizard.cxx
b/vcl/source/control/roadmapwizard.cxx
index 1827f8573f0d..93eef513540b 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -169,7 +169,7 @@ namespace vcl
mpRoadmap->SetHelpId( _rId );
}
- void RoadmapWizard::SetRoadmapBitmap(const BitmapEx& rBmp)
+ void RoadmapWizard::SetRoadmapBitmap(const Bitmap& rBmp)
{
mpRoadmap->SetRoadmapBitmap(rBmp);
}
