cui/source/dialogs/about.cxx | 2 +-
cui/source/dialogs/whatsnewtabpage.cxx | 2 +-
include/sfx2/app.hxx | 4 ++--
include/vcl/vectorgraphicdata.hxx | 4 ++--
sfx2/source/appl/appmisc.cxx | 8 ++++----
sfx2/source/dialog/backingwindow.cxx | 2 +-
vcl/source/gdi/vectorgraphicdata.cxx | 10 +++++-----
7 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit cae3854f05b3e2ca65b56e8b05183d6817f9bdf5
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Aug 5 11:02:30 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Aug 5 14:20:33 2025 +0200
BitmapEx->Bitmap in SfxApplication
now that Bitmap can handle transparency
Change-Id: I0a85aa6dc031a7b3fc142f4360e92d3190f0c05c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188942
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 353d23b16f07..ca471ccf71f0 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -96,7 +96,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
// Images
const tools::Long nWidth(m_pCopyrightLabel->get_preferred_size().getWidth());
- BitmapEx aBackgroundBitmap;
+ Bitmap aBackgroundBitmap;
if (SfxApplication::loadBrandSvg(Application::GetSettings()
.GetStyleSettings()
diff --git a/cui/source/dialogs/whatsnewtabpage.cxx
b/cui/source/dialogs/whatsnewtabpage.cxx
index f8eec976948a..2afaa3e18efd 100644
--- a/cui/source/dialogs/whatsnewtabpage.cxx
+++ b/cui/source/dialogs/whatsnewtabpage.cxx
@@ -50,7 +50,7 @@ void WhatsNewTabPage::ActivatePage(const SfxItemSet& /* rSet
*/)
BrandGraphic::BrandGraphic()
: m_bIsFirstStart(false)
{
- BitmapEx aBackgroundBitmap;
+ Bitmap aBackgroundBitmap;
SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, 250);
m_aGraphic = aBackgroundBitmap;
m_aGraphicSize = m_aGraphic.GetSizePixel();
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index a6add5c5ed54..17e10053a64a 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -218,10 +218,10 @@ public:
static void SetModule(SfxToolsModule nSharedLib,
std::unique_ptr<SfxModule> pModule);
static SfxModule* GetModule(SfxToolsModule nSharedLib);
- static bool loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWidth);
+ static bool loadBrandSvg(const char *pName, Bitmap& rBitmap, int nWidth);
/** loads the application logo as used in the impress slideshow pause
screen */
- static BitmapEx GetApplicationLogo(tools::Long nWidth);
+ static Bitmap GetApplicationLogo(tools::Long nWidth);
/** if true then dialog/infobar notifications like the tip of the day or
version change infobar should be suppressed */
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index b02c4761e38e..0b13cc65705e 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -125,7 +125,7 @@ static bool FileExists( const INetURLObject& rURL )
return bRet;
}
-bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int
nWidth)
+bool SfxApplication::loadBrandSvg(const char *pName, Bitmap &rBitmap, int
nWidth)
{
// Load from disk
@@ -197,7 +197,7 @@ bool SfxApplication::loadBrandSvg(const char *pName,
BitmapEx &rBitmap, int nWid
if(xBitmap.is())
{
const uno::Reference< rendering::XIntegerReadOnlyBitmap>
xIntBmp(xBitmap, uno::UNO_QUERY_THROW);
- rBitmap = vcl::unotools::bitmapExFromXBitmap(xIntBmp);
+ rBitmap = vcl::unotools::bitmapFromXBitmap(xIntBmp);
return true;
}
}
@@ -209,9 +209,9 @@ bool SfxApplication::loadBrandSvg(const char *pName,
BitmapEx &rBitmap, int nWid
}
/** loads the application logo as used in the impress slideshow pause screen */
-BitmapEx SfxApplication::GetApplicationLogo(tools::Long nWidth)
+Bitmap SfxApplication::GetApplicationLogo(tools::Long nWidth)
{
- BitmapEx aBitmap;
+ Bitmap aBitmap;
SfxApplication::loadBrandSvg("shell/about", aBitmap, nWidth);
return aBitmap;
}
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 62898e35f08e..1d0ac33cd79d 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -69,7 +69,7 @@ using namespace ::com::sun::star::document;
class BrandImage final : public weld::CustomWidgetController
{
private:
- BitmapEx maBrandImage;
+ Bitmap maBrandImage;
bool mbIsDark = false;
Size m_BmpSize;
commit 848e60d4f3431a41ab371bd25f4383be717f2d74
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Aug 5 09:46:27 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Aug 5 14:20:24 2025 +0200
BitmapEx->Bitmap in convertPrimitive2DSequenceToBitmapEx
now that Bitmap can handle transparency
Change-Id: Ie2b8e7d830a6e11794bb9fd11b1c0ab391653f6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188941
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/vcl/vectorgraphicdata.hxx
b/include/vcl/vectorgraphicdata.hxx
index da1550b47fbe..8102a8f283c2 100644
--- a/include/vcl/vectorgraphicdata.hxx
+++ b/include/vcl/vectorgraphicdata.hxx
@@ -31,10 +31,10 @@
namespace com::sun::star::graphic { class XPrimitive2D; }
-// helper to convert any Primitive2DSequence to a good quality BitmapEx,
+// helper to convert any Primitive2DSequence to a good quality Bitmap,
// using default parameters and graphic::XPrimitive2DRenderer
-BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx(
+Bitmap VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmap(
const std::deque< css::uno::Reference< css::graphic::XPrimitive2D > >&
rSequence,
const basegfx::B2DRange& rTargetRange,
const sal_uInt32 nMaximumQuadraticPixels = 500000,
diff --git a/vcl/source/gdi/vectorgraphicdata.cxx
b/vcl/source/gdi/vectorgraphicdata.cxx
index 784278f4effb..6125ae9a19f8 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -48,14 +48,14 @@
using namespace ::com::sun::star;
-BitmapEx convertPrimitive2DSequenceToBitmapEx(
+Bitmap convertPrimitive2DSequenceToBitmap(
const std::deque< css::uno::Reference< css::graphic::XPrimitive2D > >&
rSequence,
const basegfx::B2DRange& rTargetRange,
const sal_uInt32 nMaximumQuadraticPixels,
const o3tl::Length eTargetUnit,
const std::optional<Size>& rTargetDPI)
{
- BitmapEx aRetval;
+ Bitmap aRetval;
if(!rSequence.empty())
{
@@ -95,7 +95,7 @@ BitmapEx convertPrimitive2DSequenceToBitmapEx(
if(xBitmap.is())
{
const uno::Reference< rendering::XIntegerReadOnlyBitmap>
xIntBmp(xBitmap, uno::UNO_QUERY_THROW);
- aRetval = vcl::unotools::bitmapExFromXBitmap(xIntBmp);
+ aRetval = vcl::unotools::bitmapFromXBitmap(xIntBmp);
}
}
catch (const uno::Exception&)
@@ -179,7 +179,7 @@ void VectorGraphicData::ensureReplacement()
if (!maSequence.empty())
{
- maReplacement =
Bitmap(convertPrimitive2DSequenceToBitmapEx(maSequence, getRange()));
+ maReplacement = convertPrimitive2DSequenceToBitmap(maSequence,
getRange());
}
}
@@ -209,7 +209,7 @@ Bitmap VectorGraphicData::getBitmap(const Size& pixelSize)
const
Size dpi(
std::round(pixelSize.Width() / o3tl::convert(maRange.getWidth(),
o3tl::Length::mm100, o3tl::Length::in)),
std::round(pixelSize.Height() / o3tl::convert(maRange.getHeight(),
o3tl::Length::mm100, o3tl::Length::in)));
- return Bitmap(convertPrimitive2DSequenceToBitmapEx(maSequence, maRange,
4096 * 4096, o3tl::Length::mm100, dpi));
+ return convertPrimitive2DSequenceToBitmap(maSequence, maRange, 4096 *
4096, o3tl::Length::mm100, dpi);
}
void VectorGraphicData::ensureSequenceAndRange()
