diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2022-11-15 19:12:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-11-16 07:57:00 +0100 |
| commit | 8011b16e05c97a92efee2debb23f5eae60f1236b (patch) | |
| tree | 21e65803fa6f15e33e8bbbbbf701819fd0ad6171 /include/drawinglayer/primitive2d | |
| parent | 5b0a6621858b141022743dd8d500558895dedb1f (diff) | |
Use BitmapEx in BitmapPrimitive2D
we no longer need to wrap it in the framework XBitmap
implemenation
Change-Id: I0dc56ad63364e2c5a4cedd5e70d4ae7ea7eae563
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142746
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/drawinglayer/primitive2d')
| -rw-r--r-- | include/drawinglayer/primitive2d/bitmapprimitive2d.hxx | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx index 40d4d5e541bc..79ddb8b60979 100644 --- a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx @@ -23,27 +23,19 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> - -namespace com::sun::star::awt -{ -class XBitmap; -} +#include <vcl/bitmapex.hxx> namespace drawinglayer::primitive2d { /** BitmapPrimitive2D class This class is the central primitive for Bitmap-based primitives. - To keep it independent of Bitmap implementations, use UNO API - XBitmap object as wrapper due to formally used class Bitmap being - vcl-dependent and requiring linking against it. Use VCLUnoHelper - to convert awt::XBitmap <-> Bitmap */ class DRAWINGLAYER_DLLPUBLIC BitmapPrimitive2D final : public BasePrimitive2D { private: /// the Bitmap-data - css::uno::Reference<css::awt::XBitmap> maXBitmap; + BitmapEx maBitmap; /** the object transformation from unit coordinates, defining size, shear, rotate and position @@ -52,11 +44,10 @@ private: public: /// constructor - BitmapPrimitive2D(css::uno::Reference<css::awt::XBitmap> xXBitmap, - basegfx::B2DHomMatrix aTransform); + BitmapPrimitive2D(BitmapEx xBitmap, basegfx::B2DHomMatrix aTransform); /// data read access - const css::uno::Reference<css::awt::XBitmap>& getXBitmap() const { return maXBitmap; } + const BitmapEx& getBitmap() const { return maBitmap; } const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } /// compare operator |