cui/source/factory/dlgfact.cxx | 2 +-
include/sfx2/tabdlg.hxx | 2 +-
include/vcl/abstdlg.hxx | 4 ++--
sc/source/ui/attrdlg/scdlgfact.cxx | 6
+++---
sd/source/ui/dlg/sddlgfact.cxx | 4 ++--
sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx | 2 +-
sfx2/source/dialog/tabdlg.cxx | 4 ++--
vcl/source/window/abstdlg.cxx | 4 ++--
8 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 5ec2d0442a7136fd85dc87317ea128246d9e6c65
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Jul 28 19:10:44 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Tue Jul 29 08:45:37 2025 +0200
BitmapEx->Bitmap in VclAbstractDialog::createScreenshot
since Bitmap can now do transparency
Change-Id: I47d7effbdbea6a5032e5f5c85a3f02cc6a9115dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188506
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index e24b1538f176..58ee73e78163 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -223,7 +223,7 @@ public:
{
return this->m_pDlg->selectPageByUIXMLDescription(rUIXMLDescription);
}
- BitmapEx createScreenshot() const override { return
this->m_pDlg->createScreenshot(); }
+ Bitmap createScreenshot() const override { return
this->m_pDlg->createScreenshot(); }
OUString GetScreenshotId() const override { return
this->m_pDlg->GetScreenshotId(); }
};
}
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 71bad7aa6d59..886e9a6ae5ef 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -184,7 +184,7 @@ public:
//screenshotting
std::vector<OUString> getAllPageUIXMLDescriptions() const;
bool selectPageByUIXMLDescription(const OUString& rUIXMLDescription);
- BitmapEx createScreenshot() const;
+ Bitmap createScreenshot() const;
OUString GetScreenshotId() const;
};
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 52a558ae11fc..65ea90bf1cfe 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -34,7 +34,7 @@ namespace com::sun::star::uno { template <class
interface_type> class Reference;
namespace com::sun::star::frame { class XModel; }
-class BitmapEx;
+class Bitmap;
class SdrObjGroup;
namespace weld
{
@@ -86,7 +86,7 @@ public:
// Screenshot interface
virtual std::vector<OUString> getAllPageUIXMLDescriptions() const;
virtual bool selectPageByUIXMLDescription(const OUString&
rUIXMLDescription);
- virtual BitmapEx createScreenshot() const;
+ virtual Bitmap createScreenshot() const;
virtual OUString GetScreenshotId() const { return {}; };
};
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index f1c67171b688..43e4ea73e95e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -83,10 +83,10 @@ public:
using ImplTemplate<Base, Dialog>::ImplTemplate;
// screenshotting
- BitmapEx createScreenshot() const override
+ Bitmap createScreenshot() const override
{
VclPtr<VirtualDevice>
xDialogSurface(this->m_pDlg->getDialog()->screenshot());
- return BitmapEx(xDialogSurface->GetBitmap(Point(),
xDialogSurface->GetOutputSizePixel()));
+ return xDialogSurface->GetBitmap(Point(),
xDialogSurface->GetOutputSizePixel());
}
OUString GetScreenshotId() const override { return
this->m_pDlg->get_help_id(); }
};
@@ -844,7 +844,7 @@ public:
{
return this->m_pDlg->selectPageByUIXMLDescription(rUIXMLDescription);
}
- BitmapEx createScreenshot() const override { return
this->m_pDlg->createScreenshot(); }
+ Bitmap createScreenshot() const override { return
this->m_pDlg->createScreenshot(); }
OUString GetScreenshotId() const override { return
this->m_pDlg->GetScreenshotId(); }
};
}
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index f1ae84f1c45c..2553ae906edb 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -56,10 +56,10 @@ public:
using ImplTemplate<Base, Dialog>::ImplTemplate;
// screenshotting
- BitmapEx createScreenshot() const override
+ Bitmap createScreenshot() const override
{
VclPtr<VirtualDevice>
xDialogSurface(this->m_pDlg->getDialog()->screenshot());
- return BitmapEx(xDialogSurface->GetBitmap(Point(),
xDialogSurface->GetOutputSizePixel()));
+ return xDialogSurface->GetBitmap(Point(),
xDialogSurface->GetOutputSizePixel());
}
OUString GetScreenshotId() const override { return
this->m_pDlg->get_help_id(); }
};
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 247590a664db..be47326cbda1 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1173,7 +1173,7 @@ bool
SfxTabDialogController::selectPageByUIXMLDescription(const OUString& rUIXML
return m_xTabCtrl->get_current_page_ident() == rUIXMLDescription;
}
-BitmapEx SfxTabDialogController::createScreenshot() const
+Bitmap SfxTabDialogController::createScreenshot() const
{
// if we haven't run Start_Impl yet, do so now to create the initial pages
if (!m_pImpl->bStarted)
@@ -1182,7 +1182,7 @@ BitmapEx SfxTabDialogController::createScreenshot() const
}
VclPtr<VirtualDevice> xDialogSurface(m_xDialog->screenshot());
- return BitmapEx(xDialogSurface->GetBitmap(Point(),
xDialogSurface->GetOutputSizePixel()));
+ return xDialogSurface->GetBitmap(Point(),
xDialogSurface->GetOutputSizePixel());
}
OUString SfxTabDialogController::GetScreenshotId() const
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index 1cc5325c7200..df1e25499eab 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.cxx
@@ -51,10 +51,10 @@ bool VclAbstractDialog::selectPageByUIXMLDescription(const
OUString& /*rUIXMLDes
return true;
}
-BitmapEx VclAbstractDialog::createScreenshot() const
+Bitmap VclAbstractDialog::createScreenshot() const
{
// default returns empty bitmap
- return BitmapEx();
+ return Bitmap();
}
VclAbstractDialogFactory::~VclAbstractDialogFactory() {}
commit a1ea9917e41eace47dca12a75e26c7d9aa930e7a
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Jul 28 16:57:01 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Tue Jul 29 08:45:27 2025 +0200
BitmapEx->Bitmap in InsertionIndicatorOverlay
since Bitmap can now handle transparency.
Change-Id: I02c548c202f77bbcd6102f4d2867ff7de4859c56
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188505
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
index d676c4487b22..d999a7cd5df9 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
@@ -75,7 +75,7 @@ private:
std::unique_ptr<ILayerInvalidator> mpLayerInvalidator;
// Center of the insertion indicator.
Point maLocation;
- BitmapEx maIcon;
+ Bitmap maIcon;
std::unique_ptr<FramePainter> mpShadowPainter;
Point PaintRepresentatives (
