1 files changed, 9 insertions, 19 deletions
diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
index f495d531d8ff..4a6f0041f8b9 100644
--- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
@@ -19,17 +19,15 @@
 
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
-#include <com/sun/star/awt/XBitmap.hpp>
+#include <utility>
 
 using namespace com::sun::star;
 
 namespace drawinglayer::primitive2d
 {
-BitmapPrimitive2D::BitmapPrimitive2D(const css::uno::Reference<css::awt::XBitmap>& rXBitmap,
-                                     const basegfx::B2DHomMatrix& rTransform)
-    : BasePrimitive2D()
-    , maXBitmap(rXBitmap)
-    , maTransform(rTransform)
+BitmapPrimitive2D::BitmapPrimitive2D(Bitmap xXBitmap, basegfx::B2DHomMatrix aTransform)
+    : maBitmap(std::move(xXBitmap))
+    , maTransform(std::move(aTransform))
 {
 }
 
@@ -39,7 +37,7 @@ bool BitmapPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
     {
         const BitmapPrimitive2D& rCompare = static_cast<const BitmapPrimitive2D&>(rPrimitive);
 
-        return (getXBitmap() == rCompare.getXBitmap() && getTransform() == rCompare.getTransform());
+        return (getBitmap() == rCompare.getBitmap() && getTransform() == rCompare.getTransform());
     }
 
     return false;
@@ -53,25 +51,17 @@ BitmapPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInforma
     return aRetval;
 }
 
-sal_Int64 SAL_CALL BitmapPrimitive2D::estimateUsage()
+sal_Int64 BitmapPrimitive2D::estimateUsage()
 {
-    if (!getXBitmap().is())
+    if (getBitmap().IsEmpty())
     {
         return 0;
     }
-
-    uno::Reference<util::XAccounting> const xAcc(getXBitmap(), uno::UNO_QUERY);
-
-    if (!xAcc.is())
-    {
-        return 0;
-    }
-
-    return xAcc->estimateUsage();
+    return getBitmap().GetSizeBytes();
 }
 
 // provide unique ID
-ImplPrimitive2DIDBlock(BitmapPrimitive2D, PRIMITIVE2D_ID_BITMAPPRIMITIVE2D)
+sal_uInt32 BitmapPrimitive2D::getPrimitive2DID() const { return PRIMITIVE2D_ID_BITMAPPRIMITIVE2D; }
 
 } // end of namespace