Advanced Diagram support: Use better association Model<->XShape

To have a more direct and more reliable association between the
XShape/oox::Shape and the model data svx::diagram::Point I added
optional usage of the Model-UUID for that at the oox::Shape.
Also added a 'fake' UUID to work with the BackgroundShape's
attributes. Changed all preserve/rescue code to work based on that.

Also cleanups/comments and preparations of some flags in the
Diagram ModelData to steer behaviour on re-ceration.

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

1 files changed, 6 insertions, 0 deletions

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index a16e65a71ef1..3d0ee6ebaec8 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -118,6 +118,9 @@ public:
     OUString&                  getServiceName(){ return msServiceName; }
     void                            setServiceName( const char* pServiceName );
 
+    const OUString& getDiagramDataModelID() const { return msDiagramDataModelID; }
+    void setDiagramDataModelID( const OUString& rDiagramDataModelID ) { msDiagramDataModelID = rDiagramDataModelID; }
+
     PropertyMap&                    getShapeProperties(){ return maShapeProperties; }
 
     LineProperties&          getLineProperties() { return *mpLinePropertiesPtr; }
@@ -408,6 +411,9 @@ private:
     // temporary space for DiagramHelper in preparation for collecting data
     // Note: I tried to use a unique_ptr here, but existing constructor func does not allow that
     IDiagramHelper* mpDiagramHelper;
+
+    // association-ID to identify the Diagram ModelData
+    OUString msDiagramDataModelID;
 };
 
 }