1 files changed, 11 insertions, 43 deletions
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index a3650a57807d..a2e0eaf6b6ba 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -19,20 +19,17 @@
 
 #include <sal/config.h>
 
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <drawinglayer/primitive2d/Tools.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <basegfx/utils/canvastools.hxx>
-#include <comphelper/sequence.hxx>
 
 using namespace css;
 
 namespace drawinglayer::primitive2d
 {
-BasePrimitive2D::BasePrimitive2D()
-    : BasePrimitive2DImplBase(m_aMutex)
-{
-}
+BasePrimitive2D::BasePrimitive2D() {}
 
 BasePrimitive2D::~BasePrimitive2D() {}
 
@@ -54,15 +51,15 @@ public:
         : mrViewInformation(rViewInformation)
     {
     }
-    virtual void append(const Primitive2DReference& r) override
+    virtual void visit(const Primitive2DReference& r) override
     {
         maRetval.expand(getB2DRangeFromPrimitive2DReference(r, mrViewInformation));
     }
-    virtual void append(const Primitive2DContainer& r) override
+    virtual void visit(const Primitive2DContainer& r) override
     {
         maRetval.expand(r.getB2DRange(mrViewInformation));
     }
-    virtual void append(Primitive2DContainer&& r) override
+    virtual void visit(Primitive2DContainer&& r) override
     {
         maRetval.expand(r.getB2DRange(mrViewInformation));
     }
@@ -83,56 +80,27 @@ void BasePrimitive2D::get2DDecomposition(
 {
 }
 
-css::uno::Sequence<::css::uno::Reference<::css::graphic::XPrimitive2D>> SAL_CALL
+Primitive2DContainer
 BasePrimitive2D::getDecomposition(const uno::Sequence<beans::PropertyValue>& rViewParameters)
 {
-    const geometry::ViewInformation2D aViewInformation(rViewParameters);
+    const auto aViewInformation = geometry::createViewInformation2D(rViewParameters);
     Primitive2DContainer aContainer;
     get2DDecomposition(aContainer, aViewInformation);
-    return comphelper::containerToSequence(aContainer);
+    return aContainer;
 }
 
-css::geometry::RealRectangle2D SAL_CALL
+css::geometry::RealRectangle2D
 BasePrimitive2D::getRange(const uno::Sequence<beans::PropertyValue>& rViewParameters)
 {
-    const geometry::ViewInformation2D aViewInformation(rViewParameters);
+    const auto aViewInformation = geometry::createViewInformation2D(rViewParameters);
     return basegfx::unotools::rectangle2DFromB2DRectangle(getB2DRange(aViewInformation));
 }
 
-sal_Int64 SAL_CALL BasePrimitive2D::estimateUsage()
+sal_Int64 BasePrimitive2D::estimateUsage()
 {
     return 0; // for now ignore the objects themselves
 }
 
-void BufferedDecompositionPrimitive2D::create2DDecomposition(
-    Primitive2DContainer& /*rContainer*/,
-    const geometry::ViewInformation2D& /*rViewInformation*/) const
-{
-}
-
-BufferedDecompositionPrimitive2D::BufferedDecompositionPrimitive2D()
-    : BasePrimitive2D()
-    , maBuffered2DDecomposition()
-{
-}
-
-void BufferedDecompositionPrimitive2D::get2DDecomposition(
-    Primitive2DDecompositionVisitor& rVisitor,
-    const geometry::ViewInformation2D& rViewInformation) const
-{
-    ::osl::MutexGuard aGuard(m_aMutex);
-
-    if (getBuffered2DDecomposition().empty())
-    {
-        Primitive2DContainer aNewSequence;
-        create2DDecomposition(aNewSequence, rViewInformation);
-        const_cast<BufferedDecompositionPrimitive2D*>(this)->setBuffered2DDecomposition(
-            aNewSequence);
-    }
-
-    rVisitor.append(getBuffered2DDecomposition());
-}
-
 } // end of namespace drawinglayer::primitive2d
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */