ooxml: Preserve shape style attribute fillRef

Shape style attributes contain the default format for the shape in
case that no direct format is specified for it. This is an example
of the attribute we want to preserve with this patch:

  <wps:style>
    ...
    <a:fillRef idx="1">
      <a:schemeClr val="accent1"/>
    </a:fillRef>
    ...
  </wps:style>

The relevant values in these tags are stored at the maShapeStyleRefs
member in the Shape object. The storage happens at
ShapeStyleContext::onCreateContext which is run when the <a:fillRef>
tag is opened. The ShapeStyleRef object contains the idx value and a
Color object which will contain the inner tag <a:schemeClr>.

The Color object has been modified to store the string value of
schemeClr. The storage happens at ColorValueContext::onStartElement
which is run when the tag <a:schemeClr> is opened.

Later, Shape::createAndInsert is called by the ShapeContextHandler to
create the actual XShape, this happens when the tag <wps:wsp> is
closed. createAndInsert puts idx and schemeClr values into the
InteropGrabBag property of the XShape with the name StyleFillRef.

On export time, when the shape data is written at
ShapeExport::WriteCustomShape, we added a call to
DrawingML::WriteShapeStyle. This method will check the existence of
the InteropGrabBag property in the shape, read the StyleFillRef prop
inside it and output the proper XML to the style definition.

DrawingML::WriteShapeStyle also writes some mock tags into the
<wps:style> because we found that they are compulsory. We will
replace them with the proper data in further patches.

The method putPropertyToGrabBag was added to the Shape object for
convenience.

The data files for some /sd/qa/ unit tests were updated to reflect
the new property StyleFillRef inside the InteropGrabBag.

Change-Id: I5ffa5242852461a1a709a8f169d40f0d7a2c9aa3

3 files changed, 424 insertions, 53 deletions

diff --git a/sd/qa/unit/data/xml/fdo47434_0.xml b/sd/qa/unit/data/xml/fdo47434_0.xml
index 50b275376910..21b0a2931e08 100644
--- a/sd/qa/unit/data/xml/fdo47434_0.xml
+++ b/sd/qa/unit/data/xml/fdo47434_0.xml
@@ -23,7 +23,14 @@
    <Line2 column1="0.000000" column2="2.000000" column3="4366.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="0" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/>
    <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/>
@@ -84,7 +91,14 @@
    <Line2 column1="0.000000" column2="2.000000" column3="5159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="0" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/>
    <PropertyValue name="MirroredX" value="true" handle="0" propertyState="DIRECT_VALUE"/>
@@ -145,7 +159,14 @@
    <Line2 column1="0.000000" column2="2.000000" column3="4366.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="0" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/>
    <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/>
@@ -206,7 +227,14 @@
    <Line2 column1="0.000000" column2="2.000000" column3="5159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="0" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/>
    <PropertyValue name="MirroredX" value="true" handle="0" propertyState="DIRECT_VALUE"/>
diff --git a/sd/qa/unit/data/xml/n762695_0.xml b/sd/qa/unit/data/xml/n762695_0.xml
index d55c97976c3f..1d1e35f1581c 100644
--- a/sd/qa/unit/data/xml/n762695_0.xml
+++ b/sd/qa/unit/data/xml/n762695_0.xml
@@ -13,7 +13,14 @@
    <Line2 column1="0.000000" column2="10856.000000" column3="5160.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
diff --git a/sd/qa/unit/data/xml/n820786_0.xml b/sd/qa/unit/data/xml/n820786_0.xml
index 5983782fe892..335b6150e512 100644
--- a/sd/qa/unit/data/xml/n820786_0.xml
+++ b/sd/qa/unit/data/xml/n820786_0.xml
@@ -258,7 +258,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="2309.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -323,7 +330,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="2309.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -388,7 +402,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="2309.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -453,7 +474,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="2309.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -518,7 +546,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="2309.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -583,7 +618,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="2309.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -648,7 +690,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="4145.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -713,7 +762,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="4145.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -778,7 +834,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="4145.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -843,7 +906,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="4145.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -908,7 +978,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="4145.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -973,7 +1050,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="4145.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1038,7 +1122,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="5981.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1103,7 +1194,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="5981.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1168,7 +1266,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="5981.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1233,7 +1338,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="5981.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1298,7 +1410,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="5981.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1363,7 +1482,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="5981.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1428,7 +1554,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="7816.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1493,7 +1626,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="7816.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1558,7 +1698,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="7816.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1623,7 +1770,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="7816.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1688,7 +1842,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="7816.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1753,7 +1914,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="7816.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1818,7 +1986,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="9652.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1883,7 +2058,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="9652.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1948,7 +2130,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="9652.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2013,7 +2202,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="9652.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2078,7 +2274,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="9652.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2143,7 +2346,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="9652.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2208,7 +2418,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="11488.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2273,7 +2490,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="11488.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2338,7 +2562,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="11488.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2403,7 +2634,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="11488.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2468,7 +2706,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="11488.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2533,7 +2778,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="11488.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2598,7 +2850,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="13323.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2663,7 +2922,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="13323.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2728,7 +2994,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="13323.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2793,7 +3066,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="13323.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2858,7 +3138,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="13323.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2923,7 +3210,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="13323.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2988,7 +3282,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="15159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -3053,7 +3354,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="15159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -3118,7 +3426,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="15159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -3183,7 +3498,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="15159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -3248,7 +3570,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="15159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -3313,7 +3642,14 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="15159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
-  <InteropGrabBag/>
+  <InteropGrabBag>
+   <PropertyValue name="StyleFillRef">
+    <StyleFillRef>
+     <PropertyValue name="SchemeClr" value="accent1" handle="0" propertyState="DIRECT_VALUE"/>
+     <PropertyValue name="Idx" value="1" handle="0" propertyState="DIRECT_VALUE"/>
+    </StyleFillRef>
+   </PropertyValue>
+  </InteropGrabBag>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>