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 /drawinglayer/source/tools | |
| 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 'drawinglayer/source/tools')
| -rw-r--r-- | drawinglayer/source/tools/emfphelperdata.cxx | 5 | ||||
| -rw-r--r-- | drawinglayer/source/tools/wmfemfhelper.cxx | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx index 2758509f9856..bc04cd3e8df3 100644 --- a/drawinglayer/source/tools/emfphelperdata.cxx +++ b/drawinglayer/source/tools/emfphelperdata.cxx @@ -55,6 +55,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <i18nlangtag/languagetag.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <algorithm> @@ -1510,7 +1511,9 @@ namespace emfplushelper if (aSize.Width() > 0 && aSize.Height() > 0) { mrTargetHolders.Current().append( - std::make_unique<drawinglayer::primitive2d::BitmapPrimitive2D>(aBmp, aTransformMatrix)); + std::make_unique<drawinglayer::primitive2d::BitmapPrimitive2D>( + VCLUnoHelper::CreateVCLXBitmap(aBmp), + aTransformMatrix)); } else { diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index bb4146ca9444..bef598449ce9 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -59,6 +59,7 @@ #include <i18nlangtag/languagetag.hxx> #include <emfplushelper.hxx> #include <numeric> +#include <toolkit/helper/vclunohelper.hxx> namespace drawinglayer::primitive2d { @@ -661,7 +662,7 @@ namespace wmfemfhelper rTarget.append( std::make_unique<drawinglayer::primitive2d::BitmapPrimitive2D>( - rBitmapEx, + VCLUnoHelper::CreateVCLXBitmap(rBitmapEx), aObjectTransform)); } } |