1 files changed, 10 insertions, 19 deletions

diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx
index 9de0a8133b4e..d09bba64aeef 100644
--- a/chart2/source/view/main/PlotterBase.cxx
+++ b/chart2/source/view/main/PlotterBase.cxx
@@ -25,27 +25,21 @@
 namespace chart
 {
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
 
 PlotterBase::PlotterBase( sal_Int32 nDimensionCount )
-        : m_pShapeFactory(nullptr)
-        , m_aCID()
-        , m_nDimension(nDimensionCount)
+        : m_nDimension(nDimensionCount)
         , m_pPosHelper(nullptr)
 {
 }
 
-void PlotterBase::initPlotter(  const uno::Reference< drawing::XShapes >& xLogicTarget
-       , const uno::Reference< drawing::XShapes >& xFinalTarget
-       , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory
+void PlotterBase::initPlotter(  const rtl::Reference<SvxShapeGroupAnyD>& xLogicTarget
+       , const rtl::Reference<SvxShapeGroupAnyD>& xFinalTarget
        , const OUString& rCID )
 {
-    OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters");
+    OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is(),"no proper initialization parameters");
     //is only allowed to be called once
     m_xLogicTarget  = xLogicTarget;
     m_xFinalTarget  = xFinalTarget;
-    m_xShapeFactory = xShapeFactory;
-    m_pShapeFactory = ShapeFactory::getOrCreateShapeFactory(xShapeFactory);
     m_aCID = rCID;
 }
 
@@ -53,13 +47,13 @@ PlotterBase::~PlotterBase()
 {
 }
 
-void PlotterBase::setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis )
+void PlotterBase::setScales( std::vector< ExplicitScaleData >&& rScales, bool bSwapXAndYAxis )
 {
     if (!m_pPosHelper)
         return;
 
     OSL_PRECOND(m_nDimension<=static_cast<sal_Int32>(rScales.size()),"Dimension of Plotter does not fit two dimension of given scale sequence");
-    m_pPosHelper->setScales( rScales, bSwapXAndYAxis );
+    m_pPosHelper->setScales( std::move(rScales), bSwapXAndYAxis );
 }
 
 void PlotterBase::setTransformationSceneToScreen( const drawing::HomogenMatrix& rMatrix)
@@ -73,22 +67,19 @@ void PlotterBase::setTransformationSceneToScreen( const drawing::HomogenMatrix&
     m_pPosHelper->setTransformationSceneToScreen( rMatrix );
 }
 
-uno::Reference< drawing::XShapes > PlotterBase::createGroupShape(
-            const uno::Reference< drawing::XShapes >& xTarget
+rtl::Reference<SvxShapeGroupAnyD> PlotterBase::createGroupShape(
+            const rtl::Reference<SvxShapeGroupAnyD>& xTarget
             , const OUString& rName )
 {
-    if(!m_xShapeFactory.is())
-        return nullptr;
-
     if(m_nDimension==2)
     {
         //create and add to target
-        return m_pShapeFactory->createGroup2D( xTarget, rName );
+        return ShapeFactory::createGroup2D( xTarget, rName );
     }
     else
     {
         //create and added to target
-        return m_pShapeFactory->createGroup3D( xTarget, rName );
+        return ShapeFactory::createGroup3D( xTarget, rName );
     }
 }