Advanced Diagram support: Move class DiagramData to svx AFAP

Splitted and moved parts of DiagramData class to svx as peparation
to access from there. Done as pure virtual class so that no
incarnations will be possible, also made the constructor protected.
The derived class in oox hosts all functionality/data which
involves usage/modification of oox::Shape class. That way we get
closer to get the Diagram DataModel isloated/seperated.
Not-yet moved is the String/Text holding data, it's still in oox.
Moving that one will be next, that will allow to migrate quite
some more functionalty to svx.

Change-Id: I389dbf3ebf6171b8175cf30be7bbc8c20d9a38e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132303
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 0f62224812ad..f58c762f6a1a 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -66,13 +66,13 @@ public:
         { return mpNode; }
     const LayoutNodePtr & getNode() const
         { return mpNode; }
-    DiagramDataPtr & getSampData()
+    OoxDiagramDataPtr& getSampData()
         { return mpSampData; }
-    const DiagramDataPtr & getSampData() const
+    const OoxDiagramDataPtr& getSampData() const
         { return mpSampData; }
-    DiagramDataPtr & getStyleData()
+    OoxDiagramDataPtr& getStyleData()
         { return mpStyleData; }
-    const DiagramDataPtr & getStyleData() const
+    const OoxDiagramDataPtr& getStyleData() const
         { return mpStyleData; }
     LayoutAtomMap & getLayoutAtomMap()
         { return maLayoutAtomMap; }
@@ -88,8 +88,8 @@ private:
     OUString msTitle;
     OUString msDesc;
     LayoutNodePtr  mpNode;
-    DiagramDataPtr mpSampData;
-    DiagramDataPtr mpStyleData;
+    OoxDiagramDataPtr mpSampData;
+    OoxDiagramDataPtr mpStyleData;
     // TODO
     // catLst
     // clrData
@@ -129,9 +129,9 @@ class Diagram
 {
 public:
     explicit Diagram();
-    void setData( const DiagramDataPtr & pData )
+    void setData( OoxDiagramDataPtr& pData )
         { mpData = pData; }
-    const DiagramDataPtr& getData() const
+    const OoxDiagramDataPtr& getData() const
         { return mpData; }
     void setLayout( const DiagramLayoutPtr & pLayout )
         { mpLayout = pLayout; }
@@ -154,7 +154,7 @@ private:
     // This contains groups of shapes: automatic font size is the same in each group.
     oox::core::NamedShapePairs maDiagramFontHeights;
 
-    DiagramDataPtr                 mpData;
+    OoxDiagramDataPtr              mpData;
     DiagramLayoutPtr               mpLayout;
     DiagramQStyleMap               maStyles;
     DiagramColorMap                maColors;