include/vcl/bitmap.hxx | 2 +-
sd/source/ui/sidebar/LayoutMenu.cxx | 4 ++--
sd/source/ui/sidebar/LayoutMenu.hxx | 2 +-
sd/source/ui/sidebar/MasterPagesSelector.cxx | 4 ++--
sd/source/ui/sidebar/MasterPagesSelector.hxx | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 23cbd357b067802ed36b87318b0bfaa59e4134d4
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Jul 29 15:21:36 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Tue Jul 29 21:50:08 2025 +0200
make Bitmap(BitmapEx) constructor explicit
to make it easier to spot conversions
Change-Id: Ibd118547ef88139648afbd91516b853cf691a45b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188536
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 5d9f306302b6..e827fc87ffb6 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -111,7 +111,7 @@ public:
Bitmap();
Bitmap( const Bitmap& rBitmap );
- Bitmap( const BitmapEx& rBitmapEx );
+ explicit Bitmap( const BitmapEx& rBitmapEx );
Bitmap( const Size& rSizePixel, vcl::PixelFormat
ePixelFormat, const BitmapPalette* pPal = nullptr );
SAL_DLLPRIVATE explicit Bitmap( std::shared_ptr<SalBitmap> xSalBitmap );
~Bitmap();
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx
b/sd/source/ui/sidebar/LayoutMenu.cxx
index 6dc386d0b702..23cfb5dc00bf 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -451,9 +451,9 @@ VclPtr<VirtualDevice> LayoutMenu::GetVirtualDevice(Image
pImage)
return pVDev;
}
-BitmapEx LayoutMenu::GetPreviewAsBitmap(const Image& rImage)
+Bitmap LayoutMenu::GetPreviewAsBitmap(const Image& rImage)
{
- BitmapEx aPreviewBitmap = rImage.GetBitmapEx();
+ Bitmap aPreviewBitmap(rImage.GetBitmapEx());
ScopedVclPtr<VirtualDevice> pVDev = VclPtr<VirtualDevice>::Create();
if (pVDev->GetDPIScaleFactor() > 1)
aPreviewBitmap.Scale(pVDev->GetDPIScaleFactor(),
pVDev->GetDPIScaleFactor());
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx
b/sd/source/ui/sidebar/LayoutMenu.hxx
index d08637fc9196..756f7c078623 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -170,7 +170,7 @@ private:
DECL_LINK(OnPopupEnd, const OUString&, void);
static VclPtr<VirtualDevice> GetVirtualDevice(Image pPreview);
- static BitmapEx GetPreviewAsBitmap(const Image& rImage);
+ static Bitmap GetPreviewAsBitmap(const Image& rImage);
void HandleMenuSelect(std::u16string_view rIdent);
TranslateId GetStringResourceIdForLayout(AutoLayout aLayout) const;
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx
b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index ae9b97b0f8c0..51e96e57fb73 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -483,9 +483,9 @@ VclPtr<VirtualDevice>
MasterPagesSelector::GetVirtualDevice(const Image& rImage)
return pVDev;
}
-BitmapEx MasterPagesSelector::GetPreviewAsBitmap(const Image& rImage)
+Bitmap MasterPagesSelector::GetPreviewAsBitmap(const Image& rImage)
{
- BitmapEx aPreviewBitmap = rImage.GetBitmapEx();
+ Bitmap aPreviewBitmap(rImage.GetBitmapEx());
ScopedVclPtr<VirtualDevice> pVDev = VclPtr<VirtualDevice>::Create();
if (pVDev->GetDPIScaleFactor() > 1)
aPreviewBitmap.Scale(pVDev->GetDPIScaleFactor(),
pVDev->GetDPIScaleFactor());
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx
b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 0c8a36fd5e43..eb6d888a9158 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -171,7 +171,7 @@ private:
MasterPageContainer::Token aToken);
static VclPtr<VirtualDevice> GetVirtualDevice(const Image& rPreview);
- static BitmapEx GetPreviewAsBitmap(const Image& rPreview);
+ static Bitmap GetPreviewAsBitmap(const Image& rPreview);
};
} // end of namespace sd::sidebar
