drawinglayer: added dumping of InteropGrabBag prop

XShapeDumper is now also dumping the
InteropGrabBag property as a new empty element.

In the future, new "private" properties added to
the grab bag could be dumped too.

Updated the unit tests accordingly.

Change-Id: I7526dbd64bdc08915dc71f1167f05224118f17a6
Reviewed-on: https://gerrit.libreoffice.org/5848
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>

12 files changed, 138 insertions, 0 deletions

diff --git a/sd/qa/unit/data/pptx/xml/fdo47434_page0.xml b/sd/qa/unit/data/pptx/xml/fdo47434_page0.xml
index 11ccecdc4fb7..334373971e02 100644
--- a/sd/qa/unit/data/pptx/xml/fdo47434_page0.xml
+++ b/sd/qa/unit/data/pptx/xml/fdo47434_page0.xml
@@ -23,6 +23,7 @@
    <Line2 column1="0.000000" column2="2.000000" column3="4366.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/>
    <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/>
@@ -83,6 +84,7 @@
    <Line2 column1="0.000000" column2="2.000000" column3="5159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/>
    <PropertyValue name="MirroredX" value="true" handle="0" propertyState="DIRECT_VALUE"/>
@@ -143,6 +145,7 @@
    <Line2 column1="0.000000" column2="2.000000" column3="4366.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="IsPostRotateAngle" value="true" handle="0" propertyState="DIRECT_VALUE"/>
    <PropertyValue name="MirroredX" value="false" handle="0" propertyState="DIRECT_VALUE"/>
@@ -203,6 +206,7 @@
    <Line2 column1="0.000000" column2="2.000000" column3="5159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <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/n593612_0.xml b/sd/qa/unit/data/xml/n593612_0.xml
index 6f824b13bc73..469bf85b2119 100644
--- a/sd/qa/unit/data/xml/n593612_0.xml
+++ b/sd/qa/unit/data/xml/n593612_0.xml
@@ -13,6 +13,7 @@
    <Line2 column1="0.000000" column2="15193.000000" column3="1324.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
diff --git a/sd/qa/unit/data/xml/n762695_0.xml b/sd/qa/unit/data/xml/n762695_0.xml
index a2eba94f87ef..56ab13cdaf42 100644
--- a/sd/qa/unit/data/xml/n762695_0.xml
+++ b/sd/qa/unit/data/xml/n762695_0.xml
@@ -13,6 +13,7 @@
    <Line2 column1="0.000000" column2="10856.000000" column3="5160.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -99,6 +100,7 @@
    <Line2 column1="-1004.091629" column2="1026.011940" column3="7175.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues>
@@ -176,6 +178,7 @@
    <Line2 column1="1003.384523" column2="1026.011940" column3="6171.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues>
diff --git a/sd/qa/unit/data/xml/n762695_1.xml b/sd/qa/unit/data/xml/n762695_1.xml
index 8d7b6fa00934..70d78ed957e3 100644
--- a/sd/qa/unit/data/xml/n762695_1.xml
+++ b/sd/qa/unit/data/xml/n762695_1.xml
@@ -13,6 +13,7 @@
    <Line2 column1="0.000000" column2="7620.000000" column3="7197.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -99,6 +100,7 @@
    <Line2 column1="0.000000" column2="9529.000000" column3="4229.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -185,6 +187,7 @@
    <Line2 column1="0.000000" column2="1274.000000" column3="5715.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues>
@@ -338,6 +341,7 @@
    <Line2 column1="0.000000" column2="1274.000000" column3="6125.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues>
@@ -491,6 +495,7 @@
    <Line2 column1="0.000000" column2="2672.000000" column3="6125.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <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 b677267fc48b..91cb001bbc44 100644
--- a/sd/qa/unit/data/xml/n820786_0.xml
+++ b/sd/qa/unit/data/xml/n820786_0.xml
@@ -13,6 +13,7 @@
    <Line2 column1="1371.000000" column2="0.000000" column3="6036.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -79,6 +80,7 @@
      <Line2 column1="0.000000" column2="-1058.000000" column3="12758.000000"/>
      <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
     </Transformation>
+    <InteropGrabBag/>
     <CustomShapeGeometry>
      <PropertyValue name="AdjustmentValues">
       <AdjustmentValues/>
@@ -163,6 +165,7 @@
      <Line2 column1="0.000000" column2="-1058.000000" column3="12758.000000"/>
      <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
     </Transformation>
+    <InteropGrabBag/>
     <CustomShapeGeometry>
      <PropertyValue name="AdjustmentValues">
       <AdjustmentValues/>
@@ -240,6 +243,7 @@
    <Line2 column1="0.000000" column2="1058.000000" column3="11701.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
  </XShape>
  <XShape positionX="6985" positionY="2309" sizeX="1481" sizeY="1481" type="com.sun.star.drawing.CustomShape" name="Rectangle 1" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="false" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="HATCH" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName="">
   <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
@@ -254,6 +258,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="2309.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -318,6 +323,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="2309.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -382,6 +388,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="2309.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -446,6 +453,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="2309.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -510,6 +518,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="2309.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -574,6 +583,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="2309.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -638,6 +648,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="4145.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -702,6 +713,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="4145.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -766,6 +778,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="4145.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -830,6 +843,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="4145.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -894,6 +908,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="4145.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -958,6 +973,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="4145.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1022,6 +1038,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="5981.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1086,6 +1103,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="5981.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1150,6 +1168,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="5981.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1214,6 +1233,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="5981.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1278,6 +1298,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="5981.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1342,6 +1363,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="5981.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1406,6 +1428,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="7816.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1470,6 +1493,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="7816.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1534,6 +1558,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="7816.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1598,6 +1623,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="7816.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1662,6 +1688,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="7816.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1726,6 +1753,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="7816.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1790,6 +1818,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="9652.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1854,6 +1883,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="9652.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1918,6 +1948,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="9652.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -1982,6 +2013,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="9652.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2046,6 +2078,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="9652.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2110,6 +2143,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="9652.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2174,6 +2208,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="11488.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2238,6 +2273,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="11488.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2302,6 +2338,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="11488.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2366,6 +2403,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="11488.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2430,6 +2468,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="11488.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2494,6 +2533,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="11488.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2558,6 +2598,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="13323.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2622,6 +2663,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="13323.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2686,6 +2728,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="13323.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2750,6 +2793,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="13323.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2814,6 +2858,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="13323.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2878,6 +2923,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="13323.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -2942,6 +2988,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="15159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -3006,6 +3053,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="15159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -3070,6 +3118,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="15159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -3134,6 +3183,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="15159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -3198,6 +3248,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="15159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
@@ -3262,6 +3313,7 @@
    <Line2 column1="0.000000" column2="1482.000000" column3="15159.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="AdjustmentValues">
     <AdjustmentValues/>
diff --git a/sd/qa/unit/data/xml/shapes-test_page0.xml b/sd/qa/unit/data/xml/shapes-test_page0.xml
index b28a387fca21..cad106168ccb 100644
--- a/sd/qa/unit/data/xml/shapes-test_page0.xml
+++ b/sd/qa/unit/data/xml/shapes-test_page0.xml
@@ -13,6 +13,7 @@
    <Line2 column1="0.000000" column2="2401.000000" column3="1200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -72,6 +73,7 @@
    <Line2 column1="0.000000" column2="3001.000000" column3="1000.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -156,6 +158,7 @@
    <Line2 column1="0.000000" column2="2201.000000" column3="1400.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -215,6 +218,7 @@
    <Line2 column1="0.000000" column2="2401.000000" column3="1400.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -299,6 +303,7 @@
    <Line2 column1="0.000000" column2="2801.000000" column3="1200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -351,6 +356,7 @@
    <Line2 column1="0.000000" column2="1201.000000" column3="2200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -403,6 +409,7 @@
    <Line2 column1="0.000000" column2="3201.000000" column3="4600.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="Type" value="mso-spt100" handle="0" propertyState="DIRECT_VALUE"/>
    <PropertyValue name="AdjustmentValues">
@@ -465,6 +472,7 @@
    <Line2 column1="0.000000" column2="2001.000000" column3="5200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -522,6 +530,7 @@
    <Line2 column1="0.000000" column2="2001.000000" column3="5200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -579,6 +588,7 @@
    <Line2 column1="0.000000" column2="2001.000000" column3="5000.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -640,6 +650,7 @@
    <Line2 column1="0.000000" column2="2801.000000" column3="5200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -701,6 +712,7 @@
    <Line2 column1="0.000000" column2="2001.000000" column3="5600.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -762,6 +774,7 @@
    <Line2 column1="0.000000" column2="2401.000000" column3="9400.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -827,6 +840,7 @@
    <Line2 column1="0.000000" column2="2801.000000" column3="9400.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -896,6 +910,7 @@
    <Line2 column1="0.000000" column2="3201.000000" column3="9200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -975,6 +990,7 @@
    <Line2 column1="0.000000" column2="2601.000000" column3="9400.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -1074,6 +1090,7 @@
    <Line2 column1="0.000000" column2="2601.000000" column3="9400.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -1143,6 +1160,7 @@
    <Line2 column1="0.000000" column2="5201.000000" column3="9200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -1219,6 +1237,7 @@
    <Line2 column1="0.000000" column2="3801.000000" column3="14600.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="88" height="21600"/>
@@ -1384,6 +1403,7 @@
    <Line2 column1="0.000000" column2="3001.000000" column3="14800.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -1495,6 +1515,7 @@
    <Line2 column1="0.000000" column2="3601.000000" column3="15200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -1585,6 +1606,7 @@
    <Line2 column1="0.000000" column2="3201.000000" column3="15200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
diff --git a/sd/qa/unit/data/xml/shapes-test_page1.xml b/sd/qa/unit/data/xml/shapes-test_page1.xml
index cac158f2e472..3475b51cfeef 100644
--- a/sd/qa/unit/data/xml/shapes-test_page1.xml
+++ b/sd/qa/unit/data/xml/shapes-test_page1.xml
@@ -13,6 +13,7 @@
    <Line2 column1="0.000000" column2="1601.000000" column3="1600.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -170,6 +171,7 @@
    <Line2 column1="0.000000" column2="3001.000000" column3="800.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -250,6 +252,7 @@
    <Line2 column1="0.000000" column2="3201.000000" column3="1000.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -334,6 +337,7 @@
    <Line2 column1="0.000000" column2="3401.000000" column3="1000.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="780" height="907"/>
@@ -425,6 +429,7 @@
    <Line2 column1="0.000000" column2="3001.000000" column3="1200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -537,6 +542,7 @@
    <Line2 column1="0.000000" column2="3001.000000" column3="1400.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="858" height="864"/>
@@ -676,6 +682,7 @@
    <Line2 column1="0.000000" column2="3401.000000" column3="4800.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -916,6 +923,7 @@
    <Line2 column1="0.000000" column2="4001.000000" column3="5000.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="153" height="132"/>
@@ -1187,6 +1195,7 @@
    <Line2 column1="0.000000" column2="4401.000000" column3="5600.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -1370,6 +1379,7 @@
    <Line2 column1="0.000000" column2="3601.000000" column3="6200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -1552,6 +1562,7 @@
    <Line2 column1="0.000000" column2="4001.000000" column3="11000.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="14810" height="25050"/>
@@ -2350,6 +2361,7 @@
    <Line2 column1="0.000000" column2="4201.000000" column3="11000.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
diff --git a/sd/qa/unit/data/xml/shapes-test_page2.xml b/sd/qa/unit/data/xml/shapes-test_page2.xml
index 57c64d53b10b..6db1cea0a3fb 100644
--- a/sd/qa/unit/data/xml/shapes-test_page2.xml
+++ b/sd/qa/unit/data/xml/shapes-test_page2.xml
@@ -13,6 +13,7 @@
    <Line2 column1="0.000000" column2="2201.000000" column3="1200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -119,6 +120,7 @@
    <Line2 column1="0.000000" column2="2401.000000" column3="1000.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -303,6 +305,7 @@
    <Line2 column1="0.000000" column2="2201.000000" column3="1400.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -401,6 +404,7 @@
    <Line2 column1="0.000000" column2="3801.000000" column3="1000.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="640" height="861"/>
@@ -493,6 +497,7 @@
    <Line2 column1="0.000000" column2="2601.000000" column3="1400.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="11200" height="11200"/>
@@ -590,6 +595,7 @@
    <Line2 column1="0.000000" column2="2601.000000" column3="1400.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -929,6 +935,7 @@
    <Line2 column1="0.000000" column2="1601.000000" column3="5600.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -1457,6 +1464,7 @@
    <Line2 column1="0.000000" column2="2601.000000" column3="5000.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -1549,6 +1557,7 @@
    <Line2 column1="0.000000" column2="2601.000000" column3="5200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="20590" height="20590"/>
@@ -2023,6 +2032,7 @@
    <Line2 column1="0.000000" column2="1201.000000" column3="6000.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -2107,6 +2117,7 @@
    <Line2 column1="0.000000" column2="2401.000000" column3="5200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -2185,6 +2196,7 @@
    <Line2 column1="0.000000" column2="2401.000000" column3="5400.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -2263,6 +2275,7 @@
    <Line2 column1="0.000000" column2="2601.000000" column3="9800.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -2377,6 +2390,7 @@
    <Line2 column1="0.000000" column2="2801.000000" column3="9800.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -2486,6 +2500,7 @@
    <Line2 column1="0.000000" column2="3201.000000" column3="9200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -2595,6 +2610,7 @@
    <Line2 column1="0.000000" column2="3401.000000" column3="9600.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -2737,6 +2753,7 @@
    <Line2 column1="0.000000" column2="2401.000000" column3="9800.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -2973,6 +2990,7 @@
    <Line2 column1="0.000000" column2="3001.000000" column3="9600.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
diff --git a/sd/qa/unit/data/xml/shapes-test_page3.xml b/sd/qa/unit/data/xml/shapes-test_page3.xml
index d6c969223cf4..dd542f390d19 100644
--- a/sd/qa/unit/data/xml/shapes-test_page3.xml
+++ b/sd/qa/unit/data/xml/shapes-test_page3.xml
@@ -21,6 +21,7 @@
    <Line2 column1="0.000000" column2="2800.000000" column3="1800.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
  </XShape>
  <XShape positionX="4800" positionY="3600" sizeX="1200" sizeY="200" type="com.sun.star.drawing.LineShape" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID">
   <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/>
@@ -43,6 +44,7 @@
    <Line2 column1="0.000000" column2="200.000000" column3="3600.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
  </XShape>
  <XShape positionX="8629" positionY="86" sizeX="7592" sizeY="7398" type="com.sun.star.drawing.OpenBezierShape" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="cfe7f5" fillTransparence="0" fillTransparenceGradientName="">
   <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
@@ -57,6 +59,7 @@
    <Line2 column1="0.000000" column2="7398.482222" column3="85.734286"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <pointSequence>
    <point positionX="8632" positionY="7287" polygonFlags="NORMAL"/>
    <point positionX="8587" positionY="6521" polygonFlags="CONTROL"/>
@@ -220,6 +223,7 @@
    <Line2 column1="0.000000" column2="1200.000000" column3="6400.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
  </XShape>
  <XShape positionX="18348" positionY="525" sizeX="8645" sizeY="6751" type="com.sun.star.drawing.ClosedBezierShape" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="cfe7f5" fillTransparence="0" fillTransparenceGradientName="">
   <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
@@ -234,6 +238,7 @@
    <Line2 column1="0.000000" column2="6751.172578" column3="525.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <pointSequence>
    <point positionX="18348" positionY="7243" polygonFlags="NORMAL"/>
    <point positionX="18951" positionY="7332" polygonFlags="CONTROL"/>
@@ -432,6 +437,7 @@
    <Line2 column1="0.000000" column2="6913.571703" column3="7886.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <pointSequence>
    <point positionX="9200" positionY="13600" polygonFlags="NORMAL"/>
    <point positionX="9200" positionY="12200" polygonFlags="CONTROL"/>
@@ -504,6 +510,7 @@
    <Line2 column1="0.000000" column2="4800.051183" column3="9000.190964"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
  </XShape>
  <XShape positionX="1312" positionY="8865" sizeX="5636" sizeY="6339" type="com.sun.star.drawing.OpenBezierShape" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="cfe7f5" fillTransparence="0" fillTransparenceGradientName="">
   <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
@@ -518,6 +525,7 @@
    <Line2 column1="0.000000" column2="6339.544162" column3="8864.747882"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <pointSequence>
    <point positionX="1401" positionY="13600" polygonFlags="NORMAL"/>
    <point positionX="2001" positionY="11200" polygonFlags="CONTROL"/>
@@ -602,6 +610,7 @@
    <Line2 column1="0.000000" column2="6000.000000" column3="9800.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
  </XShape>
  <XShape positionX="2200" positionY="16600" sizeX="7800" sizeY="3000" type="com.sun.star.drawing.PolyPolygonShape" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="cfe7f5" fillTransparence="0" fillTransparenceGradientName="">
   <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
@@ -652,6 +661,7 @@
    <Line2 column1="0.000000" column2="3000.000000" column3="16600.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
  </XShape>
  <XShape positionX="12400" positionY="17200" sizeX="6200" sizeY="2600" type="com.sun.star.drawing.PolyPolygonShape" fontHeight="18.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="BLOCK" textVerticalAdjust="CENTER" textLeftDistance="250" textRightDistance="250" textUpperDistance="125" textLowerDistance="125" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="cfe7f5" fillTransparence="0" fillTransparenceGradientName="">
   <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
@@ -710,5 +720,6 @@
    <Line2 column1="0.000000" column2="2600.000000" column3="17200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
  </XShape>
 </XShapes>
diff --git a/sd/qa/unit/data/xml/shapes-test_page4.xml b/sd/qa/unit/data/xml/shapes-test_page4.xml
index 5900c6a66315..45b13e68a3ce 100644
--- a/sd/qa/unit/data/xml/shapes-test_page4.xml
+++ b/sd/qa/unit/data/xml/shapes-test_page4.xml
@@ -13,6 +13,7 @@
    <Line2 column1="0.000000" column2="7001.000000" column3="1800.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="88" height="21600"/>
@@ -180,6 +181,7 @@
    <Line2 column1="0.000000" column2="5601.000000" column3="2400.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -293,6 +295,7 @@
    <Line2 column1="0.000000" column2="4601.000000" column3="3800.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="88" height="21600"/>
@@ -458,6 +461,7 @@
    <Line2 column1="0.000000" column2="3001.000000" column3="2000.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -569,6 +573,7 @@
    <Line2 column1="0.000000" column2="5601.000000" column3="9800.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
diff --git a/sd/qa/unit/data/xml/shapes-test_page5.xml b/sd/qa/unit/data/xml/shapes-test_page5.xml
index 048c04c096ad..6f66aa4e9898 100644
--- a/sd/qa/unit/data/xml/shapes-test_page5.xml
+++ b/sd/qa/unit/data/xml/shapes-test_page5.xml
@@ -13,6 +13,7 @@
    <Line2 column1="0.000000" column2="4201.000000" column3="3200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -155,6 +156,7 @@
    <Line2 column1="0.000000" column2="4401.000000" column3="2200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -391,6 +393,7 @@
    <Line2 column1="0.000000" column2="8801.000000" column3="10200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
@@ -532,6 +535,7 @@
    <Line2 column1="0.000000" column2="2601.000000" column3="10200.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
   <CustomShapeGeometry>
    <PropertyValue name="ViewBox">
     <ViewBox x="0" y="0" width="21600" height="21600"/>
diff --git a/sd/qa/unit/data/xml/shapes-test_page7.xml b/sd/qa/unit/data/xml/shapes-test_page7.xml
index 36a01dc363b9..0a31e997b4a7 100644
--- a/sd/qa/unit/data/xml/shapes-test_page7.xml
+++ b/sd/qa/unit/data/xml/shapes-test_page7.xml
@@ -6,5 +6,6 @@
    <Line2 column1="0.000000" column2="7859.000000" column3="9000.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
+  <InteropGrabBag/>
  </XShape>
 </XShapes>