filter/source/graphicfilter/icgm/actimpr.cxx | 2 +-
filter/source/graphicfilter/icgm/bitmap.hxx | 4 ++--
include/vcl/bitmap.hxx | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit b3de253481cee983bf556fa2a268a77eac43a431
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Aug 5 19:46:57 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Tue Aug 5 21:55:51 2025 +0200
BitmapEx->Bitmap in CGMBitmapDescriptor
now that Bitmap can handle transparency
Change-Id: I7e495152c15b7616d6b5ab19714a29300197eb48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188969
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx
b/filter/source/graphicfilter/icgm/actimpr.cxx
index 2b8f4a8ab38a..3d51d8e4470a 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -600,7 +600,7 @@ void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor*
pBmpDesc )
ImplSetOrientation( aOrigin, pBmpDesc->mnOrientation );
}
- uno::Reference< awt::XBitmap > xBitmap( VCLUnoHelper::CreateBitmap(
Bitmap(pBmpDesc->mxBitmap) ) );
+ uno::Reference< awt::XBitmap > xBitmap( VCLUnoHelper::CreateBitmap(
pBmpDesc->mxBitmap ) );
maXPropSet->setPropertyValue( u"GraphicObjectFillBitmap"_ustr,
uno::Any(xBitmap) );
}
diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx
b/filter/source/graphicfilter/icgm/bitmap.hxx
index 564284b22135..26e396cf89c8 100644
--- a/filter/source/graphicfilter/icgm/bitmap.hxx
+++ b/filter/source/graphicfilter/icgm/bitmap.hxx
@@ -20,7 +20,7 @@
#pragma once
#include "cgm.hxx"
-#include <vcl/bitmapex.hxx>
+#include <vcl/bitmap.hxx>
#include <vector>
class CGM;
@@ -30,7 +30,7 @@ class CGMBitmapDescriptor
public:
sal_uInt8* mpBuf;
sal_uInt8* mpEndBuf;
- BitmapEx mxBitmap;
+ Bitmap mxBitmap;
bool mbStatus;
bool mbVMirror;
sal_uInt32 mnDstBitsPerPixel;
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 110c805380dd..464103980acf 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -216,9 +216,7 @@ public:
not only returned when the operation failed, but also if
nothing had to be done, e.g. because nDX and nDY were zero.
*/
- SAL_DLLPRIVATE bool Expand(
- sal_Int32 nDX, sal_Int32 nDY,
- const Color* pInitColor = nullptr );
+ bool Expand( sal_Int32 nDX, sal_Int32 nDY, const Color* pInitColor =
nullptr );
/** Copy a rectangular area from another bitmap
