diff options
| author | Armin Le Grand <armin.le.grand@me.com> | 2020-04-10 18:07:41 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@me.com> | 2020-04-10 20:37:52 +0200 |
| commit | ae743c6fae4543282f8930dc78175cc510fabbb3 (patch) | |
| tree | eb44065aece45c9fd86b50df495c3746192fb0be /svx | |
| parent | 25468bba15a149edc1e53a7518070c64d4c967e9 (diff) | |
Make BitmapPrimitive2D vcl-independent
as preparation to have drawinglayer module
independent from vcl in the future
Change-Id: Iaa01370f27b51cba5114a54f37d1ec73d0719918
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92048
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/contact/viewcontactofgraphic.cxx | 4 | ||||
| -rw-r--r-- | svx/source/sdr/overlay/overlaytools.cxx | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index fab6105dbfe5..5cfd46b697af 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -46,6 +46,7 @@ #include <editeng/colritem.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <bitmaps.hlst> @@ -211,7 +212,8 @@ namespace sdr::contact xRetval.push_back( drawinglayer::primitive2d::Primitive2DReference( new drawinglayer::primitive2d::BitmapPrimitive2D( - aDraftBitmap, aBitmapMatrix))); + VCLUnoHelper::CreateVCLXBitmap(aDraftBitmap), + aBitmapMatrix))); // consume bitmap size in X aScale.setX(std::max(0.0, aScale.getX() - (fWidth + fDistance))); diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index 6f58ceed190b..e3988797b0de 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -33,6 +33,7 @@ #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <toolkit/helper/vclunohelper.hxx> namespace drawinglayer::primitive2d @@ -179,7 +180,10 @@ ImplPrimitive2DIDBlock(OverlayStaticRectanglePrimitive, PRIMITIVE2D_ID_OVERLAYRE // add BasePosition aTransform.translate(getBasePosition().getX(), getBasePosition().getY()); - rContainer.push_back(new BitmapPrimitive2D(getBitmapEx(), aTransform)); + rContainer.push_back( + new BitmapPrimitive2D( + VCLUnoHelper::CreateVCLXBitmap(getBitmapEx()), + aTransform)); } bool OverlayBitmapExPrimitive::operator==( const BasePrimitive2D& rPrimitive ) const |