3 files changed, 22 insertions, 7 deletions
diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx
index af87754a82a1..96190d14b1b5 100644
--- a/chart2/source/view/main/DataPointSymbolSupplier.cxx
+++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx
@@ -30,15 +30,10 @@ uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList(
             , const uno::Reference< drawing::XShapes >& xTarget
             , const drawing::Direction3D& rSize )
 {
-    uno::Reference< drawing::XShape > xGroup(
-                xShapeFactory->createInstance(
-                "com.sun.star.drawing.GroupShape" ), uno::UNO_QUERY );
-    if(xTarget.is())
-        xTarget->add(xGroup);
+    AbstractShapeFactory* pShapeFactory = AbstractShapeFactory::getOrCreateShapeFactory(xShapeFactory);
     uno::Reference< drawing::XShapes > xGroupShapes =
-        uno::Reference<drawing::XShapes>( xGroup, uno::UNO_QUERY );
+        pShapeFactory->createGroup2D( xTarget );
 
-    AbstractShapeFactory* pShapeFactory = AbstractShapeFactory::getOrCreateShapeFactory(xShapeFactory);
     drawing::Position3D  aPos(0,0,0);
     for(sal_Int32 nS=0;nS<AbstractShapeFactory::getSymbolCount();nS++)
     {
diff --git a/chart2/source/view/main/DummyShapeFactory.cxx b/chart2/source/view/main/DummyShapeFactory.cxx
index 187e8fe69bc8..eb855356cafd 100644
--- a/chart2/source/view/main/DummyShapeFactory.cxx
+++ b/chart2/source/view/main/DummyShapeFactory.cxx
@@ -252,6 +252,14 @@ uno::Reference< drawing::XShape > DummyShapeFactory::createRectangle(
 }
 
 uno::Reference< drawing::XShape >
+    DummyShapeFactory::createRectangle(
+            const uno::Reference<
+            drawing::XShapes >& )
+{
+    return new DummyXShape();
+}
+
+uno::Reference< drawing::XShape >
         DummyShapeFactory::createText( const uno::Reference< drawing::XShapes >&
                     , const OUString&
                     , const tNameSequence&
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 69cc0c1ce51d..5deac27ad5a9 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -2061,6 +2061,18 @@ uno::Reference< drawing::XShape > ShapeFactory::createRectangle(
 }
 
 uno::Reference< drawing::XShape >
+    ShapeFactory::createRectangle(
+            const uno::Reference<
+            drawing::XShapes >& xTarget )
+{
+    uno::Reference< drawing::XShape > xShape( m_xShapeFactory->createInstance(
+                "com.sun.star.drawing.RectangleShape"), uno::UNO_QUERY );
+    xTarget->add( xShape );
+
+    return xShape;
+}
+
+uno::Reference< drawing::XShape >
         ShapeFactory::createText( const uno::Reference< drawing::XShapes >& xTarget
                     , const OUString& rText
                     , const tNameSequence& rPropNames