cppcanvas/source/mtfrenderer/implrenderer.cxx | 19 +++++++++---------- cui/source/dialogs/GraphicTestsDialog.cxx | 3 +-- cui/source/dialogs/ImageViewerDialog.cxx | 3 +-- cui/source/dialogs/insdlg.cxx | 3 ++- cui/source/dialogs/screenshotannotationdlg.cxx | 6 +++--- cui/source/inc/ImageViewerDialog.hxx | 4 ++-- 6 files changed, 18 insertions(+), 20 deletions(-)
New commits: commit 98af3602c1819f4880f25a78d2d0f9c29f59c20a Author: Noel Grandin <[email protected]> AuthorDate: Sat Aug 30 20:16:29 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Aug 30 22:01:27 2025 +0200 BitmapEx->Bitmap in cppcanvas now that Bitmap can support transparency Change-Id: I88426b14a1047b46d18d6664b1d55d1980354a55 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190416 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 0dac361ec561..b674818113fb 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -196,11 +196,10 @@ namespace } - /** Create masked BitmapEx, where the white areas of rBitmap are + /** Create masked Bitmap, where the white areas of rBitmap are transparent, and the other appear in rMaskColor. */ - BitmapEx createMaskBmpEx( const Bitmap& rBitmap, - const ::Color& rMaskColor ) + Bitmap createMaskBmp( const Bitmap& rBitmap, const ::Color& rMaskColor ) { const ::Color aWhite( COL_WHITE ); BitmapPalette aBiLevelPalette{ @@ -213,7 +212,7 @@ namespace &aBiLevelPalette ); aSolid.Erase( rMaskColor ); - return BitmapEx( aSolid, aMask ); + return Bitmap( aSolid, aMask ); } OUString convertToLocalizedNumerals(std::u16string_view rStr, @@ -2266,10 +2265,10 @@ namespace cppcanvas::internal { MetaMaskAction* pAct = static_cast<MetaMaskAction*>(pCurrAct); - // create masked BitmapEx right here, as the + // create masked Bitmap right here, as the // canvas does not provide equivalent // functionality - Bitmap aBmp( createMaskBmpEx( pAct->GetBitmap(), + Bitmap aBmp( createMaskBmp( pAct->GetBitmap(), pAct->GetColor() )); std::shared_ptr<Action> pBmpAction( @@ -2295,10 +2294,10 @@ namespace cppcanvas::internal { MetaMaskScaleAction* pAct = static_cast<MetaMaskScaleAction*>(pCurrAct); - // create masked BitmapEx right here, as the + // create masked Bitmap right here, as the // canvas does not provide equivalent // functionality - Bitmap aBmp( createMaskBmpEx( pAct->GetBitmap(), + Bitmap aBmp( createMaskBmp( pAct->GetBitmap(), pAct->GetColor() )); std::shared_ptr<Action> pBmpAction( @@ -2326,10 +2325,10 @@ namespace cppcanvas::internal { MetaMaskScalePartAction* pAct = static_cast<MetaMaskScalePartAction*>(pCurrAct); - // create masked BitmapEx right here, as the + // create masked Bitmap right here, as the // canvas does not provide equivalent // functionality - Bitmap aBmp( createMaskBmpEx( pAct->GetBitmap(), + Bitmap aBmp( createMaskBmp( pAct->GetBitmap(), pAct->GetColor() )); // crop bitmap to given source rectangle (no commit b88a8eaf07fb38a53d75bb250a1c3bede9d20e73 Author: Noel Grandin <[email protected]> AuthorDate: Sat Aug 30 20:14:21 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Aug 30 22:01:12 2025 +0200 BitmapEx->Bitmap in cui now that Bitmap can handle transparency Change-Id: I20c981dc6bed40573f5696484a031a4bd08a9480 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190415 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/cui/source/dialogs/GraphicTestsDialog.cxx b/cui/source/dialogs/GraphicTestsDialog.cxx index 25dfe17cc15d..6ff5482e537e 100644 --- a/cui/source/dialogs/GraphicTestsDialog.cxx +++ b/cui/source/dialogs/GraphicTestsDialog.cxx @@ -52,8 +52,7 @@ IMPL_LINK(GraphicTestEntry, HandleResultViewRequest, weld::Button&, rButton, voi { return; } - ImageViewerDialog m_ImgVwDialog(m_xParentDialog, BitmapEx(m_xResultBitmap), - rButton.get_tooltip_text()); + ImageViewerDialog m_ImgVwDialog(m_xParentDialog, m_xResultBitmap, rButton.get_tooltip_text()); m_ImgVwDialog.run(); } diff --git a/cui/source/dialogs/ImageViewerDialog.cxx b/cui/source/dialogs/ImageViewerDialog.cxx index 1c0f537715d7..57a9fdb3d505 100644 --- a/cui/source/dialogs/ImageViewerDialog.cxx +++ b/cui/source/dialogs/ImageViewerDialog.cxx @@ -10,8 +10,7 @@ #include <vcl/virdev.hxx> #include <ImageViewerDialog.hxx> -ImageViewerDialog::ImageViewerDialog(weld::Dialog* pParent, BitmapEx aBitmap, - const OUString& atitle) +ImageViewerDialog::ImageViewerDialog(weld::Dialog* pParent, Bitmap aBitmap, const OUString& atitle) : GenericDialogController(pParent, u"cui/ui/imageviewer.ui"_ustr, u"ImageViewerDialog"_ustr) , m_xDisplayImage(m_xBuilder->weld_image(u"ImgVW_mainImage"_ustr)) { diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 34e3f54fa8f1..aed328af3933 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -43,6 +43,7 @@ #include <tools/stream.hxx> #include <comphelper/diagnose_ex.hxx> #include <utility> +#include <vcl/dibtools.hxx> #include <vcl/image.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> @@ -346,7 +347,7 @@ short SvInsertOleDlg::run() //the image with this icon above it Image aImage = SvFileInformationManager::GetImage(aURL, true); SvMemoryStream aTemp; - WriteDIBBitmapEx(BitmapEx(aImage.GetBitmap()), aTemp); + WriteDIBBitmapEx(aImage.GetBitmap(), aTemp); m_aIconMetaFile = Sequence<sal_Int8>(static_cast<const sal_Int8*>(aTemp.GetData()), aTemp.TellEnd()); m_aIconMediaType = "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\""; } diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index 5b10b75a3ce6..9a83237821c1 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -32,7 +32,7 @@ #include <sfx2/filedlghelper.hxx> #include <tools/stream.hxx> #include <tools/urlobj.hxx> -#include <vcl/bitmapex.hxx> +#include <vcl/bitmap.hxx> #include <vcl/customweld.hxx> #include <vcl/event.hxx> #include <vcl/filter/PngImageWriter.hxx> @@ -158,8 +158,8 @@ private: // local variables weld::Window* mpParentWindow; weld::Dialog& mrParentDialog; - BitmapEx maParentDialogBitmap; - BitmapEx maDimmedDialogBitmap; + Bitmap maParentDialogBitmap; + Bitmap maDimmedDialogBitmap; Size maParentDialogSize; // VirtualDevice for buffered interaction paints diff --git a/cui/source/inc/ImageViewerDialog.hxx b/cui/source/inc/ImageViewerDialog.hxx index c6c763552310..719c9e576919 100644 --- a/cui/source/inc/ImageViewerDialog.hxx +++ b/cui/source/inc/ImageViewerDialog.hxx @@ -8,7 +8,7 @@ */ #pragma once -#include <vcl/bitmapex.hxx> +#include <vcl/bitmap.hxx> #include <vcl/weld.hxx> class ImageViewerDialog : public weld::GenericDialogController @@ -16,5 +16,5 @@ class ImageViewerDialog : public weld::GenericDialogController std::unique_ptr<weld::Image> m_xDisplayImage; public: - ImageViewerDialog(weld::Dialog* pParent, BitmapEx aBitmap, const OUString& atitle); + ImageViewerDialog(weld::Dialog* pParent, Bitmap aBitmap, const OUString& atitle); };
