drawinglayer/source/primitive2d/BitmapAlphaPrimitive2D.cxx | 4 +-
drawinglayer/source/primitive2d/bitmapprimitive2d.cxx | 2 -
drawinglayer/source/primitive2d/controlprimitive2d.cxx | 2 -
drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx | 2 -
drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx | 16 +++++-----
drawinglayer/source/primitive2d/glowprimitive2d.cxx | 8 ++---
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 4 +-
drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx | 2 -
drawinglayer/source/primitive2d/patternfillprimitive2d.cxx | 2 -
drawinglayer/source/primitive2d/sceneprimitive2d.cxx | 2 -
drawinglayer/source/primitive2d/shadowprimitive2d.cxx | 8 ++---
drawinglayer/source/primitive2d/softedgeprimitive2d.cxx | 8 ++---
drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx | 4 +-
drawinglayer/source/processor2d/cairopixelprocessor2d.cxx | 2 -
drawinglayer/source/processor2d/hittestprocessor2d.cxx | 2 -
drawinglayer/source/tools/emfphelperdata.cxx | 2 -
drawinglayer/source/tools/wmfemfhelper.cxx | 2 -
filter/source/pdf/pdfdecomposer.cxx | 2 -
include/drawinglayer/primitive2d/bitmapprimitive2d.hxx | 6 +--
sd/source/ui/view/outlview.cxx | 2 -
svgio/source/svgreader/svgfeblendnode.cxx | 4 +-
svgio/source/svgreader/svgfecompositenode.cxx | 4 +-
svgio/source/svgreader/svgfeimagenode.cxx | 4 +-
svgio/source/svgreader/svgimagenode.cxx | 2 -
svx/source/sdr/contact/viewcontactofgraphic.cxx | 2 -
svx/source/sdr/overlay/overlaytools.cxx | 2 -
26 files changed, 50 insertions(+), 50 deletions(-)
New commits:
commit 0655d5b6b500c29f475f8e350e467c5ced0d9ccd
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Aug 7 13:25:05 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Mon Aug 11 21:17:56 2025 +0200
BitmapEx->Bitmap in BitmapPrimitive2D
now that Bitmap supports transparency
Change-Id: If3646b64712836c09a274d6b1bcdd7367ce54a6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189136
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/drawinglayer/source/primitive2d/BitmapAlphaPrimitive2D.cxx
b/drawinglayer/source/primitive2d/BitmapAlphaPrimitive2D.cxx
index 8aaca2e5fd15..180ae0ae3c81 100644
--- a/drawinglayer/source/primitive2d/BitmapAlphaPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/BitmapAlphaPrimitive2D.cxx
@@ -46,11 +46,11 @@ Primitive2DReference
BitmapAlphaPrimitive2D::create2DDecomposition(
if (basegfx::fTools::equalZero(getTransparency()))
{
// no transparency, use simple BitmapPrimitive2D
- return Primitive2DReference{ new BitmapPrimitive2D(getBitmap(),
getTransform()) };
+ return Primitive2DReference{ new
BitmapPrimitive2D(Bitmap(getBitmap()), getTransform()) };
}
// default: embed to UnifiedTransparencePrimitive2D
- Primitive2DContainer aContent{ new BitmapPrimitive2D(getBitmap(),
getTransform()) };
+ Primitive2DContainer aContent{ new BitmapPrimitive2D(Bitmap(getBitmap()),
getTransform()) };
return Primitive2DReference{ new
UnifiedTransparencePrimitive2D(std::move(aContent),
getTransparency()) };
}
diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
index 7dc58c3fe00a..82f45be77b6f 100644
--- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
@@ -26,7 +26,7 @@ using namespace com::sun::star;
namespace drawinglayer::primitive2d
{
-BitmapPrimitive2D::BitmapPrimitive2D(BitmapEx xXBitmap, basegfx::B2DHomMatrix
aTransform)
+BitmapPrimitive2D::BitmapPrimitive2D(Bitmap xXBitmap, basegfx::B2DHomMatrix
aTransform)
: maBitmap(std::move(xXBitmap))
, maTransform(std::move(aTransform))
{
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index abf4a3b5e344..d80d2dbebf44 100644
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
@@ -190,7 +190,7 @@ namespace drawinglayer::primitive2d
// create primitive
xRetval = new BitmapPrimitive2D(
- aContent,
+ Bitmap(aContent),
aBitmapTransform);
}
catch( const uno::Exception& )
diff --git a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
index 5a3a6cca67ed..610df57a95e3 100644
--- a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx
@@ -66,7 +66,7 @@ namespace drawinglayer::primitive2d
// create BitmapPrimitive2D with now object-local coordinate data
return
new BitmapPrimitive2D(
- BitmapEx(getBitmap()),
+ getBitmap(),
aObjectTransform);
}
diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
index 251aa99c500e..0e48bf1ff78b 100644
--- a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
@@ -172,7 +172,7 @@ namespace drawinglayer::primitive2d
// TopLeft
xRetval[0] =
new BitmapPrimitive2D(
- BitmapEx(getDiscreteShadow().getTopLeft()),
+ getDiscreteShadow().getTopLeft(),
basegfx::utils::createScaleTranslateB2DHomMatrix(
fBigLenX,
fBigLenY,
@@ -182,7 +182,7 @@ namespace drawinglayer::primitive2d
// Top
xRetval[1] =
new BitmapPrimitive2D(
- BitmapEx(getDiscreteShadow().getTop()),
+ getDiscreteShadow().getTop(),
basegfx::utils::createScaleTranslateB2DHomMatrix(
1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX,
fBorderY,
@@ -192,7 +192,7 @@ namespace drawinglayer::primitive2d
// TopRight
xRetval[2] =
new BitmapPrimitive2D(
- BitmapEx(getDiscreteShadow().getTopRight()),
+ getDiscreteShadow().getTopRight(),
basegfx::utils::createScaleTranslateB2DHomMatrix(
fBigLenX,
fBigLenY,
@@ -202,7 +202,7 @@ namespace drawinglayer::primitive2d
// Right
xRetval[3] =
new BitmapPrimitive2D(
- BitmapEx(getDiscreteShadow().getRight()),
+ getDiscreteShadow().getRight(),
basegfx::utils::createScaleTranslateB2DHomMatrix(
fBorderX,
1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY,
@@ -212,7 +212,7 @@ namespace drawinglayer::primitive2d
// BottomRight
xRetval[4] =
new BitmapPrimitive2D(
- BitmapEx(getDiscreteShadow().getBottomRight()),
+ getDiscreteShadow().getBottomRight(),
basegfx::utils::createScaleTranslateB2DHomMatrix(
fBigLenX,
fBigLenY,
@@ -222,7 +222,7 @@ namespace drawinglayer::primitive2d
// Bottom
xRetval[5] =
new BitmapPrimitive2D(
- BitmapEx(getDiscreteShadow().getBottom()),
+ getDiscreteShadow().getBottom(),
basegfx::utils::createScaleTranslateB2DHomMatrix(
1.0 - (2.0 * (fBorderX + fSingleX)) + fSingleX,
fBorderY,
@@ -232,7 +232,7 @@ namespace drawinglayer::primitive2d
// BottomLeft
xRetval[6] =
new BitmapPrimitive2D(
- BitmapEx(getDiscreteShadow().getBottomLeft()),
+ getDiscreteShadow().getBottomLeft(),
basegfx::utils::createScaleTranslateB2DHomMatrix(
fBigLenX,
fBigLenY,
@@ -242,7 +242,7 @@ namespace drawinglayer::primitive2d
// Left
xRetval[7] =
new BitmapPrimitive2D(
- BitmapEx(getDiscreteShadow().getLeft()),
+ getDiscreteShadow().getLeft(),
basegfx::utils::createScaleTranslateB2DHomMatrix(
fBorderX,
1.0 - (2.0 * (fBorderY + fSingleY)) + fSingleY,
diff --git a/drawinglayer/source/primitive2d/glowprimitive2d.cxx
b/drawinglayer/source/primitive2d/glowprimitive2d.cxx
index 4a4da208e932..6dfe352c9cff 100644
--- a/drawinglayer/source/primitive2d/glowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/glowprimitive2d.cxx
@@ -237,10 +237,10 @@ void GlowPrimitive2D::create2DDecomposition(
// Independent from discrete sizes of glow alpha creation, always
// map and project glow result to geometry range extended by glow
// radius, but to the eventually clipped instance (ClippedRange)
- const primitive2d::Primitive2DReference xEmbedRefBitmap(
- new BitmapPrimitive2D(result,
basegfx::utils::createScaleTranslateB2DHomMatrix(
- aClippedRange.getWidth(),
aClippedRange.getHeight(),
- aClippedRange.getMinX(),
aClippedRange.getMinY())));
+ const primitive2d::Primitive2DReference xEmbedRefBitmap(new
BitmapPrimitive2D(
+ Bitmap(result), basegfx::utils::createScaleTranslateB2DHomMatrix(
+ aClippedRange.getWidth(),
aClippedRange.getHeight(),
+ aClippedRange.getMinX(),
aClippedRange.getMinY())));
rContainer = primitive2d::Primitive2DContainer{ xEmbedRefBitmap };
}
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 7ff6b1c32c71..65b25b301aa2 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -223,7 +223,7 @@ namespace drawinglayer::primitive2d
// need to create BitmapAlphaPrimitive2D/BitmapPrimitive2D
if (basegfx::fTools::equal(getTransparency(), 0.0))
- return new BitmapPrimitive2D(bitmap, getTransform());
+ return new BitmapPrimitive2D(Bitmap(bitmap),
getTransform());
return new BitmapAlphaPrimitive2D(bitmap, getTransform(),
getTransparency());
}
@@ -666,7 +666,7 @@ namespace drawinglayer::primitive2d
{
rContainer.append(
new BitmapPrimitive2D(
- rGraphic.GetBitmapEx(),
+ Bitmap(rGraphic.GetBitmapEx()),
rTransform));
}
else
diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
index 4c756d1fba17..64364f0df407 100644
--- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx
@@ -65,7 +65,7 @@ namespace drawinglayer::primitive2d
aContainer.push_back(
new BitmapPrimitive2D(
- BitmapEx(getMarker()),
+ getMarker(),
aTransform));
}
return new GroupPrimitive2D(std::move(aContainer));
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index 516b0042d960..55d05a29f103 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -148,7 +148,7 @@ namespace drawinglayer::primitive2d
{
const primitive2d::Primitive2DReference
xEmbedRefBitmap(
new primitive2d::BitmapPrimitive2D(
- aBitmapEx,
+ Bitmap(aBitmapEx),
basegfx::B2DHomMatrix()));
aContent = primitive2d::Primitive2DContainer {
xEmbedRefBitmap };
}
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index 8631b316ffdc..2ba6cdf2b8a7 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -530,7 +530,7 @@ namespace drawinglayer::primitive2d
// create bitmap primitive and add
aContainer.push_back(
new BitmapPrimitive2D(
- BitmapEx(maOldRenderedBitmap),
+ maOldRenderedBitmap,
aNew2DTransform));
// test: Allow to add an outline in the debugger when tests are
needed
diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
index dddd9cb3f5c5..4c8726a25b9f 100644
--- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
@@ -274,10 +274,10 @@ void ShadowPrimitive2D::create2DDecomposition(
// Independent from discrete sizes of blur alpha creation, always
// map and project blur result to geometry range extended by blur
// radius, but to the eventually clipped instance (ClippedRange)
- const primitive2d::Primitive2DReference xEmbedRefBitmap(
- new BitmapPrimitive2D(result,
basegfx::utils::createScaleTranslateB2DHomMatrix(
- aClippedRange.getWidth(),
aClippedRange.getHeight(),
- aClippedRange.getMinX(),
aClippedRange.getMinY())));
+ const primitive2d::Primitive2DReference xEmbedRefBitmap(new
BitmapPrimitive2D(
+ Bitmap(result), basegfx::utils::createScaleTranslateB2DHomMatrix(
+ aClippedRange.getWidth(),
aClippedRange.getHeight(),
+ aClippedRange.getMinX(),
aClippedRange.getMinY())));
rContainer = primitive2d::Primitive2DContainer{ xEmbedRefBitmap };
}
diff --git a/drawinglayer/source/primitive2d/softedgeprimitive2d.cxx
b/drawinglayer/source/primitive2d/softedgeprimitive2d.cxx
index 5a34684c7a0c..5d21d8df0fe6 100644
--- a/drawinglayer/source/primitive2d/softedgeprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/softedgeprimitive2d.cxx
@@ -233,10 +233,10 @@ void SoftEdgePrimitive2D::create2DDecomposition(
// Independent from discrete sizes of soft alpha creation, always
// map and project soft result to geometry range extended by soft
// radius, but to the eventually clipped instance (ClippedRange)
- const primitive2d::Primitive2DReference xEmbedRefBitmap(
- new BitmapPrimitive2D(result,
basegfx::utils::createScaleTranslateB2DHomMatrix(
- aClippedRange.getWidth(),
aClippedRange.getHeight(),
- aClippedRange.getMinX(),
aClippedRange.getMinY())));
+ const primitive2d::Primitive2DReference xEmbedRefBitmap(new
BitmapPrimitive2D(
+ Bitmap(result), basegfx::utils::createScaleTranslateB2DHomMatrix(
+ aClippedRange.getWidth(),
aClippedRange.getHeight(),
+ aClippedRange.getMinX(),
aClippedRange.getMinY())));
rContainer = primitive2d::Primitive2DContainer{ xEmbedRefBitmap };
diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
index 9e3af10415dd..b9258ac08732 100644
--- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx
@@ -57,7 +57,7 @@ namespace drawinglayer::primitive2d
aRetval.set(
new BitmapPrimitive2D(
- getBitmapEx(),
+ Bitmap(getBitmapEx()),
aObjectTransform));
}
else
@@ -154,7 +154,7 @@ namespace drawinglayer::primitive2d
aRetval.set(
new BitmapPrimitive2D(
- getBitmapEx(),
+ Bitmap(getBitmapEx()),
aObjectTransform));
// clip when not completely inside object range
diff --git a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
index 91498e124256..3cc449ea7367 100644
--- a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx
@@ -1280,7 +1280,7 @@ void CairoPixelProcessor2D::processBitmapPrimitive2D(
}
}
- paintBitmapAlpha(Bitmap(rBitmapCandidate.getBitmap()),
rBitmapCandidate.getTransform());
+ paintBitmapAlpha(rBitmapCandidate.getBitmap(),
rBitmapCandidate.getTransform());
if (bDrawModeFlagsUsed)
maBColorModifierStack.pop();
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index 948db19c93ee..c210d3cb007b 100644
--- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
@@ -477,7 +477,7 @@ namespace drawinglayer::processor2d
const primitive2d::BitmapPrimitive2D&
rBitmapCandidate(static_cast< const primitive2d::BitmapPrimitive2D&
>(rCandidate));
checkBitmapHit(
rCandidate.getB2DRange(getViewInformation2D()),
- rBitmapCandidate.getBitmap(),
+ BitmapEx(rBitmapCandidate.getBitmap()),
rBitmapCandidate.getTransform());
break;
}
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx
b/drawinglayer/source/tools/emfphelperdata.cxx
index 3d9bef482860..438559e1e13d 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -1549,7 +1549,7 @@ namespace emfplushelper
if (image->type == ImageDataTypeBitmap)
{
- BitmapEx aBmp(image->graphic.GetBitmapEx());
+ Bitmap aBmp(image->graphic.GetBitmapEx());
aBmp.Crop(aSource);
aSize = aBmp.GetSizePixel();
if (aSize.Width() > 0 && aSize.Height() > 0)
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx
b/drawinglayer/source/tools/wmfemfhelper.cxx
index e7fb86ac345d..4cfa6e0b967b 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -625,7 +625,7 @@ namespace wmfemfhelper
rTarget.append(
new drawinglayer::primitive2d::BitmapPrimitive2D(
- rBitmapEx,
+ Bitmap(rBitmapEx),
aObjectTransform));
}
diff --git a/filter/source/pdf/pdfdecomposer.cxx
b/filter/source/pdf/pdfdecomposer.cxx
index b9de5d4fc940..7587adce5aba 100644
--- a/filter/source/pdf/pdfdecomposer.cxx
+++ b/filter/source/pdf/pdfdecomposer.cxx
@@ -90,7 +90,7 @@ XPdfDecomposer::getDecomposition(const
uno::Reference<util::XBinaryDataContainer
// create primitive
return drawinglayer::primitive2d::Primitive2DContainer{
- new
drawinglayer::primitive2d::BitmapPrimitive2D(BitmapEx(aReplacement),
aBitmapTransform)
+ new drawinglayer::primitive2d::BitmapPrimitive2D(aReplacement,
aBitmapTransform)
}
.toSequence();
}
diff --git a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
index 79ddb8b60979..627dcb9ac610 100644
--- a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
@@ -35,7 +35,7 @@ class DRAWINGLAYER_DLLPUBLIC BitmapPrimitive2D final : public
BasePrimitive2D
{
private:
/// the Bitmap-data
- BitmapEx maBitmap;
+ Bitmap maBitmap;
/** the object transformation from unit coordinates, defining
size, shear, rotate and position
@@ -44,10 +44,10 @@ private:
public:
/// constructor
- BitmapPrimitive2D(BitmapEx xBitmap, basegfx::B2DHomMatrix aTransform);
+ BitmapPrimitive2D(Bitmap xBitmap, basegfx::B2DHomMatrix aTransform);
/// data read access
- const BitmapEx& getBitmap() const { return maBitmap; }
+ const Bitmap& getBitmap() const { return maBitmap; }
const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
/// compare operator
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 4d6799a521fa..a86c532cd69b 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1587,7 +1587,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl,
PaintFirstLineInfo*, pInfo, void)
// create BitmapPrimitive2D and add directly
const drawinglayer::primitive2d::Primitive2DReference xBitmap(
new drawinglayer::primitive2d::BitmapPrimitive2D(
- BitmapEx(maSlideImage.GetBitmap()),
+ maSlideImage.GetBitmap(),
basegfx::utils::createScaleTranslateB2DHomMatrix(
aImageSize.Width(), aImageSize.Height(),
aImagePos.X(), aImagePos.Y())));
diff --git a/svgio/source/svgreader/svgfeblendnode.cxx
b/svgio/source/svgreader/svgfeblendnode.cxx
index fe3d987719de..97c519f913dc 100644
--- a/svgio/source/svgreader/svgfeblendnode.cxx
+++ b/svgio/source/svgreader/svgfeblendnode.cxx
@@ -189,8 +189,8 @@ void
SvgFeBlendNode::apply(drawinglayer::primitive2d::Primitive2DContainer& rTar
const drawinglayer::primitive2d::Primitive2DReference xRef(
new drawinglayer::primitive2d::BitmapPrimitive2D(
- BitmapEx(aResBmp),
basegfx::utils::createScaleTranslateB2DHomMatrix(
- aBaseRange.getRange(),
aBaseRange.getMinimum())));
+ aResBmp,
basegfx::utils::createScaleTranslateB2DHomMatrix(aBaseRange.getRange(),
+
aBaseRange.getMinimum())));
rTarget = drawinglayer::primitive2d::Primitive2DContainer{ xRef };
pParent->addGraphicSourceToMapper(maResult, rTarget);
diff --git a/svgio/source/svgreader/svgfecompositenode.cxx
b/svgio/source/svgreader/svgfecompositenode.cxx
index d52312c1277c..c8f0f49abf2c 100644
--- a/svgio/source/svgreader/svgfecompositenode.cxx
+++ b/svgio/source/svgreader/svgfecompositenode.cxx
@@ -262,8 +262,8 @@ void
SvgFeCompositeNode::apply(drawinglayer::primitive2d::Primitive2DContainer&
const drawinglayer::primitive2d::Primitive2DReference xRef(
new drawinglayer::primitive2d::BitmapPrimitive2D(
- BitmapEx(aResBmp),
basegfx::utils::createScaleTranslateB2DHomMatrix(
- aBaseRange.getRange(),
aBaseRange.getMinimum())));
+ aResBmp, basegfx::utils::createScaleTranslateB2DHomMatrix(
+ aBaseRange.getRange(), aBaseRange.getMinimum())));
rTarget = drawinglayer::primitive2d::Primitive2DContainer{ xRef };
}
}
diff --git a/svgio/source/svgreader/svgfeimagenode.cxx
b/svgio/source/svgreader/svgfeimagenode.cxx
index 6a7e5dd9d9c3..89eb5fbda669 100644
--- a/svgio/source/svgreader/svgfeimagenode.cxx
+++ b/svgio/source/svgreader/svgfeimagenode.cxx
@@ -127,8 +127,8 @@ void
SvgFeImageNode::apply(drawinglayer::primitive2d::Primitive2DContainer& rTar
= rTarget.getB2DRange(drawinglayer::geometry::ViewInformation2D());
const drawinglayer::primitive2d::Primitive2DReference xRef(
new drawinglayer::primitive2d::BitmapPrimitive2D(
- aBitmapEx, basegfx::utils::createScaleTranslateB2DHomMatrix(
- aViewBox.getRange(), aViewBox.getMinimum())));
+ Bitmap(aBitmapEx),
basegfx::utils::createScaleTranslateB2DHomMatrix(
+ aViewBox.getRange(),
aViewBox.getMinimum())));
rTarget = drawinglayer::primitive2d::Primitive2DContainer{ xRef };
}
diff --git a/svgio/source/svgreader/svgimagenode.cxx
b/svgio/source/svgreader/svgimagenode.cxx
index 789186d9f4b3..88b469553251 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -301,7 +301,7 @@ namespace svgio::svgreader
// as transformation to map the picture data correctly
aNewTarget.resize(1);
aNewTarget[0] = new
drawinglayer::primitive2d::BitmapPrimitive2D(
- aBitmapEx,
+ Bitmap(aBitmapEx),
basegfx::utils::createScaleTranslateB2DHomMatrix(
aViewBox.getRange(),
aViewBox.getMinimum()));
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx
b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 76fbdf1da64c..0b608190e11d 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -217,7 +217,7 @@ namespace sdr::contact
xRetval.push_back(
new drawinglayer::primitive2d::BitmapPrimitive2D(
- BitmapEx(aDraftBitmap),
+ aDraftBitmap,
aBitmapMatrix));
// consume bitmap size in X
diff --git a/svx/source/sdr/overlay/overlaytools.cxx
b/svx/source/sdr/overlay/overlaytools.cxx
index 6642005039eb..1368713bacba 100644
--- a/svx/source/sdr/overlay/overlaytools.cxx
+++ b/svx/source/sdr/overlay/overlaytools.cxx
@@ -175,7 +175,7 @@ sal_uInt32
OverlayStaticRectanglePrimitive::getPrimitive2DID() const
// add BasePosition
aTransform.translate(getBasePosition().getX(),
getBasePosition().getY());
- return new BitmapPrimitive2D(getBitmapEx(), aTransform);
+ return new BitmapPrimitive2D(Bitmap(getBitmapEx()), aTransform);
}
bool OverlayBitmapExPrimitive::operator==( const BasePrimitive2D&
rPrimitive ) const
