add new SvxShape hierarchy class

to serve as a shared/common base class, so I can plumb
SvxShape types through chart2.

Change-Id: I8758fff1599c92a214b334ee44cf7b4e582c1915
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127873
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

11 files changed, 29 insertions, 29 deletions

diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx
index dd7be23e3cc6..31badb749c9d 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -77,8 +77,8 @@ protected: //member
     css::uno::Sequence< OUString >                            m_aTextLabels;
     bool                                                      m_bUseTextLabels;
 
-    css::uno::Reference< css::drawing::XShapes > m_xGroupShape_Shapes;
-    css::uno::Reference< css::drawing::XShapes > m_xTextTarget;
+    rtl::Reference< SvxShapeGroupAnyD > m_xGroupShape_Shapes;
+    rtl::Reference< SvxShapeGroupAnyD > m_xTextTarget;
 
     /**
      * This typically consists of 2 TickInfo vectors (i.e. the outer vector
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 5910a0c73ab3..e6d72b45f666 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -113,7 +113,7 @@ static void lcl_ResizeTextShapeToFitAvailableSpace( SvxShapeText& rShape2DText,
 }
 
 static rtl::Reference<SvxShapeText> createSingleLabel(
-            const Reference< drawing::XShapes >& xTarget
+            const rtl::Reference< SvxShapeGroupAnyD >& xTarget
           , const awt::Point& rAnchorScreenPosition2D
           , const OUString& rLabel
           , const AxisLabelProperties& rAxisLabelProperties
@@ -699,7 +699,7 @@ sal_Int32 VCartesianAxis::getTextLevelCount() const
 }
 
 bool VCartesianAxis::createTextShapes(
-    const Reference<drawing::XShapes>& xTarget, TickIter& rTickIter,
+    const rtl::Reference< SvxShapeGroupAnyD >& xTarget, TickIter& rTickIter,
     AxisLabelProperties& rAxisLabelProperties, TickFactory2D const * pTickFactory,
     sal_Int32 nScreenDistanceBetweenTicks )
 {
@@ -946,7 +946,7 @@ bool VCartesianAxis::createTextShapes(
 }
 
 bool VCartesianAxis::createTextShapesSimple(
-    const Reference<drawing::XShapes>& xTarget, TickIter& rTickIter,
+    const rtl::Reference< SvxShapeGroupAnyD >& xTarget, TickIter& rTickIter,
     AxisLabelProperties& rAxisLabelProperties, TickFactory2D const * pTickFactory )
 {
     FixedNumberFormatter aFixedNumberFormatter(
diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx
index 7474c38b6c49..94e9b2ab967a 100644
--- a/chart2/source/view/axes/VCartesianAxis.hxx
+++ b/chart2/source/view/axes/VCartesianAxis.hxx
@@ -117,7 +117,7 @@ private: //methods
      *         method once again to get the text shapes created.
      */
     bool createTextShapes(
-        const css::uno::Reference<css::drawing::XShapes >& xTarget,
+        const rtl::Reference< SvxShapeGroupAnyD >& xTarget,
         TickIter& rTickIter, AxisLabelProperties& rAxisLabelProperties,
         TickFactory2D const * pTickFactory, sal_Int32 nScreenDistanceBetweenTicks );
 
@@ -127,7 +127,7 @@ private: //methods
      * are to be resolved only by adjusting the label tick interval.
      */
     bool createTextShapesSimple(
-        const css::uno::Reference<css::drawing::XShapes >& xTarget,
+        const rtl::Reference< SvxShapeGroupAnyD >& xTarget,
         TickIter& rTickIter, AxisLabelProperties& rAxisLabelProperties,
         TickFactory2D const * pTickFactory );
 
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 277ad26fd625..93ebb6eb3e78 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -200,7 +200,7 @@ void VCartesianGrid::createShapes()
     //somehow equal to axis tickmarks
 
     //create named group shape
-    Reference< drawing::XShapes > xGroupShape_Shapes(
+    rtl::Reference< SvxShapeGroupAnyD > xGroupShape_Shapes(
         createGroupShape( m_xLogicTarget, m_aCID ) );
 
     if(!xGroupShape_Shapes.is())
@@ -231,14 +231,14 @@ void VCartesianGrid::createShapes()
         if( !aLinePropertiesList[nDepth].isLineVisible() )
             continue;
 
-        Reference< drawing::XShapes > xTarget( xGroupShape_Shapes );
+        rtl::Reference< SvxShapeGroupAnyD > xTarget( xGroupShape_Shapes );
         if( nDepth > 0 )
         {
-            xTarget.set( createGroupShape( m_xLogicTarget
+            xTarget = createGroupShape( m_xLogicTarget
                 , ObjectIdentifier::addChildParticle( m_aCID, ObjectIdentifier::createChildParticleWithIndex( OBJECTTYPE_SUBGRID, nDepth-1 ) )
-                ) );
+                );
             if(!xTarget.is())
-                xTarget.set( xGroupShape_Shapes );
+                xTarget = xGroupShape_Shapes;
         }
 
         if(m_nDimension==2)
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 4ae45fd7c549..785bc955f602 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -83,10 +83,10 @@ VCoordinateSystem::~VCoordinateSystem()
 {
 }
 
-void VCoordinateSystem::initPlottingTargets(  const Reference< drawing::XShapes >& xLogicTarget
-       , const Reference< drawing::XShapes >& xFinalTarget
+void VCoordinateSystem::initPlottingTargets(  const rtl::Reference< SvxShapeGroupAnyD >& xLogicTarget
+       , const rtl::Reference< SvxShapeGroupAnyD >& xFinalTarget
        , const Reference< lang::XMultiServiceFactory >& xShapeFactory
-       , Reference< drawing::XShapes >& xLogicTargetForSeriesBehindAxis )
+       , rtl::Reference<SvxShapeGroupAnyD>& xLogicTargetForSeriesBehindAxis )
 {
     OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters");
     //is only allowed to be called once
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index 7bd037096984..fad802e107a8 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -47,7 +47,7 @@ VPolarAngleAxis::~VPolarAngleAxis()
 }
 
 void VPolarAngleAxis::createTextShapes_ForAngleAxis(
-                       const uno::Reference< drawing::XShapes >& xTarget
+                       const rtl::Reference<SvxShapeGroupAnyD>& xTarget
                      , EquidistantTickIter& rTickIter
                      , AxisLabelProperties const & rAxisLabelProperties
                      , double fLogicRadius
diff --git a/chart2/source/view/axes/VPolarAngleAxis.hxx b/chart2/source/view/axes/VPolarAngleAxis.hxx
index 57ade3826cdb..0e0774e9ebc5 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.hxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.hxx
@@ -40,7 +40,7 @@ public:
 
 private: //methods
     void createTextShapes_ForAngleAxis(
-                       const css::uno::Reference< css::drawing::XShapes >& xTarget
+                       const rtl::Reference<SvxShapeGroupAnyD>& xTarget
                      , EquidistantTickIter& rTickIter
                      , AxisLabelProperties const & rAxisLabelProperties
                      , double fLogicRadius, double fLogicZ );
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 79f3cb66d787..188042449c8f 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -154,13 +154,13 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT
 }
 #endif
 
-void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogicTarget
+void VPolarGrid::create2DRadiusGrid( const rtl::Reference<SvxShapeGroupAnyD>& xLogicTarget
         , TickInfoArraysType& rRadiusTickInfos
         , TickInfoArraysType& rAngleTickInfos
         , const std::vector<VLineProperties>& rLinePropertiesList )
 {
-    Reference< drawing::XShapes > xMainTarget(
-        createGroupShape( xLogicTarget, m_aCID ) );
+    rtl::Reference<SvxShapeGroupAnyD> xMainTarget =
+        createGroupShape( xLogicTarget, m_aCID );
 
     const std::vector<ExplicitScaleData>& rScales = m_pPosHelper->getScales();
     const ExplicitScaleData&     rRadiusScale = rScales[1];
@@ -180,14 +180,14 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
         if( !rLinePropertiesList[nDepth].isLineVisible() )
             continue;
 
-        Reference< drawing::XShapes > xTarget( xMainTarget );
+        rtl::Reference<SvxShapeGroupAnyD> xTarget( xMainTarget );
         if( nDepth > 0 )
         {
-            xTarget.set( createGroupShape( xLogicTarget
+            xTarget = createGroupShape( xLogicTarget
                 , ObjectIdentifier::addChildParticle( m_aCID, ObjectIdentifier::createChildParticleWithIndex( OBJECTTYPE_SUBGRID, nDepth-1 ) )
-                ) );
+                );
             if(!xTarget.is())
-                xTarget.set( xMainTarget );
+                xTarget = xMainTarget;
         }
 
         //create axis main lines
diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx
index 304cdfe34b87..c5a9df7bb6e9 100644
--- a/chart2/source/view/axes/VPolarGrid.hxx
+++ b/chart2/source/view/axes/VPolarGrid.hxx
@@ -60,7 +60,7 @@ private: //member
 
     void getAllTickInfos( sal_Int32 nDimensionIndex, TickInfoArraysType& rAllTickInfos ) const;
 
-    void create2DRadiusGrid( const css::uno::Reference<css::drawing::XShapes>& xLogicTarget
+    void create2DRadiusGrid( const rtl::Reference<SvxShapeGroupAnyD>& xLogicTarget
                     , TickInfoArraysType& rRadiusTickInfos
                     , TickInfoArraysType& rAngleTickInfos
                     , const std::vector<VLineProperties>& rLinePropertiesList );
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx
index 0c3e2aaa4d80..04ed5b1d0273 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -62,8 +62,8 @@ void VPolarRadiusAxis::setExplicitScaleAndIncrement(
     m_apAxisWithLabels->setExplicitScaleAndIncrement( rScale, rIncrement );
 }
 
-void VPolarRadiusAxis::initPlotter(  const uno::Reference< drawing::XShapes >& xLogicTarget
-       , const uno::Reference< drawing::XShapes >& xFinalTarget
+void VPolarRadiusAxis::initPlotter(  const rtl::Reference<SvxShapeGroupAnyD>& xLogicTarget
+       , const rtl::Reference<SvxShapeGroupAnyD>& xFinalTarget
        , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory
        , const OUString& rCID )
 {
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx
index 3d69154cee07..36cc0b250c6b 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.hxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx
@@ -35,8 +35,8 @@ public:
     virtual ~VPolarRadiusAxis() override;
 
     virtual void initPlotter(
-          const css::uno::Reference< css::drawing::XShapes >& xLogicTarget
-        , const css::uno::Reference< css::drawing::XShapes >& xFinalTarget
+          const rtl::Reference<SvxShapeGroupAnyD>& xLogicTarget
+        , const rtl::Reference<SvxShapeGroupAnyD>& xFinalTarget
         , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory
         , const OUString& rCID
                 ) override;