SmartArt: support cnt function

it was necessary to introduce in LayoutAtoms reference to containing
LayoutNode passed by constructors, so that ConditionAtom can
access LayoutNode's name and diagram data

Change-Id: I35c9cb9061f23eb15e7a9372476530e2ead5d0dc
Reviewed-on: https://gerrit.libreoffice.org/41108
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 914c421e1a6d..28db882b5f73 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -147,6 +147,7 @@ typedef std::vector< Point >        Points;
 
 }
 
+class Diagram;
 class LayoutNode;
 typedef std::shared_ptr< LayoutNode > LayoutNodePtr;
 
@@ -197,6 +198,7 @@ typedef std::shared_ptr< DiagramData > DiagramDataPtr;
 class DiagramLayout
 {
 public:
+    DiagramLayout(const Diagram& rDgm) : mrDgm(rDgm) {}
     void setDefStyle( const OUString & sDefStyle )
         { msDefStyle = sDefStyle; }
     void setMinVer( const OUString & sMinVer )
@@ -207,6 +209,8 @@ public:
         { msTitle = sTitle; }
     void setDesc( const OUString & sDesc )
         { msDesc = sDesc; }
+    const Diagram& getDiagram() const
+        { return mrDgm; }
     LayoutNodePtr & getNode()
         { return mpNode; }
     const LayoutNodePtr & getNode() const
@@ -221,6 +225,7 @@ public:
         { return mpStyleData; }
 
 private:
+    const Diagram& mrDgm;
     OUString msDefStyle;
     OUString msMinVer;
     OUString msUniqueId;