Added Equations & Handles properties

Change-Id: I7912399d2864c964483bbbbc0a6afac3bfa64f66

2 files changed, 49 insertions, 0 deletions

diff --git a/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx b/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx
index a7d26f649124..d58299a076ad 100644
--- a/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/EnhancedShapeDumper.hxx
@@ -27,6 +27,7 @@
  */
 
 #include <libxml/xmlwriter.h>
+
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
@@ -38,6 +39,7 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/PropertyValues.hpp>
 
 #ifndef EnhancedShapeDumper_hxx
 #define EnhancedShapeDumper_hxx
@@ -94,6 +96,8 @@ public:
     void dumpExtrusionAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aExtrusion);
     void dumpPathAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aPath);
     void dumpTextPathAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aTextPath);
+    void dumpEquationsAsElement(com::sun::star::uno::Sequence< rtl::OUString > aEquations);
+    void dumpHandlesAsElement(com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues > aHandles);
 
 private:
     xmlTextWriterPtr xmlWriter;
diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
index 63fea5fcb1c6..8556b3a61866 100644
--- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
+++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
@@ -451,6 +451,18 @@ void EnhancedShapeDumper::dumpEnhancedCustomShapeGeometryService(uno::Reference<
         if(anotherAny >>= aTextPath)
             dumpTextPathAsElement(aTextPath);
     }
+    {
+        uno::Any anotherAny = xPropSet->getPropertyValue("Equations");
+        uno::Sequence< rtl::OUString > aEquations;
+        if(anotherAny >>= aEquations)
+            dumpEquationsAsElement(aEquations);
+    }
+    {
+        uno::Any anotherAny = xPropSet->getPropertyValue("Handles");
+        uno::Sequence< beans::PropertyValues > aHandles;
+        if(anotherAny >>= aHandles)
+            dumpHandlesAsElement(aHandles);
+    }
 }
 void EnhancedShapeDumper::dumpTypeAsAttribute(rtl::OUString sType)
 {
@@ -587,3 +599,36 @@ void EnhancedShapeDumper::dumpTextPathAsElement(uno::Sequence< beans::PropertyVa
     xmlTextWriterEndElement( xmlWriter );
 }
 
+void EnhancedShapeDumper::dumpEquationsAsElement(uno::Sequence< rtl::OUString > aEquations)
+{
+    xmlTextWriterStartElement(xmlWriter, BAD_CAST( "Equations" ));
+    sal_Int32 nLength = aEquations.getLength();
+    for (sal_Int32 i = 0; i < nLength; ++i)
+    {
+        xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("name"), "%s",
+            rtl::OUStringToOString(aEquations[i], RTL_TEXTENCODING_UTF8).getStr());
+    }
+    xmlTextWriterEndElement( xmlWriter );
+}
+
+// PropertyValues specifies a sequence of PropertyValue instances.
+// so in this case it's a Sequence of a Sequence of a PropertyValue instances.
+// Welcome to Sequenception again.
+void EnhancedShapeDumper::dumpHandlesAsElement(uno::Sequence< beans::PropertyValues > aHandles)
+{
+    xmlTextWriterStartElement(xmlWriter, BAD_CAST( "Handles" ));
+    sal_Int32 nSequenceLength = aHandles.getLength();
+    for (sal_Int32 i = 0; i < nSequenceLength; ++i)
+    {
+        xmlTextWriterStartElement(xmlWriter, BAD_CAST( "PropertyValues" ));
+        uno::Sequence< beans::PropertyValue > propertyValueSequence = aHandles[i];
+        sal_Int32 nLength = propertyValueSequence.getLength();
+        for (sal_Int32 j = 0; j < nLength; ++j)
+        {
+            dumpPropertyValueAsElement(propertyValueSequence[j]);
+        }
+        xmlTextWriterEndElement( xmlWriter );
+    }
+    xmlTextWriterEndElement( xmlWriter );
+}
+