drawinglayer/source/primitive2d/gridprimitive2d.cxx | 4 ++--
include/drawinglayer/primitive2d/gridprimitive2d.hxx | 8 ++++----
svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 8806772d4d11c1538a6013bbd0ef83a7183a9caa
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Aug 6 21:58:53 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Aug 7 15:25:46 2025 +0200
BitmapEx->Bitmap in GridPrimitive2D
now that Bitmap supports transparency
Change-Id: Icdeb1c51f0681675087c49f52a534b11a9ec4e02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189067
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
index 738f88ca07ca..dd6cca55fad6 100644
--- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
@@ -248,7 +248,7 @@ namespace drawinglayer::primitive2d
}
else
{
- aContainer.push_back(new
MarkerArrayPrimitive2D(std::move(aPositionsCross), Bitmap(getCrossMarker())));
+ aContainer.push_back(new
MarkerArrayPrimitive2D(std::move(aPositionsCross), getCrossMarker()));
}
return new GroupPrimitive2D(std::move(aContainer));
}
@@ -262,7 +262,7 @@ namespace drawinglayer::primitive2d
sal_uInt32 nSubdivisionsX,
sal_uInt32 nSubdivisionsY,
const basegfx::BColor& rBColor,
- const BitmapEx& rCrossMarker)
+ const Bitmap& rCrossMarker)
: maTransform(std::move(aTransform)),
mfWidth(fWidth),
mfHeight(fHeight),
diff --git a/include/drawinglayer/primitive2d/gridprimitive2d.hxx
b/include/drawinglayer/primitive2d/gridprimitive2d.hxx
index aa0b1f20cc3a..cb5f1c1a082d 100644
--- a/include/drawinglayer/primitive2d/gridprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/gridprimitive2d.hxx
@@ -24,7 +24,7 @@
#include <drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/color/bcolor.hxx>
-#include <vcl/bitmapex.hxx>
+#include <vcl/bitmap.hxx>
// GridPrimitive2D class
@@ -58,7 +58,7 @@ namespace drawinglayer::primitive2d
basegfx::BColor maBColor;
/// The Bitmap (with transparence) for grid cross points
- BitmapEx maCrossMarker;
+ Bitmap maCrossMarker;
/** the last used object to view transformtion and the last
Viewport,
used from getDecomposition for decide buffering
@@ -80,7 +80,7 @@ namespace drawinglayer::primitive2d
sal_uInt32 nSubdivisionsX,
sal_uInt32 nSubdivisionsY,
const basegfx::BColor& rBColor,
- const BitmapEx& rCrossMarker);
+ const Bitmap& rCrossMarker);
/// data read access
const basegfx::B2DHomMatrix& getTransform() const { return
maTransform; }
@@ -91,7 +91,7 @@ namespace drawinglayer::primitive2d
sal_uInt32 getSubdivisionsX() const { return mnSubdivisionsX; }
sal_uInt32 getSubdivisionsY() const { return mnSubdivisionsY; }
const basegfx::BColor& getBColor() const { return maBColor; }
- const BitmapEx& getCrossMarker() const { return maCrossMarker; }
+ const Bitmap& getCrossMarker() const { return maCrossMarker; }
/// compare operator
virtual bool operator==(const BasePrimitive2D& rPrimitive) const
override;
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
index 5055eab5780c..3cc27104c3c2 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx
@@ -441,7 +441,7 @@ void
ViewObjectContactOfPageGrid::createPrimitive2DSequence(const DisplayInfo& /
rVisitor.visit(new drawinglayer::primitive2d::GridPrimitive2D(
aGridMatrix, fWidthX, fWidthY, 10.0, 3.0, nSubdivisionsX,
nSubdivisionsY, aRGBGridColor,
-
BitmapEx(drawinglayer::primitive2d::createDefaultCross_3x3(aRGBGridColor))));
+ drawinglayer::primitive2d::createDefaultCross_3x3(aRGBGridColor)));
}
}
