oox: update source/drawingml/customshapepresets*

Change-Id: Ic582eb63b9cf9f8f6c757f2e6ed67da5e592e3b8

6 files changed, 22920 insertions, 22920 deletions

diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx
index 71cdedca6897..639b64407f8d 100644
--- a/oox/source/drawingml/customshapepresets1.cxx
+++ b/oox/source/drawingml/customshapepresets1.cxx
@@ -23,46 +23,164 @@ namespace oox { namespace drawingml {
 
 namespace
 {
-class ShapeCactionButtonSound : public CustomShapeProvider
+class ShapeCaccentBorderCallout1 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
+        {
+            Any aAny ((sal_Int32) 18750);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) -8333);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 112500);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) -38333);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "?0 *3/8",
+            "logheight*$0 /100000",
+            "logwidth*$1 /100000",
+            "logheight*$2 /100000",
+            "logwidth*$3 /100000",
+            "logwidth",
             "logheight/2",
-            "?2 +0-?1 ",
-            "?2 +?1 -0",
             "logwidth/2",
-            "?5 +0-?1 ",
-            "?5 +?1 -0",
-            "?0 *3/4",
-            "?8 *1/8",
-            "?8 *5/16",
-            "?8 *5/8",
-            "?8 *11/16",
-            "?8 *3/4",
-            "?8 *7/8",
-            "?3 +?9 -0",
-            "?3 +?10 -0",
-            "?3 +?12 -0",
-            "?3 +?14 -0",
-            "?6 +?10 -0",
-            "?6 +?11 -0",
-            "?6 +?13 -0",
-            "logwidth",
             "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    1, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -83,157 +201,37 @@ class ShapeCactionButtonSound : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    22, 0
+                    4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
+                    4, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 2
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 17
+                    1, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    22, 0
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 23
+                    3, 2
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -245,31 +243,13 @@ class ShapeCactionButtonSound : public CustomShapeProvider
                 1,1,
                 2,3,
                 4,0,
-                1,1,
-                2,5,
-                4,0,
-                7,0,
                 5,0,
                 1,1,
-                2,5,
-                4,0,
-                18,0,
-                7,0,
-                5,0,
-                1,1,
-                2,5,
-                4,0,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                1,1,
                 2,1,
                 6,0,
                 5,0,
                 1,1,
-                2,3,
-                4,0,
+                2,1,
                 6,0,
                 5,0
             };
@@ -294,7 +274,7 @@ class ShapeCactionButtonSound : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        22, 23
+                        4, 7
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -312,7 +292,7 @@ class ShapeCactionButtonSound : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonSound"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentBorderCallout1"));
 
     return aPropertyMap;
   }
@@ -320,14 +300,14 @@ class ShapeCactionButtonSound : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCborderCallout1 : public CustomShapeProvider
+class ShapeCaccentBorderCallout2 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (6);
         {
             Any aAny ((sal_Int32) 18750);
             aAdjSequence [0].Value = aAny;
@@ -339,15 +319,25 @@ class ShapeCborderCallout1 : public CustomShapeProvider
             aAdjSequence [1].Name = "adj2";
         }
         {
-            Any aAny ((sal_Int32) 112500);
+            Any aAny ((sal_Int32) 18750);
             aAdjSequence [2].Value = aAny;
             aAdjSequence [2].Name = "adj3";
         }
         {
-            Any aAny ((sal_Int32) -38333);
+            Any aAny ((sal_Int32) -16667);
             aAdjSequence [3].Value = aAny;
             aAdjSequence [3].Name = "adj4";
         }
+        {
+            Any aAny ((sal_Int32) 112500);
+            aAdjSequence [4].Value = aAny;
+            aAdjSequence [4].Name = "adj5";
+        }
+        {
+            Any aAny ((sal_Int32) -46667);
+            aAdjSequence [5].Value = aAny;
+            aAdjSequence [5].Name = "adj6";
+        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
@@ -356,6 +346,8 @@ class ShapeCborderCallout1 : public CustomShapeProvider
             "logwidth*$1 /100000",
             "logheight*$2 /100000",
             "logwidth*$3 /100000",
+            "logheight*$4 /100000",
+            "logwidth*$5 /100000",
             "logwidth",
             "logheight/2",
             "logwidth/2",
@@ -364,7 +356,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
         {
             Sequence< PropertyValue > aPropSequence (7);
             {
@@ -477,6 +469,62 @@ class ShapeCborderCallout1 : public CustomShapeProvider
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 4
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 5);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 4);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -498,17 +546,27 @@ class ShapeCborderCallout1 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    6, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 7
+                    6, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
+                    0, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    1, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -519,6 +577,11 @@ class ShapeCborderCallout1 : public CustomShapeProvider
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
                     3, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 4
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -534,6 +597,10 @@ class ShapeCborderCallout1 : public CustomShapeProvider
                 1,1,
                 2,1,
                 6,0,
+                5,0,
+                1,1,
+                2,2,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -557,7 +624,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 7
+                        6, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -575,7 +642,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-borderCallout1"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentBorderCallout2"));
 
     return aPropertyMap;
   }
@@ -583,36 +650,300 @@ class ShapeCborderCallout1 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCplaqueTabs : public CustomShapeProvider
+class ShapeCaccentBorderCallout3 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (8);
+        {
+            Any aAny ((sal_Int32) 18750);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) -8333);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 18750);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) -16667);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
+        {
+            Any aAny ((sal_Int32) 100000);
+            aAdjSequence [4].Value = aAny;
+            aAdjSequence [4].Name = "adj5";
+        }
+        {
+            Any aAny ((sal_Int32) -16667);
+            aAdjSequence [5].Value = aAny;
+            aAdjSequence [5].Name = "adj6";
+        }
+        {
+            Any aAny ((sal_Int32) 112963);
+            aAdjSequence [6].Value = aAny;
+            aAdjSequence [6].Name = "adj7";
+        }
+        {
+            Any aAny ((sal_Int32) -8333);
+            aAdjSequence [7].Value = aAny;
+            aAdjSequence [7].Name = "adj8";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "sqrt(logwidth*logwidth+logheight*logheight+0*0)",
-            "1*?0 /20",
-            "0+logheight-?1 ",
-            "0+logwidth-?1 ",
-            "logheight",
+            "logheight*$0 /100000",
+            "logwidth*$1 /100000",
+            "logheight*$2 /100000",
+            "logwidth*$3 /100000",
+            "logheight*$4 /100000",
+            "logwidth*$5 /100000",
+            "logheight*$6 /100000",
+            "logwidth*$7 /100000",
             "logwidth",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0"
+            "logheight/2",
+            "logwidth/2",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    1, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 4
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 5);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 4);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 6
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 7);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 6);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [3] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -633,77 +964,47 @@ class ShapeCplaqueTabs : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 1
+                    8, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 9
+                    8, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
+                    0, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 1
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 11
+                    1, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 4
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 1
+                    3, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
+                    5, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
+                    7, 6
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -713,24 +1014,16 @@ class ShapeCplaqueTabs : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,1,
-                17,1,
-                4,0,
-                5,0,
-                1,1,
-                17,1,
-                2,1,
+                2,3,
                 4,0,
                 5,0,
                 1,1,
                 2,1,
-                17,1,
-                4,0,
+                6,0,
                 5,0,
                 1,1,
-                17,1,
-                2,1,
-                4,0,
+                2,3,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -743,9 +1036,9 @@ class ShapeCplaqueTabs : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        1, 1
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -754,7 +1047,7 @@ class ShapeCplaqueTabs : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        3, 2
+                        8, 11
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -772,7 +1065,7 @@ class ShapeCplaqueTabs : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-plaqueTabs"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentBorderCallout3"));
 
     return aPropertyMap;
   }
@@ -780,203 +1073,162 @@ class ShapeCplaqueTabs : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcurvedLeftArrow : public CustomShapeProvider
+class ShapeCaccentCallout1 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 18750);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) -8333);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 112500);
             aAdjSequence [2].Value = aAny;
             aAdjSequence [2].Name = "adj3";
         }
+        {
+            Any aAny ((sal_Int32) -38333);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "50000*logheight/?0 ",
-            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "if(0-$0 ,0,if(?2 -$0 ,$0 ,?2 ))",
-            "?0 *?3 /100000",
-            "?0 *?2 /100000",
-            "(?4 +?5 )/4",
-            "logheight/2",
-            "?7 +0-?6 ",
-            "?8 *2/1",
-            "?9 *?9 /1",
-            "?4 *?4 /1",
-            "?10 +0-?11 ",
-            "sqrt(?12 )",
-            "?13 *logwidth/?9 ",
-            "100000*?14 /?0 ",
-            "if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))",
-            "?0 *?16 /100000",
-            "?8 +?4 -0",
-            "logwidth*logwidth/1",
-            "?17 *?17 /1",
-            "?19 +0-?20 ",
-            "sqrt(?21 )",
-            "?22 *?8 /logwidth",
-            "?8 +?23 -0",
-            "?18 +?23 -0",
-            "?5 +0-?4 ",
-            "?26 *1/2",
-            "?24 +0-?27 ",
-            "?25 +?27 -0",
-            "?5 *1/2",
-            "logheight+0-?30 ",
-            "0+?17 -0",
-            "(10800000*atan2(?23 ,?17 ))/pi",
-            "0+0-?33 ",
-            "0+?14 -0",
-            "(?8 +?18 )/2",
-            "?4 *1/2",
-            "(10800000*atan2(?37 ,?14 ))/pi",
-            "?38 +0-?33 ",
-            "?33 +?38 -0",
-            "0+0-?38 ",
-            "logwidth",
-            "logheight",
+            "logheight*$0 /100000",
+            "logwidth*$1 /100000",
+            "logheight*$2 /100000",
+            "logwidth*$3 /100000",
             "logwidth",
-            "(?33 )/60000.0",
-            "(?39 )/60000.0",
-            "(?41 )/60000.0",
-            "(?40 )/60000.0",
-            "(0)/60000.0",
-            "(-5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(-5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(?33 )/60000.0",
-            "(?33 )/60000.0",
-            "(?39 )/60000.0"
+            "logheight/2",
+            "logwidth/2",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 24
+                    1, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    42, 28
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [3].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [4].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
+                aPropSequence [4].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [5].Name = "RefX";
                 Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [5].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [1] = aPropSequence;
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 43
+                    3, 2
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 15);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
                 Any aAny ((sal_Int32) 2);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [6].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [2] = aPropSequence;
+            aPropSequenceSequence [1] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -993,148 +1245,43 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 31
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    32, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    32, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    44, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    45, 46
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    44, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    47, 48
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    32, 29
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    42, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    44, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    49, 50
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
                     0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    44, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    51, 52
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    42, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    44, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    53, 54
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    44, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    55, 56
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    42, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    44, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    57, 58
+                    4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 29
+                    4, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 31
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    32, 28
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 24
+                    1, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    44, 8
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    59, 60
+                    3, 2
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1144,28 +1291,16 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,2,
-                17,2,
-                2,1,
+                2,3,
                 4,0,
                 7,0,
                 5,0,
                 1,1,
-                17,1,
                 2,1,
-                17,1,
-                4,0,
-                19,0,
-                7,0,
+                6,0,
                 5,0,
                 1,1,
-                17,1,
-                2,1,
-                17,1,
                 2,1,
-                17,1,
-                2,4,
-                17,1,
                 6,0,
                 5,0
             };
@@ -1190,7 +1325,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        42, 43
+                        4, 7
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -1208,7 +1343,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedLeftArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentCallout1"));
 
     return aPropertyMap;
   }
@@ -1216,54 +1351,79 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCoctagon : public CustomShapeProvider
+class ShapeCaccentCallout2 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (6);
         {
-            Any aAny ((sal_Int32) 29289);
+            Any aAny ((sal_Int32) 18750);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) -8333);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 18750);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) -16667);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
+        {
+            Any aAny ((sal_Int32) 112500);
+            aAdjSequence [4].Value = aAny;
+            aAdjSequence [4].Name = "adj5";
+        }
+        {
+            Any aAny ((sal_Int32) -46667);
+            aAdjSequence [5].Value = aAny;
+            aAdjSequence [5].Name = "adj6";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "logwidth+0-?2 ",
-            "logheight+0-?2 ",
-            "?2 *1/2",
-            "logwidth+0-?5 ",
-            "logheight+0-?5 ",
+            "logheight*$0 /100000",
+            "logwidth*$1 /100000",
+            "logheight*$2 /100000",
+            "logwidth*$3 /100000",
+            "logheight*$4 /100000",
+            "logwidth*$5 /100000",
             "logwidth",
+            "logheight/2",
+            "logwidth/2",
             "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    1, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -1271,18 +1431,151 @@ class ShapeCoctagon : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [6].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 4
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 5);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 4);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -1298,43 +1591,48 @@ class ShapeCoctagon : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    6, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 9
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    0, 9
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 4
+                    1, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 9
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 9
+                    3, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 4
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1344,8 +1642,17 @@ class ShapeCoctagon : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,7,
+                2,3,
                 4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,1,
+                6,0,
+                5,0,
+                1,1,
+                2,2,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -1358,9 +1665,9 @@ class ShapeCoctagon : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        5, 5
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1369,7 +1676,7 @@ class ShapeCoctagon : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 7
+                        6, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -1387,7 +1694,7 @@ class ShapeCoctagon : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-octagon"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentCallout2"));
 
     return aPropertyMap;
   }
@@ -1395,189 +1702,299 @@ class ShapeCoctagon : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCleftRightRibbon : public CustomShapeProvider
+class ShapeCaccentCallout3 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (8);
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 18750);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) -8333);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
         {
-            Any aAny ((sal_Int32) 16667);
+            Any aAny ((sal_Int32) 18750);
             aAdjSequence [2].Value = aAny;
             aAdjSequence [2].Name = "adj3";
         }
+        {
+            Any aAny ((sal_Int32) -16667);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
+        {
+            Any aAny ((sal_Int32) 100000);
+            aAdjSequence [4].Value = aAny;
+            aAdjSequence [4].Name = "adj5";
+        }
+        {
+            Any aAny ((sal_Int32) -16667);
+            aAdjSequence [5].Value = aAny;
+            aAdjSequence [5].Name = "adj6";
+        }
+        {
+            Any aAny ((sal_Int32) 112963);
+            aAdjSequence [6].Value = aAny;
+            aAdjSequence [6].Name = "adj7";
+        }
+        {
+            Any aAny ((sal_Int32) -8333);
+            aAdjSequence [7].Value = aAny;
+            aAdjSequence [7].Name = "adj8";
+        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$2 ,0,if(33333-$2 ,$2 ,33333))",
-            "100000+0-?0 ",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "logwidth/2",
-            "logwidth/32",
-            "?3 +0-?4 ",
-            "min(logwidth,logheight)",
-            "100000*?5 /?6 ",
-            "if(0-$1 ,0,if(?7 -$1 ,$1 ,?7 ))",
-            "?6 *?8 /100000",
-            "logwidth+0-?9 ",
-            "logheight*?2 /200000",
-            "logheight*?0 /-200000",
+            "logheight*$0 /100000",
+            "logwidth*$1 /100000",
+            "logheight*$2 /100000",
+            "logwidth*$3 /100000",
+            "logheight*$4 /100000",
+            "logwidth*$5 /100000",
+            "logheight*$6 /100000",
+            "logwidth*$7 /100000",
+            "logwidth",
             "logheight/2",
-            "?13 +?12 -?11 ",
-            "?13 +?11 -?12 ",
-            "?14 +?11 -0",
-            "logheight+0-?16 ",
-            "?16 *2/1",
-            "logheight+0-?18 ",
-            "?18 +0-?14 ",
-            "logheight+0-?20 ",
-            "?0 *?6 /400000",
             "logwidth/2",
-            "?23 +0-?4 ",
-            "?23 +?4 -0",
-            "?14 +?22 -0",
-            "?21 +0-?22 ",
-            "logwidth",
-            "logheight",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(-10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(-10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(-10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0"
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 21
+                    1, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [6].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 7);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [6].Value = makeAny (aAny);
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 21
+                    5, 4
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 33333);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 5);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 4);
+                aPropSequence [6].Value = makeAny (aAny);
             }
             aPropSequenceSequence [2] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 6
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 7);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 6);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [3] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -1593,243 +2010,511 @@ class ShapeCleftRightRibbon : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 16
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    9, 0
+                    8, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 14
+                    8, 11
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    0, 11
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 14
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 22
+                    1, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 31
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 22
+                    3, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 33
+                    5, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 21
+                    7, 6
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,3,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,1,
+                6,0,
+                5,0,
+                1,1,
+                2,3,
+                6,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        8, 11
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentCallout3"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCactionButtonBackPrevious : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+    }
+    {
+        static const char *aStrings[] = {
+            "min(logwidth,logheight)",
+            "?0 *3/8",
+            "logheight/2",
+            "?2 +0-?1 ",
+            "?2 +?1 -0",
+            "logwidth/2",
+            "?5 +0-?1 ",
+            "?5 +?1 -0",
+            "logwidth",
+            "logheight"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 19
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    8, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 17
+                    8, 9
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 29
+                    0, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 15
+                    6, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 15
+                    7, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 22
+                    7, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    34, 35
+                    6, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 20
+                    7, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 20
+                    7, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 18
+                    6, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
+                    7, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 22
+                    7, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    36, 37
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    8, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 22
+                    8, 9
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    0, 9
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,3,
+                4,0,
+                1,1,
+                2,2,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,2,
+                4,0,
+                18,0,
+                7,0,
+                5,0,
+                1,1,
+                2,2,
+                4,0,
+                6,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
+                6,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        8, 9
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonBackPrevious"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCactionButtonBeginning : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+    }
+    {
+        static const char *aStrings[] = {
+            "min(logwidth,logheight)",
+            "?0 *3/8",
+            "logheight/2",
+            "?2 +0-?1 ",
+            "?2 +?1 -0",
+            "logwidth/2",
+            "?5 +0-?1 ",
+            "?5 +?1 -0",
+            "?0 *3/4",
+            "?8 *1/8",
+            "?8 *1/4",
+            "?6 +?9 -0",
+            "?6 +?10 -0",
+            "logwidth",
+            "logheight"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    38, 39
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    13, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 21
+                    13, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 16
+                    0, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 14
+                    7, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 14
+                    7, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 22
+                    11, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    40, 41
+                    6, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 22
+                    6, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    42, 43
+                    11, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 21
+                    12, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 19
+                    7, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 17
+                    7, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 29
+                    11, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 15
+                    6, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 15
+                    6, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 22
+                    11, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    44, 45
+                    12, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 20
+                    7, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 20
+                    7, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 18
+                    11, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
+                    11, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 21
+                    6, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 27
+                    6, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    13, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 20
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 14
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 14
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1840,31 +2525,35 @@ class ShapeCleftRightRibbon : public CustomShapeProvider
             // Command, Count
                 1,1,
                 2,3,
-                17,2,
-                2,6,
-                17,1,
+                4,0,
+                1,1,
+                2,2,
+                4,0,
+                1,1,
                 2,3,
                 4,0,
                 7,0,
                 5,0,
                 1,1,
-                17,2,
-                2,1,
+                2,2,
                 4,0,
-                19,0,
+                1,1,
+                2,3,
+                4,0,
+                18,0,
                 7,0,
                 5,0,
                 1,1,
-                2,3,
-                17,2,
-                2,6,
-                17,1,
-                2,3,
+                2,2,
                 4,0,
                 1,1,
-                2,1,
+                2,3,
+                4,0,
+                6,0,
+                5,0,
                 1,1,
-                2,1,
+                2,3,
+                4,0,
                 6,0,
                 5,0
             };
@@ -1878,9 +2567,120 @@ class ShapeCleftRightRibbon : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        9, 14
+                        13, 14
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonBeginning"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCactionButtonBlank : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+    }
+    {
+        static const char *aStrings[] = {
+            "logwidth",
+            "logheight/2",
+            "logwidth/2",
+            "logheight"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 3
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,3,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1889,7 +2689,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        10, 15
+                        0, 3
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -1907,7 +2707,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftRightRibbon"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonBlank"));
 
     return aPropertyMap;
   }
@@ -1915,7 +2715,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCactionButtonInformation : public CustomShapeProvider
+class ShapeCactionButtonDocument : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -1930,41 +2730,16 @@ class ShapeCactionButtonInformation : public CustomShapeProvider
             "?0 *3/8",
             "logheight/2",
             "?2 +0-?1 ",
+            "?2 +?1 -0",
+            "?0 *9/32",
             "logwidth/2",
-            "?4 +0-?1 ",
-            "?0 *3/4",
-            "?6 *1/32",
-            "?6 *5/16",
-            "?6 *3/8",
-            "?6 *13/32",
-            "?6 *19/32",
-            "?6 *11/16",
-            "?6 *13/16",
-            "?6 *7/8",
-            "?3 +?7 -0",
-            "?3 +?8 -0",
+            "?6 +0-?5 ",
+            "?6 +?5 -0",
+            "?0 *3/16",
+            "?8 +0-?9 ",
             "?3 +?9 -0",
-            "?3 +?13 -0",
-            "?3 +?14 -0",
-            "?5 +?8 -0",
-            "?5 +?10 -0",
-            "?5 +?11 -0",
-            "?5 +?12 -0",
-            "?6 *3/32",
             "logwidth",
-            "logheight",
-            "(16200000)/60000.0",
-            "(21600000)/60000.0",
-            "(16200000)/60000.0",
-            "(21600000)/60000.0",
-            "(16200000)/60000.0",
-            "(21600000)/60000.0",
-            "(16200000)/60000.0",
-            "(21600000)/60000.0",
-            "(16200000)/60000.0",
-            "(21600000)/60000.0",
-            "(16200000)/60000.0",
-            "(21600000)/60000.0"
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -1990,257 +2765,402 @@ class ShapeCactionButtonInformation : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    25, 0
+                    12, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
+                    12, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 26
+                    0, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 3
+                    7, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 1
+                    10, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 28
+                    8, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 3
+                    8, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 1
+                    7, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 30
+                    7, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 15
+                    10, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 24
+                    10, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 32
+                    8, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 16
+                    8, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 17
+                    7, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 17
+                    10, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 18
+                    10, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 18
+                    8, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 19
+                    7, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 19
+                    10, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 18
+                    8, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 18
+                    8, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 16
+                    7, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 15
+                    8, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 24
+                    10, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    33, 34
+                    10, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 16
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    12, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 16
+                    12, 13
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    0, 13
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,3,
+                4,0,
+                1,1,
+                2,4,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,5,
+                4,0,
+                19,0,
+                7,0,
+                5,0,
+                1,1,
+                2,2,
+                4,0,
+                18,0,
+                7,0,
+                5,0,
+                1,1,
+                2,4,
+                4,0,
+                1,1,
+                2,2,
+                6,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
+                6,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        12, 13
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonDocument"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCactionButtonEnd : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+    }
+    {
+        static const char *aStrings[] = {
+            "min(logwidth,logheight)",
+            "?0 *3/8",
+            "logheight/2",
+            "?2 +0-?1 ",
+            "?2 +?1 -0",
+            "logwidth/2",
+            "?5 +0-?1 ",
+            "?5 +?1 -0",
+            "?0 *3/4",
+            "?8 *3/4",
+            "?8 *7/8",
+            "?6 +?9 -0",
+            "?6 +?10 -0",
+            "logwidth",
+            "logheight"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 18
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    13, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 18
+                    13, 14
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 19
+                    0, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 19
+                    11, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 18
+                    6, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 18
+                    6, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 17
+                    12, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 17
+                    7, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 3
+                    7, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 1
+                    12, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    35, 36
+                    11, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 15
+                    6, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 24
+                    6, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    37, 38
+                    12, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 16
+                    7, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 16
+                    7, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 18
+                    12, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 18
+                    11, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 19
+                    6, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 19
+                    6, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 18
+                    12, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 18
+                    7, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 17
+                    7, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 17
+                    12, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
@@ -2250,17 +3170,17 @@ class ShapeCactionButtonInformation : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    25, 0
+                    13, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
+                    13, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 26
+                    0, 14
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2273,36 +3193,27 @@ class ShapeCactionButtonInformation : public CustomShapeProvider
                 2,3,
                 4,0,
                 1,1,
-                17,1,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                17,1,
+                2,2,
                 4,0,
                 1,1,
-                17,1,
-                1,1,
-                2,9,
+                2,3,
                 4,0,
-                18,0,
                 7,0,
                 5,0,
                 1,1,
-                17,1,
+                2,2,
+                4,0,
                 1,1,
-                2,9,
+                2,3,
                 4,0,
-                20,0,
+                18,0,
                 7,0,
                 5,0,
                 1,1,
-                17,1,
+                2,2,
                 4,0,
                 1,1,
-                17,1,
-                1,1,
-                2,9,
+                2,3,
                 4,0,
                 6,0,
                 5,0,
@@ -2333,7 +3244,7 @@ class ShapeCactionButtonInformation : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        25, 26
+                        13, 14
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -2351,7 +3262,7 @@ class ShapeCactionButtonInformation : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonInformation"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonEnd"));
 
     return aPropertyMap;
   }
@@ -2359,152 +3270,32 @@ class ShapeCactionButtonInformation : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCbentConnector5 : public CustomShapeProvider
+class ShapeCactionButtonForwardNext : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "logwidth*$0 /100000",
-            "logwidth*$2 /100000",
-            "(?0 +?1 )/2",
-            "logheight*$1 /100000",
-            "(0+?3 )/2",
-            "(logheight+?3 )/2",
+            "min(logwidth,logheight)",
+            "?0 *3/8",
+            "logheight/2",
+            "?2 +0-?1 ",
+            "?2 +?1 -0",
+            "logwidth/2",
+            "?5 +0-?1 ",
+            "?5 +?1 -0",
             "logwidth",
             "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 3
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 5
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -2525,27 +3316,82 @@ class ShapeCbentConnector5 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    8, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    8, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 3
+                    7, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 7
+                    6, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 7
+                    6, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    8, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 9
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2555,7 +3401,27 @@ class ShapeCbentConnector5 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,5,
+                2,3,
+                4,0,
+                1,1,
+                2,2,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,2,
+                4,0,
+                18,0,
+                7,0,
+                5,0,
+                1,1,
+                2,2,
+                4,0,
+                6,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
                 6,0,
                 5,0
             };
@@ -2580,7 +3446,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 7
+                        8, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -2598,7 +3464,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bentConnector5"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonForwardNext"));
 
     return aPropertyMap;
   }
@@ -2606,350 +3472,367 @@ class ShapeCbentConnector5 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcircularArrow : public CustomShapeProvider
+class ShapeCactionButtonHelp : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (5);
-        {
-            Any aAny ((sal_Int32) 12500);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 1142319);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 20457681);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) 10800000);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
-        {
-            Any aAny ((sal_Int32) 12500);
-            aAdjSequence [4].Value = aAny;
-            aAdjSequence [4].Name = "adj5";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$4 ,0,if(25000-$4 ,$4 ,25000))",
-            "?0 *2/1",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "if(1-$2 ,1,if(21599999-$2 ,$2 ,21599999))",
-            "if(0-$3 ,0,if(21599999-$3 ,$3 ,21599999))",
             "min(logwidth,logheight)",
-            "?5 *?2 /100000",
-            "?5 *?0 /100000",
-            "?6 *1/2",
-            "logwidth/2",
-            "?9 +?8 -?7 ",
+            "?0 *3/8",
             "logheight/2",
-            "?11 +?8 -?7 ",
-            "?10 +0-?6 ",
-            "?12 +0-?6 ",
-            "?13 +?8 -0",
-            "?14 +?8 -0",
-            "?15 *sin(pi*(?3 )/10800000)",
-            "?16 *cos(pi*(?3 )/10800000)",
-            "?15 *(cos(atan2(?17 ,?18 )))",
-            "?16 *(sin(atan2(?17 ,?18 )))",
+            "?2 +0-?1 ",
             "logwidth/2",
-            "?21 +?19 -0",
-            "logheight/2",
-            "?23 +?20 -0",
-            "min(?13 ,?14 )",
-            "?19 *?19 /1",
-            "?20 *?20 /1",
-            "?25 *?25 /1",
-            "?26 +0-?28 ",
-            "?27 +0-?28 ",
-            "?29 *?30 /?26 ",
-            "?31 *1/?27 ",
-            "1+0-?32 ",
-            "sqrt(?33 )",
-            "?29 *1/?19 ",
-            "?35 *1/?20 ",
-            "(1+?34 )/?36 ",
-            "(10800000*atan2(?37 ,1))/pi",
-            "?38 +21600000-0",
-            "if(?38 ,?38 ,?39 )",
-            "?40 +0-?3 ",
-            "?41 +21600000-0",
-            "if(?41 ,?41 ,?42 )",
-            "?43 +0-10800000",
-            "?43 +0-21600000",
-            "if(?44 ,?45 ,?43 )",
-            "abs(?46 )",
-            "if(0-$1 ,0,if(?47 -$1 ,$1 ,?47 ))",
-            "?3 +?48 -0",
-            "?15 *sin(pi*(?49 )/10800000)",
-            "?16 *cos(pi*(?49 )/10800000)",
-            "?15 *(cos(atan2(?50 ,?51 )))",
-            "?16 *(sin(atan2(?50 ,?51 )))",
-            "?21 +?52 -0",
-            "?23 +?53 -0",
-            "?10 *sin(pi*(?4 )/10800000)",
-            "?12 *cos(pi*(?4 )/10800000)",
-            "?10 *(cos(atan2(?56 ,?57 )))",
-            "?12 *(sin(atan2(?56 ,?57 )))",
-            "?21 +?58 -0",
-            "?23 +?59 -0",
-            "?7 *cos(pi*(?49 )/10800000)",
-            "?7 *sin(pi*(?49 )/10800000)",
-            "?22 +?62 -0",
-            "?24 +?63 -0",
-            "?7 *cos(pi*(?49 )/10800000)",
-            "?7 *sin(pi*(?49 )/10800000)",
-            "?22 +0-?66 ",
-            "?24 +0-?67 ",
-            "?68 +0-?21 ",
-            "?69 +0-?23 ",
-            "?64 +0-?21 ",
-            "?65 +0-?23 ",
-            "min(?10 ,?12 )",
-            "?70 *?74 /?10 ",
-            "?71 *?74 /?12 ",
-            "?72 *?74 /?10 ",
-            "?73 *?74 /?12 ",
-            "?77 +0-?75 ",
-            "?78 +0-?76 ",
-            "sqrt(?79 *?79 +?80 *?80 +0*0)",
-            "?75 *?78 /1",
-            "?77 *?76 /1",
-            "?82 +0-?83 ",
-            "?74 *?74 /1",
-            "?81 *?81 /1",
-            "?85 *?86 /1",
-            "?84 *?84 /1",
-            "?87 +0-?88 ",
-            "max(?89 ,0)",
-            "sqrt(?90 )",
-            "?80 *-1/1",
-            "if(?92 ,-1,1)",
-            "?93 *?79 /1",
-            "?94 *?91 /1",
-            "?84 *?80 /1",
-            "(?96 +?95 )/?86 ",
-            "?96 +0-?95 ",
-            "?98 *1/?86 ",
-            "abs(?80 )",
-            "?100 *?91 /1",
-            "?84 *?79 /-1",
-            "(?102 +?101 )/?86 ",
-            "?102 +0-?101 ",
-            "?104 *1/?86 ",
-            "?77 +0-?97 ",
-            "?77 +0-?99 ",
-            "?78 +0-?103 ",
-            "?78 +0-?105 ",
-            "sqrt(?106 *?106 +?108 *?108 +0*0)",
-            "sqrt(?107 *?107 +?109 *?109 +0*0)",
-            "?111 +0-?110 ",
-            "if(?112 ,?97 ,?99 )",
-            "if(?112 ,?103 ,?105 )",
-            "?113 *?10 /?74 ",
-            "?114 *?12 /?74 ",
-            "?21 +?115 -0",
-            "?23 +?116 -0",
-            "?70 *?25 /?13 ",
-            "?71 *?25 /?14 ",
-            "?72 *?25 /?13 ",
-            "?73 *?25 /?14 ",
-            "?121 +0-?119 ",
-            "?122 +0-?120 ",
-            "sqrt(?123 *?123 +?124 *?124 +0*0)",
-            "?119 *?122 /1",
-            "?121 *?120 /1",
-            "?126 +0-?127 ",
-            "?25 *?25 /1",
-            "?125 *?125 /1",
-            "?129 *?130 /1",
-            "?128 *?128 /1",
-            "?131 +0-?132 ",
-            "max(?133 ,0)",
-            "sqrt(?134 )",
-            "?93 *?123 /1",
-            "?136 *?135 /1",
-            "?128 *?124 /1",
-            "(?138 +?137 )/?130 ",
-            "?138 +0-?137 ",
-            "?140 *1/?130 ",
-            "abs(?124 )",
-            "?142 *?135 /1",
-            "?128 *?123 /-1",
-            "(?144 +?143 )/?130 ",
-            "?144 +0-?143 ",
-            "?146 *1/?130 ",
-            "?119 +0-?139 ",
-            "?119 +0-?141 ",
-            "?120 +0-?145 ",
-            "?120 +0-?147 ",
-            "sqrt(?148 *?148 +?150 *?150 +0*0)",
-            "sqrt(?149 *?149 +?151 *?151 +0*0)",
-            "?153 +0-?152 ",
-            "if(?154 ,?139 ,?141 )",
-            "if(?154 ,?145 ,?147 )",
-            "?155 *?13 /?25 ",
-            "?156 *?14 /?25 ",
-            "?21 +?157 -0",
-            "?23 +?158 -0",
-            "(10800000*atan2(?158 ,?157 ))/pi",
-            "?161 +21600000-0",
-            "if(?161 ,?161 ,?162 )",
-            "?4 +0-?163 ",
-            "?164 +0-21600000",
-            "if(?164 ,?165 ,?164 )",
-            "?117 +0-?159 ",
-            "?118 +0-?160 ",
-            "sqrt(?167 *?167 +?168 *?168 +0*0)",
-            "?169 *1/2",
-            "?170 +0-?7 ",
-            "if(?171 ,?117 ,?64 )",
-            "if(?171 ,?118 ,?65 )",
-            "if(?171 ,?159 ,?68 )",
-            "if(?171 ,?160 ,?69 )",
-            "(10800000*atan2(?116 ,?115 ))/pi",
-            "?176 +21600000-0",
-            "if(?176 ,?176 ,?177 )",
-            "?178 +0-?4 ",
-            "?179 +21600000-0",
-            "if(?179 ,?179 ,?180 )",
-            "?15 *sin(pi*(?4 )/10800000)",
-            "?16 *cos(pi*(?4 )/10800000)",
-            "?15 *(cos(atan2(?182 ,?183 )))",
-            "?16 *(sin(atan2(?182 ,?183 )))",
-            "?21 +?184 -0",
-            "?23 +?185 -0",
-            "?4 +0-5400000",
-            "?49 +5400000-0",
-            "?49 +10800000-0",
-            "?10 *cos(pi*(2700000)/10800000)",
-            "?12 *sin(pi*(2700000)/10800000)",
-            "?21 +0-?191 ",
-            "?21 +?191 -0",
-            "?23 +0-?192 ",
-            "?23 +?192 -0",
-            "(?4 )/60000.0",
-            "(?181 )/60000.0",
-            "(?163 )/60000.0",
-            "(?166 )/60000.0"
+            "?4 +0-?1 ",
+            "?0 *3/4",
+            "?6 *1/7",
+            "?6 *3/14",
+            "?6 *2/7",
+            "?6 *3/7",
+            "?6 *4/7",
+            "?6 *17/28",
+            "?6 *21/28",
+            "?6 *11/14",
+            "?3 +?9 -0",
+            "?3 +?12 -0",
+            "?3 +?13 -0",
+            "?3 +?14 -0",
+            "?5 +?8 -0",
+            "?5 +?10 -0",
+            "?5 +?11 -0",
+            "?6 *1/14",
+            "?6 *3/28",
+            "logwidth",
+            "logheight",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(-10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(21600000)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(-10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(21600000)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(-10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(21600000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
         {
-            Sequence< PropertyValue > aPropSequence (1);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    24, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 25
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 25
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 27
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 29
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    30, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 33
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    34, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 7
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    36, 37
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    38, 39
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    40, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    42, 43
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    44, 45
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    46, 47
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    48, 49
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 7
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    50, 51
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    52, 53
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 9
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
                     54, 55
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (1);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    60, 61
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (3);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+                    7, 8
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    117, 118
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RadiusRangeMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RadiusRangeMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (3);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+                    56, 57
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    68, 69
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RadiusRangeMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 25000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RadiusRangeMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            aPropSequenceSequence [3] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
+                    22, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    58, 59
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 8
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -2958,42 +3841,57 @@ class ShapeCcircularArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 12
+                    22, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    197, 198
+                    62, 63
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    172, 173
+                    7, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    54, 55
+                    64, 65
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    174, 175
+                    4, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    159, 160
+                    23, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 14
+                    66, 67
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    24, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    199, 200
+                    24, 25
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 25
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3003,10 +3901,43 @@ class ShapeCcircularArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
+                2,3,
+                4,0,
+                1,1,
+                17,3,
+                2,3,
+                17,3,
+                4,0,
+                1,1,
                 17,1,
-                2,4,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                17,3,
+                2,3,
+                17,3,
+                4,0,
+                1,1,
                 17,1,
                 4,0,
+                18,0,
+                7,0,
+                5,0,
+                1,1,
+                17,3,
+                2,3,
+                17,3,
+                4,0,
+                1,1,
+                17,1,
+                4,0,
+                6,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -3019,9 +3950,9 @@ class ShapeCcircularArrow : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        193, 195
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3030,7 +3961,7 @@ class ShapeCcircularArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        194, 196
+                        24, 25
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -3048,7 +3979,7 @@ class ShapeCcircularArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-circularArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonHelp"));
 
     return aPropertyMap;
   }
@@ -3056,207 +3987,53 @@ class ShapeCcircularArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCdownArrowCallout : public CustomShapeProvider
+class ShapeCactionButtonHome : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) 64977);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
             "min(logwidth,logheight)",
-            "50000*logwidth/?0 ",
-            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "?2 *2/1",
-            "if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))",
-            "100000*logheight/?0 ",
-            "if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))",
-            "?6 *?0 /logheight",
-            "100000+0-?7 ",
-            "if(0-$3 ,0,if(?8 -$3 ,$3 ,?8 ))",
-            "?0 *?2 /100000",
-            "?0 *?4 /200000",
+            "?0 *3/8",
+            "logheight/2",
+            "?2 +0-?1 ",
+            "?2 +?1 -0",
             "logwidth/2",
-            "?12 +0-?10 ",
-            "?12 +0-?11 ",
-            "?12 +?11 -0",
-            "?12 +?10 -0",
-            "?0 *?6 /100000",
-            "logheight+0-?17 ",
-            "logheight*?9 /100000",
-            "?19 *1/2",
-            "logheight",
-            "logwidth"
+            "?5 +0-?1 ",
+            "?5 +?1 -0",
+            "?0 *3/4",
+            "?8 *1/16",
+            "?8 *1/8",
+            "?8 *3/16",
+            "?8 *5/16",
+            "?8 *7/16",
+            "?8 *9/16",
+            "?8 *11/16",
+            "?8 *3/4",
+            "?8 *13/16",
+            "?8 *7/8",
+            "?3 +?9 -0",
+            "?3 +?11 -0",
+            "?3 +?12 -0",
+            "?3 +?16 -0",
+            "?6 +?10 -0",
+            "?6 +?13 -0",
+            "?6 +?14 -0",
+            "?6 +?15 -0",
+            "?6 +?17 -0",
+            "?6 +?18 -0",
+            "logwidth",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 18
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 3);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 21
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 18
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 5);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 19
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 8);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [3] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -3277,52 +4054,282 @@ class ShapeCdownArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    22, 0
+                    29, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    29, 30
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 19
+                    5, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 19
+                    6, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 18
+                    23, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 18
+                    23, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 21
+                    26, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 18
+                    26, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 18
+                    27, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 19
+                    27, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    29, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    29, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 19
+                    0, 30
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3332,8 +4339,46 @@ class ShapeCdownArrowCallout : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
+                2,3,
+                4,0,
+                1,1,
                 2,10,
                 4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
+                1,1,
+                2,7,
+                4,0,
+                19,0,
+                7,0,
+                5,0,
+                1,1,
+                2,2,
+                4,0,
+                1,1,
+                2,3,
+                4,0,
+                18,0,
+                7,0,
+                5,0,
+                1,1,
+                2,10,
+                4,0,
+                1,1,
+                2,1,
+                1,1,
+                2,1,
+                1,1,
+                2,3,
+                6,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -3357,7 +4402,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        22, 19
+                        29, 30
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -3375,7 +4420,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-downArrowCallout"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonHome"));
 
     return aPropertyMap;
   }
@@ -3383,73 +4428,61 @@ class ShapeCdownArrowCallout : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCmathMinus : public CustomShapeProvider
+class ShapeCactionButtonInformation : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 23520);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
-            "logheight*?0 /200000",
-            "logwidth*73490/200000",
+            "min(logwidth,logheight)",
+            "?0 *3/8",
             "logheight/2",
-            "?3 +0-?1 ",
-            "?3 +?1 -0",
+            "?2 +0-?1 ",
             "logwidth/2",
-            "?6 +0-?2 ",
-            "?6 +?2 -0"
+            "?4 +0-?1 ",
+            "?0 *3/4",
+            "?6 *1/32",
+            "?6 *5/16",
+            "?6 *3/8",
+            "?6 *13/32",
+            "?6 *19/32",
+            "?6 *11/16",
+            "?6 *13/16",
+            "?6 *7/8",
+            "?3 +?7 -0",
+            "?3 +?8 -0",
+            "?3 +?9 -0",
+            "?3 +?13 -0",
+            "?3 +?14 -0",
+            "?5 +?8 -0",
+            "?5 +?10 -0",
+            "?5 +?11 -0",
+            "?5 +?12 -0",
+            "?6 *3/32",
+            "logwidth",
+            "logheight",
+            "(16200000)/60000.0",
+            "(21600000)/60000.0",
+            "(16200000)/60000.0",
+            "(21600000)/60000.0",
+            "(16200000)/60000.0",
+            "(21600000)/60000.0",
+            "(16200000)/60000.0",
+            "(21600000)/60000.0",
+            "(16200000)/60000.0",
+            "(21600000)/60000.0",
+            "(16200000)/60000.0",
+            "(21600000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -3463,24 +4496,284 @@ class ShapeCmathMinus : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    25, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 4
+                    25, 26
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 26
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 4
+                    4, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    1, 1
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    1, 1
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    29, 30
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 24
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    31, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 24
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    33, 34
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    1, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 5
+                    35, 36
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 24
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    37, 38
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    25, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 26
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 5
+                    0, 26
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3492,6 +4785,44 @@ class ShapeCmathMinus : public CustomShapeProvider
                 1,1,
                 2,3,
                 4,0,
+                1,1,
+                17,1,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                4,0,
+                1,1,
+                17,1,
+                1,1,
+                2,9,
+                4,0,
+                18,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                1,1,
+                2,9,
+                4,0,
+                20,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                4,0,
+                1,1,
+                17,1,
+                1,1,
+                2,9,
+                4,0,
+                6,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -3504,9 +4835,9 @@ class ShapeCmathMinus : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        7, 4
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3515,7 +4846,7 @@ class ShapeCmathMinus : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        8, 5
+                        25, 26
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -3533,7 +4864,7 @@ class ShapeCmathMinus : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-mathMinus"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonInformation"));
 
     return aPropertyMap;
   }
@@ -3541,369 +4872,68 @@ class ShapeCmathMinus : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCgear9 : public CustomShapeProvider
+class ShapeCactionButtonMovie : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
-        {
-            Any aAny ((sal_Int32) 10000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 1763);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(20000-$0 ,$0 ,20000))",
-            "if(0-$1 ,0,if(2679-$1 ,$1 ,2679))",
             "min(logwidth,logheight)",
-            "?2 *?0 /100000",
-            "?2 *?1 /100000",
-            "?3 *1/2",
-            "?4 *1/2",
-            "?5 +?6 -0",
+            "?0 *3/8",
             "logheight/2",
-            "?8 +0-?3 ",
-            "logwidth/2",
-            "?10 +0-?3 ",
-            "?11 +0-?9 ",
-            "if(?12 ,?9 ,?11 )",
-            "(10800000*atan2(?7 ,?13 ))/pi",
-            "18600000+0-?14 ",
-            "18600000+?14 -0",
-            "?11 *cos(pi*(?15 )/10800000)",
-            "?9 *sin(pi*(?15 )/10800000)",
-            "(10800000*atan2(?18 ,?17 ))/pi",
-            "?9 *cos(pi*(?19 )/10800000)",
-            "?11 *sin(pi*(?19 )/10800000)",
-            "sqrt(?20 *?20 +?21 *?21 +0*0)",
-            "?11 *?9 /?22 ",
-            "?23 *cos(pi*(?19 )/10800000)",
-            "?23 *sin(pi*(?19 )/10800000)",
+            "?2 +0-?1 ",
+            "?2 +?1 -0",
             "logwidth/2",
-            "?26 +?24 -0",
-            "logheight/2",
-            "?28 +?25 -0",
-            "?11 *cos(pi*(?16 )/10800000)",
-            "?9 *sin(pi*(?16 )/10800000)",
-            "(10800000*atan2(?31 ,?30 ))/pi",
-            "?9 *cos(pi*(?32 )/10800000)",
-            "?11 *sin(pi*(?32 )/10800000)",
-            "sqrt(?33 *?33 +?34 *?34 +0*0)",
-            "?11 *?9 /?35 ",
-            "?36 *cos(pi*(?32 )/10800000)",
-            "?36 *sin(pi*(?32 )/10800000)",
-            "?26 +?37 -0",
-            "?28 +?38 -0",
-            "?27 +0-?39 ",
-            "?29 +0-?40 ",
-            "sqrt(?41 *?41 +?42 *?42 +0*0)",
-            "(10800000*atan2(?41 ,?42 ))/pi",
-            "?4 *sin(pi*(?44 )/10800000)",
-            "?4 *cos(pi*(?44 )/10800000)",
-            "?39 +?45 -0",
-            "?40 +?46 -0",
-            "?27 +0-?45 ",
-            "?29 +0-?46 ",
-            "?3 *sin(pi*(?44 )/10800000)",
-            "?3 *cos(pi*(?44 )/10800000)",
-            "?48 +?51 -0",
-            "?47 +0-?52 ",
-            "?50 +?51 -0",
-            "?49 +0-?52 ",
-            "21000000+0-?14 ",
-            "21000000+?14 -0",
-            "?11 *cos(pi*(?57 )/10800000)",
-            "?9 *sin(pi*(?57 )/10800000)",
-            "(10800000*atan2(?60 ,?59 ))/pi",
-            "?9 *cos(pi*(?61 )/10800000)",
-            "?11 *sin(pi*(?61 )/10800000)",
-            "sqrt(?62 *?62 +?63 *?63 +0*0)",
-            "?11 *?9 /?64 ",
-            "?65 *cos(pi*(?61 )/10800000)",
-            "?65 *sin(pi*(?61 )/10800000)",
-            "?26 +?66 -0",
-            "?28 +?67 -0",
-            "?11 *cos(pi*(?58 )/10800000)",
-            "?9 *sin(pi*(?58 )/10800000)",
-            "(10800000*atan2(?71 ,?70 ))/pi",
-            "?9 *cos(pi*(?72 )/10800000)",
-            "?11 *sin(pi*(?72 )/10800000)",
-            "sqrt(?73 *?73 +?74 *?74 +0*0)",
-            "?11 *?9 /?75 ",
-            "?76 *cos(pi*(?72 )/10800000)",
-            "?76 *sin(pi*(?72 )/10800000)",
-            "?26 +?77 -0",
-            "?28 +?78 -0",
-            "?68 +0-?79 ",
-            "?69 +0-?80 ",
-            "sqrt(?81 *?81 +?82 *?82 +0*0)",
-            "(10800000*atan2(?81 ,?82 ))/pi",
-            "?4 *sin(pi*(?84 )/10800000)",
-            "?4 *cos(pi*(?84 )/10800000)",
-            "?79 +?85 -0",
-            "?80 +?86 -0",
-            "?68 +0-?85 ",
-            "?69 +0-?86 ",
-            "?3 *sin(pi*(?84 )/10800000)",
-            "?3 *cos(pi*(?84 )/10800000)",
-            "?88 +?91 -0",
-            "?87 +0-?92 ",
-            "?90 +?91 -0",
-            "?89 +0-?92 ",
-            "?61 +0-?32 ",
-            "1800000+0-?14 ",
-            "1800000+?14 -0",
-            "?11 *cos(pi*(?98 )/10800000)",
-            "?9 *sin(pi*(?98 )/10800000)",
-            "(10800000*atan2(?101 ,?100 ))/pi",
-            "?9 *cos(pi*(?102 )/10800000)",
-            "?11 *sin(pi*(?102 )/10800000)",
-            "sqrt(?103 *?103 +?104 *?104 +0*0)",
-            "?11 *?9 /?105 ",
-            "?106 *cos(pi*(?102 )/10800000)",
-            "?106 *sin(pi*(?102 )/10800000)",
-            "?26 +?107 -0",
-            "?28 +?108 -0",
-            "?11 *cos(pi*(?99 )/10800000)",
-            "?9 *sin(pi*(?99 )/10800000)",
-            "(10800000*atan2(?112 ,?111 ))/pi",
-            "?9 *cos(pi*(?113 )/10800000)",
-            "?11 *sin(pi*(?113 )/10800000)",
-            "sqrt(?114 *?114 +?115 *?115 +0*0)",
-            "?11 *?9 /?116 ",
-            "?117 *cos(pi*(?113 )/10800000)",
-            "?117 *sin(pi*(?113 )/10800000)",
-            "?26 +?118 -0",
-            "?28 +?119 -0",
-            "?109 +0-?120 ",
-            "?110 +0-?121 ",
-            "sqrt(?122 *?122 +?123 *?123 +0*0)",
-            "(10800000*atan2(?122 ,?123 ))/pi",
-            "?4 *sin(pi*(?125 )/10800000)",
-            "?4 *cos(pi*(?125 )/10800000)",
-            "?120 +?126 -0",
-            "?121 +?127 -0",
-            "?109 +0-?126 ",
-            "?110 +0-?127 ",
-            "?3 *sin(pi*(?125 )/10800000)",
-            "?3 *cos(pi*(?125 )/10800000)",
-            "?129 +?132 -0",
-            "?128 +0-?133 ",
-            "?131 +?132 -0",
-            "?130 +0-?133 ",
-            "?102 +0-?72 ",
-            "4200000+0-?14 ",
-            "4200000+?14 -0",
-            "?11 *cos(pi*(?139 )/10800000)",
-            "?9 *sin(pi*(?139 )/10800000)",
-            "(10800000*atan2(?142 ,?141 ))/pi",
-            "?9 *cos(pi*(?143 )/10800000)",
-            "?11 *sin(pi*(?143 )/10800000)",
-            "sqrt(?144 *?144 +?145 *?145 +0*0)",
-            "?11 *?9 /?146 ",
-            "?147 *cos(pi*(?143 )/10800000)",
-            "?147 *sin(pi*(?143 )/10800000)",
-            "?26 +?148 -0",
-            "?28 +?149 -0",
-            "?11 *cos(pi*(?140 )/10800000)",
-            "?9 *sin(pi*(?140 )/10800000)",
-            "(10800000*atan2(?153 ,?152 ))/pi",
-            "?9 *cos(pi*(?154 )/10800000)",
-            "?11 *sin(pi*(?154 )/10800000)",
-            "sqrt(?155 *?155 +?156 *?156 +0*0)",
-            "?11 *?9 /?157 ",
-            "?158 *cos(pi*(?154 )/10800000)",
-            "?158 *sin(pi*(?154 )/10800000)",
-            "?26 +?159 -0",
-            "?28 +?160 -0",
-            "?150 +0-?161 ",
-            "?151 +0-?162 ",
-            "sqrt(?163 *?163 +?164 *?164 +0*0)",
-            "(10800000*atan2(?163 ,?164 ))/pi",
-            "?4 *sin(pi*(?166 )/10800000)",
-            "?4 *cos(pi*(?166 )/10800000)",
-            "?161 +?167 -0",
-            "?162 +?168 -0",
-            "?150 +0-?167 ",
-            "?151 +0-?168 ",
-            "?3 *sin(pi*(?166 )/10800000)",
-            "?3 *cos(pi*(?166 )/10800000)",
-            "?170 +?173 -0",
-            "?169 +0-?174 ",
-            "?172 +?173 -0",
-            "?171 +0-?174 ",
-            "?143 +0-?113 ",
-            "6600000+0-?14 ",
-            "6600000+?14 -0",
-            "?11 *cos(pi*(?180 )/10800000)",
-            "?9 *sin(pi*(?180 )/10800000)",
-            "(10800000*atan2(?183 ,?182 ))/pi",
-            "?11 *cos(pi*(?181 )/10800000)",
-            "?9 *sin(pi*(?181 )/10800000)",
-            "(10800000*atan2(?186 ,?185 ))/pi",
-            "logwidth+0-?150 ",
-            "logwidth+0-?178 ",
-            "logwidth+0-?176 ",
-            "?184 +0-?154 ",
-            "9000000+?14 -0",
-            "?11 *cos(pi*(?192 )/10800000)",
-            "?9 *sin(pi*(?192 )/10800000)",
-            "(10800000*atan2(?194 ,?193 ))/pi",
-            "logwidth+0-?109 ",
-            "logwidth+0-?137 ",
-            "logwidth+0-?135 ",
-            "11400000+?14 -0",
-            "?11 *cos(pi*(?199 )/10800000)",
-            "?9 *sin(pi*(?199 )/10800000)",
-            "(10800000*atan2(?201 ,?200 ))/pi",
-            "logwidth+0-?68 ",
-            "logwidth+0-?96 ",
-            "logwidth+0-?94 ",
-            "13800000+?14 -0",
-            "?11 *cos(pi*(?206 )/10800000)",
-            "?9 *sin(pi*(?206 )/10800000)",
-            "(10800000*atan2(?208 ,?207 ))/pi",
-            "logwidth+0-?39 ",
-            "logwidth+0-?27 ",
-            "logwidth+0-?56 ",
-            "logwidth+0-?54 ",
-            "16200000+0-?14 ",
-            "16200000+?14 -0",
-            "?11 *cos(pi*(?215 )/10800000)",
-            "?9 *sin(pi*(?215 )/10800000)",
-            "(10800000*atan2(?217 ,?216 ))/pi",
-            "?9 *cos(pi*(?218 )/10800000)",
-            "?11 *sin(pi*(?218 )/10800000)",
-            "sqrt(?219 *?219 +?220 *?220 +0*0)",
-            "?11 *?9 /?221 ",
-            "?222 *cos(pi*(?218 )/10800000)",
-            "?222 *sin(pi*(?218 )/10800000)",
-            "?26 +?223 -0",
-            "?28 +?224 -0",
-            "?11 *cos(pi*(?214 )/10800000)",
-            "?9 *sin(pi*(?214 )/10800000)",
-            "(10800000*atan2(?228 ,?227 ))/pi",
-            "?26 +0-?223 ",
-            "?225 +0-?4 ",
-            "?230 +?4 -0",
-            "?226 +0-?3 ",
-            "?229 +0-?209 ",
-            "(?56 +?54 )/2",
-            "(?55 +?53 )/2",
-            "(?96 +?94 )/2",
-            "(?95 +?93 )/2",
-            "(?137 +?135 )/2",
-            "(?136 +?134 )/2",
-            "(?178 +?176 )/2",
-            "(?177 +?175 )/2",
-            "(logwidth+0)/?241 ",
-            "(logwidth+0)/?239 ",
-            "(logwidth+0)/?237 ",
-            "(logwidth+0)/?235 ",
-            "(?32 )/60000.0",
-            "(?97 )/60000.0",
-            "(?72 )/60000.0",
-            "(?138 )/60000.0",
-            "(?113 )/60000.0",
-            "(?179 )/60000.0",
-            "(?154 )/60000.0",
-            "(?191 )/60000.0",
-            "(?187 )/60000.0",
-            "(?179 )/60000.0",
-            "(?195 )/60000.0",
-            "(?138 )/60000.0",
-            "(?202 )/60000.0",
-            "(?97 )/60000.0",
-            "(?209 )/60000.0",
-            "(?234 )/60000.0",
-            "(?218 )/60000.0",
-            "(?234 )/60000.0"
+            "?5 +0-?1 ",
+            "?5 +?1 -0",
+            "?0 *3/4",
+            "?8 *1455/21600",
+            "?8 *1905/21600",
+            "?8 *2325/21600",
+            "?8 *16155/21600",
+            "?8 *17010/21600",
+            "?8 *19335/21600",
+            "?8 *19725/21600",
+            "?8 *20595/21600",
+            "?8 *5280/21600",
+            "?8 *5730/21600",
+            "?8 *6630/21600",
+            "?8 *7492/21600",
+            "?8 *9067/21600",
+            "?8 *9555/21600",
+            "?8 *13342/21600",
+            "?8 *14580/21600",
+            "?8 *15592/21600",
+            "?6 +?9 -0",
+            "?6 +?10 -0",
+            "?6 +?11 -0",
+            "?6 +?12 -0",
+            "?6 +?13 -0",
+            "?6 +?14 -0",
+            "?6 +?15 -0",
+            "?6 +?16 -0",
+            "?3 +?17 -0",
+            "?3 +?18 -0",
+            "?3 +?19 -0",
+            "?3 +?20 -0",
+            "?3 +?21 -0",
+            "?3 +?22 -0",
+            "?3 +?23 -0",
+            "?3 +?24 -0",
+            "?3 +?25 -0",
+            "?3 +?26 -0",
+            "logwidth",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    225, 226
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 20000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    230, 226
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2679);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -3917,234 +4947,329 @@ class ShapeCgear9 : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    44, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 29
+                    44, 45
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 45
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    56, 55
+                    6, 34
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    54, 53
+                    6, 39
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    39, 40
+                    26, 39
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 9
+                    27, 38
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    247, 248
+                    28, 38
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    96, 95
+                    28, 42
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    94, 93
+                    30, 42
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    79, 80
+                    30, 40
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 9
+                    31, 40
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    249, 250
+                    33, 41
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    137, 136
+                    7, 41
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    135, 134
+                    7, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    120, 121
+                    33, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 9
+                    32, 37
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    251, 252
+                    30, 37
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    178, 177
+                    30, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    176, 175
+                    29, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    161, 162
+                    27, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 9
+                    26, 34
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    253, 254
+                    6, 34
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    190, 175
+                    6, 39
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    189, 177
+                    26, 39
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    188, 151
+                    27, 38
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 9
+                    28, 38
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    255, 256
+                    28, 42
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    198, 134
+                    30, 42
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    197, 136
+                    30, 40
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    196, 110
+                    31, 40
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 9
+                    33, 41
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    257, 258
+                    7, 41
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    205, 93
+                    7, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    204, 95
+                    33, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    203, 69
+                    32, 37
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 9
+                    30, 37
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    259, 260
+                    30, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    213, 53
+                    29, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    212, 55
+                    27, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    211, 29
+                    26, 34
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 9
+                    6, 34
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    261, 262
+                    26, 34
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    232, 233
+                    27, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    231, 233
+                    29, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    225, 226
+                    30, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 9
+                    30, 37
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    263, 264
+                    32, 37
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    33, 36
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 36
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    33, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    31, 40
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    30, 40
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    30, 42
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 42
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 38
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 38
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 39
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 39
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    44, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    44, 45
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 45
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4155,24 +5280,27 @@ class ShapeCgear9 : public CustomShapeProvider
             // Command, Count
                 1,1,
                 2,3,
-                17,1,
-                2,3,
-                17,1,
-                2,3,
-                17,1,
-                2,3,
-                17,1,
-                2,3,
-                17,1,
-                2,3,
-                17,1,
-                2,3,
-                17,1,
-                2,3,
-                17,1,
+                4,0,
+                1,1,
+                2,18,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,18,
+                4,0,
+                18,0,
+                7,0,
+                5,0,
+                1,1,
+                2,18,
+                4,0,
+                6,0,
+                5,0,
+                1,1,
                 2,3,
-                17,1,
                 4,0,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -4185,9 +5313,9 @@ class ShapeCgear9 : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        210, 40
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4196,7 +5324,7 @@ class ShapeCgear9 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        39, 121
+                        44, 45
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4214,7 +5342,7 @@ class ShapeCgear9 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-gear9"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonMovie"));
 
     return aPropertyMap;
   }
@@ -4222,76 +5350,71 @@ class ShapeCgear9 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCround1Rect : public CustomShapeProvider
+class ShapeCactionButtonReturn : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 16667);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
             "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "logwidth+0-?2 ",
-            "?2 *29289/100000",
-            "logwidth+0-?4 ",
-            "logwidth/2",
+            "?0 *3/8",
             "logheight/2",
-            "logheight",
+            "?2 +0-?1 ",
+            "?2 +?1 -0",
+            "logwidth/2",
+            "?5 +0-?1 ",
+            "?5 +?1 -0",
+            "?0 *3/4",
+            "?8 *7/8",
+            "?8 *3/4",
+            "?8 *5/8",
+            "?8 *3/8",
+            "?8 *1/4",
+            "?3 +?10 -0",
+            "?3 +?11 -0",
+            "?3 +?13 -0",
+            "?6 +?9 -0",
+            "?6 +?10 -0",
+            "?6 +?11 -0",
+            "?6 +?12 -0",
+            "?6 +?13 -0",
+            "?8 *1/8",
             "logwidth",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0"
+            "logheight",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(-5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(-5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(-5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -4312,27 +5435,322 @@ class ShapeCround1Rect : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    23, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    23, 24
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 11
+                    7, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 26
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 14
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 12
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    29, 30
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 12
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    31, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    33, 34
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 14
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    35, 36
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 12
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    37, 38
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 12
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    39, 40
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 12
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    41, 42
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 12
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    43, 44
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    45, 46
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 14
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    47, 48
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 8
+                    5, 16
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
+                    23, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 24
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 24
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4342,10 +5760,52 @@ class ShapeCround1Rect : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
+                2,3,
+                4,0,
+                1,1,
+                2,4,
+                17,1,
                 2,1,
                 17,1,
+                2,3,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,4,
+                17,1,
+                2,1,
+                17,1,
+                2,3,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                4,0,
+                18,0,
+                7,0,
+                5,0,
+                1,1,
                 2,2,
+                17,1,
+                2,1,
+                17,1,
+                2,3,
+                17,1,
+                2,1,
+                17,1,
+                2,3,
                 4,0,
+                6,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -4369,7 +5829,7 @@ class ShapeCround1Rect : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        5, 8
+                        23, 24
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4387,7 +5847,7 @@ class ShapeCround1Rect : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-round1Rect"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonReturn"));
 
     return aPropertyMap;
   }
@@ -4395,117 +5855,46 @@ class ShapeCround1Rect : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCsun : public CustomShapeProvider
+class ShapeCactionButtonSound : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(12500-$0 ,12500,if(46875-$0 ,$0 ,46875))",
-            "50000+0-?0 ",
-            "?1 *30274/32768",
-            "?1 *12540/32768",
-            "?2 +50000-0",
-            "?3 +50000-0",
-            "50000+0-?2 ",
-            "50000+0-?3 ",
-            "?1 *23170/32768",
-            "50000+?8 -0",
-            "50000+0-?8 ",
-            "?6 *3/4",
-            "?7 *3/4",
-            "?11 +3662-0",
-            "?12 +3662-0",
-            "?12 +12500-0",
-            "100000+0-?11 ",
-            "100000+0-?13 ",
-            "100000+0-?14 ",
-            "100000+0-?15 ",
-            "logwidth*18436/21600",
-            "logheight*3163/21600",
-            "logwidth*3163/21600",
-            "logheight*18436/21600",
-            "logwidth*?9 /100000",
-            "logwidth*?10 /100000",
-            "logwidth*?11 /100000",
-            "logwidth*?13 /100000",
-            "logwidth*?14 /100000",
-            "logwidth*?15 /100000",
-            "logwidth*?16 /100000",
-            "logwidth*?17 /100000",
-            "logwidth*?18 /100000",
-            "logwidth*?19 /100000",
-            "logwidth*?0 /100000",
-            "logwidth*?1 /100000",
-            "logheight*?1 /100000",
-            "logheight*?9 /100000",
-            "logheight*?10 /100000",
-            "logheight*?11 /100000",
-            "logheight*?13 /100000",
-            "logheight*?14 /100000",
-            "logheight*?15 /100000",
-            "logheight*?16 /100000",
-            "logheight*?17 /100000",
-            "logheight*?18 /100000",
-            "logheight*?19 /100000",
+            "min(logwidth,logheight)",
+            "?0 *3/8",
             "logheight/2",
+            "?2 +0-?1 ",
+            "?2 +?1 -0",
             "logwidth/2",
-            "logheight",
+            "?5 +0-?1 ",
+            "?5 +?1 -0",
+            "?0 *3/4",
+            "?8 *1/8",
+            "?8 *5/16",
+            "?8 *5/8",
+            "?8 *11/16",
+            "?8 *3/4",
+            "?8 *7/8",
+            "?3 +?9 -0",
+            "?3 +?10 -0",
+            "?3 +?12 -0",
+            "?3 +?14 -0",
+            "?6 +?10 -0",
+            "?6 +?11 -0",
+            "?6 +?13 -0",
             "logwidth",
-            "(10800000)/60000.0",
-            "(21600000)/60000.0"
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    34, 47
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 46875);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 12500);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -4519,139 +5908,164 @@ class ShapeCsun : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    50, 47
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    22, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 46
+                    22, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 42
+                    6, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 21
+                    6, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 41
+                    19, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 40
+                    20, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    48, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    33, 39
+                    19, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 39
+                    6, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 21
+                    6, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 40
+                    19, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 41
+                    20, 4
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 47
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 42
+                    19, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 46
+                    6, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
+                    19, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 45
+                    20, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 44
+                    20, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    48, 49
+                    19, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 43
+                    6, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    33, 43
+                    21, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 23
+                    7, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 44
+                    21, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 45
+                    7, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    34, 47
+                    21, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    35, 36
+                    7, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    22, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    51, 52
+                    22, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 23
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4661,32 +6075,34 @@ class ShapeCsun : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,2,
-                4,0,
-                1,1,
-                2,2,
+                2,3,
                 4,0,
                 1,1,
-                2,2,
+                2,5,
                 4,0,
+                7,0,
+                5,0,
                 1,1,
-                2,2,
+                2,5,
                 4,0,
+                18,0,
+                7,0,
+                5,0,
                 1,1,
-                2,2,
+                2,5,
                 4,0,
                 1,1,
-                2,2,
-                4,0,
+                2,1,
                 1,1,
-                2,2,
-                4,0,
+                2,1,
                 1,1,
-                2,2,
-                4,0,
+                2,1,
+                6,0,
+                5,0,
                 1,1,
-                17,1,
+                2,3,
                 4,0,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -4699,9 +6115,9 @@ class ShapeCsun : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        25, 38
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4710,7 +6126,7 @@ class ShapeCsun : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        24, 37
+                        22, 23
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4728,7 +6144,7 @@ class ShapeCsun : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-sun"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonSound"));
 
     return aPropertyMap;
   }
@@ -4736,82 +6152,110 @@ class ShapeCsun : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCplaque : public CustomShapeProvider
+class ShapeCarc : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 16667);
+            Any aAny ((sal_Int32) 16200000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 0);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "logwidth+0-?2 ",
-            "logheight+0-?2 ",
-            "?2 *70711/100000",
-            "logwidth+0-?5 ",
-            "logheight+0-?5 ",
+            "if(0-$0 ,0,if(21599999-$0 ,$0 ,21599999))",
+            "if(0-$1 ,0,if(21599999-$1 ,$1 ,21599999))",
+            "?1 +0-?0 ",
+            "?2 +21600000-0",
+            "if(?2 ,?2 ,?3 )",
             "logwidth/2",
+            "?5 *sin(pi*(?0 )/10800000)",
             "logheight/2",
-            "logheight",
-            "logwidth",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(-5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(-5400000)/60000.0",
-            "(0)/60000.0",
-            "(-5400000)/60000.0"
+            "?7 *cos(pi*(?0 )/10800000)",
+            "?5 *(cos(atan2(?6 ,?8 )))",
+            "?7 *(sin(atan2(?6 ,?8 )))",
+            "?5 *sin(pi*(?1 )/10800000)",
+            "?7 *cos(pi*(?1 )/10800000)",
+            "?5 *(cos(atan2(?11 ,?12 )))",
+            "?7 *(sin(atan2(?11 ,?12 )))",
+            "logwidth/2",
+            "?15 +?9 -0",
+            "logheight/2",
+            "?17 +?10 -0",
+            "?15 +?13 -0",
+            "?17 +?14 -0",
+            "21600000+0-?0 ",
+            "?4 +0-?21 ",
+            "max(?16 ,?19 )",
+            "if(?22 ,logwidth,?23 )",
+            "5400000+0-?0 ",
+            "27000000+0-?0 ",
+            "if(?25 ,?25 ,?26 )",
+            "?4 +0-?27 ",
+            "max(?18 ,?20 )",
+            "if(?28 ,logheight,?29 )",
+            "10800000+0-?0 ",
+            "32400000+0-?0 ",
+            "if(?31 ,?31 ,?32 )",
+            "?4 +0-?33 ",
+            "min(?16 ,?19 )",
+            "if(?34 ,0,?35 )",
+            "16200000+0-?0 ",
+            "37800000+0-?0 ",
+            "if(?37 ,?37 ,?38 )",
+            "?4 +0-?39 ",
+            "min(?18 ,?20 )",
+            "if(?40 ,0,?41 )",
+            "?0 +0-5400000",
+            "?1 +5400000-0",
+            "(?43 +?44 )/2",
+            "(?0 )/60000.0",
+            "(?4 )/60000.0",
+            "(?0 )/60000.0",
+            "(?4 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (1);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    16, 18
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (1);
             {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 20
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
-            aPropSequenceSequence [0] = aPropSequence;
+            aPropSequenceSequence [1] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -4827,64 +6271,39 @@ class ShapeCplaque : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
+                    16, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 4
+                    5, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    46, 47
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 17
+                    15, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 10
+                    16, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    5, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 19
+                    48, 49
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4896,12 +6315,12 @@ class ShapeCplaque : public CustomShapeProvider
                 1,1,
                 17,1,
                 2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
                 4,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -4916,7 +6335,7 @@ class ShapeCplaque : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        5, 5
+                        36, 42
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4925,7 +6344,7 @@ class ShapeCplaque : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 7
+                        24, 30
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4943,7 +6362,7 @@ class ShapeCplaque : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-plaque"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-arc"));
 
     return aPropertyMap;
   }
@@ -4951,40 +6370,73 @@ class ShapeCplaque : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCchevron : public CustomShapeProvider
+class ShapeCbentArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) 43750);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "100000*logwidth/?0 ",
+            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
+            "?0 *2/1",
             "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "?0 *?2 /100000",
-            "logwidth+0-?3 ",
-            "?4 *1/2",
-            "?4 +0-?3 ",
-            "if(?6 ,?3 ,0)",
-            "if(?6 ,?4 ,logwidth)",
-            "logheight/2",
+            "if(0-$2 ,0,if(50000-$2 ,$2 ,50000))",
+            "min(logwidth,logheight)",
+            "?4 *?2 /100000",
+            "?4 *?0 /100000",
+            "?5 *1/2",
+            "?6 +0-?7 ",
+            "?4 *?3 /100000",
+            "logwidth+0-?9 ",
+            "logheight+0-?8 ",
+            "min(?10 ,?11 )",
+            "100000*?12 /?4 ",
+            "if(0-$3 ,0,if(?13 -$3 ,$3 ,?13 ))",
+            "?4 *?14 /100000",
+            "?15 +0-?5 ",
+            "max(?16 ,0)",
+            "?5 +?17 -0",
+            "logwidth+0-?9 ",
+            "?8 +?5 -0",
+            "?20 +?8 -0",
+            "?8 +?15 -0",
+            "?20 +?17 -0",
             "logheight",
-            "logwidth"
+            "logwidth",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -4992,8 +6444,8 @@ class ShapeCchevron : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 24
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -5020,6 +6472,111 @@ class ShapeCchevron : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 21
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 50000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    19, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 50000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    15, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 13);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [3] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -5035,33 +6592,68 @@ class ShapeCchevron : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 24
+                },
+                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 9
+                    26, 27
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 10
+                    19, 8
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
+                    19, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 6
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 10
+                    28, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 9
+                    5, 24
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5071,7 +6663,11 @@ class ShapeCchevron : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,5,
+                2,1,
+                17,1,
+                2,6,
+                17,1,
+                2,1,
                 4,0,
                 5,0
             };
@@ -5085,9 +6681,9 @@ class ShapeCchevron : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::NORMAL,
-                        7, 0
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -5096,7 +6692,7 @@ class ShapeCchevron : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        8, 10
+                        25, 24
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -5114,7 +6710,7 @@ class ShapeCchevron : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-chevron"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bentArrow"));
 
     return aPropertyMap;
   }
@@ -5122,7 +6718,7 @@ class ShapeCchevron : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartPreparation : public CustomShapeProvider
+class ShapeCbentConnector2 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -5133,12 +6729,8 @@ class ShapeCflowChartPreparation : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth*4/5",
-            "logwidth/2",
-            "logheight/2",
-            "logheight",
             "logwidth",
-            "logwidth/5"
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -5152,39 +6744,24 @@ class ShapeCflowChartPreparation : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (3);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 5
+                    0, 0
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 10
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 10
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 1
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5194,34 +6771,23 @@ class ShapeCflowChartPreparation : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,5,
-                4,0,
+                2,2,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 10;
-                aSize.Height = 10;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::NORMAL,
-                        5, 0
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -5230,13 +6796,13 @@ class ShapeCflowChartPreparation : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 3
+                        0, 1
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -5248,7 +6814,7 @@ class ShapeCflowChartPreparation : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartPreparation"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bentConnector2"));
 
     return aPropertyMap;
   }
@@ -5256,7 +6822,7 @@ class ShapeCflowChartPreparation : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCdiagStripe : public CustomShapeProvider
+class ShapeCbentConnector3 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -5267,20 +6833,13 @@ class ShapeCdiagStripe : public CustomShapeProvider
         {
             Any aAny ((sal_Int32) 50000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
-            "logwidth*?0 /100000",
-            "?1 *1/2",
-            "(?1 +logwidth)/2",
-            "logheight*?0 /100000",
-            "?4 *1/2",
-            "(?4 +logheight)/2",
-            "logwidth/2",
+            "logwidth*$0 /100000",
             "logheight/2",
             "logwidth",
             "logheight"
@@ -5295,30 +6854,30 @@ class ShapeCdiagStripe : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 1
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -5339,23 +6898,23 @@ class ShapeCdiagStripe : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 10
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 3
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5366,7 +6925,7 @@ class ShapeCdiagStripe : public CustomShapeProvider
             // Command, Count
                 1,1,
                 2,3,
-                4,0,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -5390,7 +6949,7 @@ class ShapeCdiagStripe : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        3, 6
+                        2, 3
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -5408,7 +6967,7 @@ class ShapeCdiagStripe : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-diagStripe"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bentConnector3"));
 
     return aPropertyMap;
   }
@@ -5416,7 +6975,7 @@ class ShapeCdiagStripe : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCpentagon : public CustomShapeProvider
+class ShapeCbentConnector4 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -5425,198 +6984,101 @@ class ShapeCpentagon : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 105146);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "hf";
+            aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 110557);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "vf";
+            aAdjSequence [1].Name = "adj2";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logwidth/2",
-            "?0 *$0 /100000",
-            "logheight/2",
-            "?2 *$1 /100000",
-            "logheight/2",
-            "?4 *$1 /100000",
-            "?1 *cos(pi*(1080000)/10800000)",
-            "?1 *cos(pi*(18360000)/10800000)",
-            "?3 *sin(pi*(1080000)/10800000)",
-            "?3 *sin(pi*(18360000)/10800000)",
-            "logwidth/2",
-            "?10 +0-?6 ",
-            "?10 +0-?7 ",
-            "?10 +?7 -0",
-            "?10 +?6 -0",
-            "?5 +0-?8 ",
-            "?5 +0-?9 ",
-            "?15 *?7 /?6 ",
+            "logwidth*$0 /100000",
+            "(?0 +logwidth)/2",
+            "logheight*$1 /100000",
+            "(0+?2 )/2",
+            "logwidth",
             "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 16
-                },
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 16
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,4,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+                    0, 3
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            Sequence< PropertyValue > aPropSequence (4);
             {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        12, 17
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        13, 16
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    1, 2
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
         }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-pentagon"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCfunnel : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "?0 *1/20",
-            "logwidth/2",
-            "?2 +0-?1 ",
-            "logheight/4",
-            "?4 +0-?1 ",
-            "?2 *cos(pi*(480000)/10800000)",
-            "?4 *sin(pi*(480000)/10800000)",
-            "(10800000*atan2(?7 ,?6 ))/pi",
-            "?8 *2/1",
-            "10800000+0-?8 ",
-            "10800000+2-0",
-            "10800000+0-2",
-            "?2 *1/4",
-            "?4 *1/4",
-            "?4 *cos(pi*(?10 )/10800000)",
-            "?2 *sin(pi*(?10 )/10800000)",
-            "sqrt(?15 *?15 +?16 *?16 +0*0)",
-            "?2 *?4 /?17 ",
-            "?18 *cos(pi*(?10 )/10800000)",
-            "?18 *sin(pi*(?10 )/10800000)",
-            "logwidth/2",
-            "?21 +?19 -0",
-            "?4 +?20 -0",
-            "?14 *cos(pi*(?8 )/10800000)",
-            "?13 *sin(pi*(?8 )/10800000)",
-            "sqrt(?24 *?24 +?25 *?25 +0*0)",
-            "?13 *?14 /?26 ",
-            "?27 *cos(pi*(?8 )/10800000)",
-            "?27 *sin(pi*(?8 )/10800000)",
-            "?21 +?28 -0",
-            "logheight+0-?14 ",
-            "?31 +?29 -0",
-            "?2 +0-?3 ",
-            "10800000*2/1",
-            "logwidth",
-            "logheight",
-            "(?10 )/60000.0",
-            "(?11 )/60000.0",
-            "(?8 )/60000.0",
-            "(?12 )/60000.0",
-            "(10800000)/60000.0",
-            "(-21600000)/60000.0"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -5630,49 +7092,29 @@ class ShapeCfunnel : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    37, 38
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    30, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 14
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    39, 40
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    33, 4
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    4, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    41, 42
+                    4, 5
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5682,13 +7124,8 @@ class ShapeCfunnel : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,1,
-                2,1,
-                17,1,
-                4,0,
-                1,1,
-                17,1,
-                4,0,
+                2,4,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -5712,7 +7149,7 @@ class ShapeCfunnel : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        35, 36
+                        4, 5
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -5730,141 +7167,7 @@ class ShapeCfunnel : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-funnel"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCchartStar : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Equations, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 10
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 10
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 10
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 10
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 10
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                6,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                7,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (2);
-            {
-                awt::Size aSize;
-                aSize.Width = 10;
-                aSize.Height = 10;
-                aSizeSequence [0] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 10;
-                aSize.Height = 10;
-                aSizeSequence [1] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 400000;
-        aRectangle.Height = 400000;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-chartStar"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bentConnector4"));
 
     return aPropertyMap;
   }
@@ -5872,60 +7175,55 @@ class ShapeCchartStar : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCaccentBorderCallout1 : public CustomShapeProvider
+class ShapeCbentConnector5 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
         {
-            Any aAny ((sal_Int32) 18750);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) -8333);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
         {
-            Any aAny ((sal_Int32) 112500);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [2].Value = aAny;
             aAdjSequence [2].Name = "adj3";
         }
-        {
-            Any aAny ((sal_Int32) -38333);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logheight*$0 /100000",
-            "logwidth*$1 /100000",
-            "logheight*$2 /100000",
-            "logwidth*$3 /100000",
+            "logwidth*$0 /100000",
+            "logwidth*$2 /100000",
+            "(?0 +?1 )/2",
+            "logheight*$1 /100000",
+            "(0+?3 )/2",
+            "(logheight+?3 )/2",
             "logwidth",
-            "logheight/2",
-            "logwidth/2",
             "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    0, 4
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -5946,42 +7244,56 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 3
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
+                aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [4].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
+                aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [5].Name = "RefX";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 1);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [0] = aPropSequence;
+            aPropSequenceSequence [1] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    1, 5
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -6002,32 +7314,11 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 2);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [1] = aPropSequence;
+            aPropSequenceSequence [2] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -6050,22 +7341,17 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 7
+                    0, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    1, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -6075,12 +7361,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    6, 7
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6090,15 +7371,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
-                4,0,
-                5,0,
-                1,1,
-                2,1,
-                6,0,
-                5,0,
-                1,1,
-                2,1,
+                2,5,
                 6,0,
                 5,0
             };
@@ -6123,7 +7396,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 7
+                        6, 7
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6141,7 +7414,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentBorderCallout1"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bentConnector5"));
 
     return aPropertyMap;
   }
@@ -6149,64 +7422,73 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCnotchedRightArrow : public CustomShapeProvider
+class ShapeCbentUpArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
+            "if(0-$2 ,0,if(50000-$2 ,$2 ,50000))",
             "min(logwidth,logheight)",
-            "100000*logwidth/?0 ",
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
-            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "?0 *?3 /100000",
-            "logwidth+0-?4 ",
-            "logheight*?2 /200000",
-            "logheight/2",
-            "?7 +0-?6 ",
-            "?7 +?6 -0",
-            "logheight/2",
-            "?6 *?4 /?10 ",
-            "logwidth+0-?11 ",
-            "logwidth",
-            "logheight"
+            "?3 *?2 /100000",
+            "?3 *?1 /50000",
+            "logwidth+0-?5 ",
+            "?3 *?1 /100000",
+            "logwidth+0-?7 ",
+            "?3 *?0 /200000",
+            "?8 +0-?9 ",
+            "?8 +?9 -0",
+            "?3 *?0 /100000",
+            "logheight+0-?12 ",
+            "?11 *1/2",
+            "(?13 +logheight)/2",
+            "(?4 +logheight)/2",
+            "logheight",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 8
+                    0, 13
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -6234,16 +7516,16 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    6, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -6261,6 +7543,41 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 4
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 50000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -6277,42 +7594,47 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
+                    0, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 8
+                    10, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 7
+                    6, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 14
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    8, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 9
+                    18, 4
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 7
+                    11, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 17
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6322,7 +7644,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,7,
+                2,8,
                 4,0,
                 5,0
             };
@@ -6336,9 +7658,9 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
+                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        11, 8
+                        0, 13
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6347,7 +7669,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        12, 9
+                        11, 17
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6365,7 +7687,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-notchedRightArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bentUpArrow"));
 
     return aPropertyMap;
   }
@@ -6373,7 +7695,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCrightBracket : public CustomShapeProvider
+class ShapeCbevel : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -6382,7 +7704,7 @@ class ShapeCrightBracket : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 8333);
+            Any aAny ((sal_Int32) 12500);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj";
         }
@@ -6390,28 +7712,15 @@ class ShapeCrightBracket : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
             "min(logwidth,logheight)",
-            "50000*logheight/?0 ",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "?0 *?2 /100000",
-            "logheight+0-?3 ",
-            "logwidth*cos(pi*(2700000)/10800000)",
-            "?3 *sin(pi*(2700000)/10800000)",
-            "0+?5 -0",
-            "?3 +0-?6 ",
-            "logheight+?6 -?3 ",
+            "?1 *?0 /100000",
+            "logwidth+0-?2 ",
+            "logheight+0-?2 ",
             "logwidth",
-            "logheight",
             "logheight/2",
-            "logwidth",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0"
+            "logwidth/2",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -6424,21 +7733,21 @@ class ShapeCrightBracket : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -6446,7 +7755,7 @@ class ShapeCrightBracket : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -6466,34 +7775,64 @@ class ShapeCrightBracket : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 4
+                },
+                {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
                     0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 3
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
+                    2, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 4
+                    2, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 3
+                    3, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 17
+                    5, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
@@ -6503,27 +7842,117 @@ class ShapeCrightBracket : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 3
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 19
+                    2, 4
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    0, 8
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 3
+                    5, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 21
+                    3, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 4
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6533,16 +7962,48 @@ class ShapeCrightBracket : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,1,
-                2,1,
-                17,1,
+                2,3,
                 4,0,
                 7,0,
                 5,0,
                 1,1,
-                17,1,
+                2,3,
+                4,0,
+                21,0,
+                7,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
+                19,0,
+                7,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
+                20,0,
+                7,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
+                18,0,
+                7,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
+                1,1,
+                2,3,
+                4,0,
+                1,1,
+                2,1,
+                1,1,
+                2,1,
+                1,1,
+                2,1,
+                1,1,
                 2,1,
-                17,1,
                 6,0,
                 5,0
             };
@@ -6556,9 +8017,9 @@ class ShapeCrightBracket : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 8
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        2, 2
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6567,7 +8028,7 @@ class ShapeCrightBracket : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        7, 9
+                        3, 4
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6585,7 +8046,7 @@ class ShapeCrightBracket : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-rightBracket"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bevel"));
 
     return aPropertyMap;
   }
@@ -6593,27 +8054,163 @@ class ShapeCrightBracket : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartOffpageConnector : public CustomShapeProvider
+class ShapeCblockArc : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        {
+            Any aAny ((sal_Int32) 10800000);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 0);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logheight*4/5",
+            "if(0-$0 ,0,if(21599999-$0 ,$0 ,21599999))",
+            "if(0-$1 ,0,if(21599999-$1 ,$1 ,21599999))",
+            "if(0-$2 ,0,if(50000-$2 ,$2 ,50000))",
+            "?1 +0-?0 ",
+            "?3 +21600000-0",
+            "if(?3 ,?3 ,?4 )",
+            "0+0-?5 ",
             "logwidth/2",
+            "?7 *sin(pi*(?0 )/10800000)",
             "logheight/2",
-            "logheight",
-            "logwidth"
+            "?9 *cos(pi*(?0 )/10800000)",
+            "?7 *sin(pi*(?1 )/10800000)",
+            "?9 *cos(pi*(?1 )/10800000)",
+            "?7 *(cos(atan2(?8 ,?10 )))",
+            "?9 *(sin(atan2(?8 ,?10 )))",
+            "?7 *(cos(atan2(?11 ,?12 )))",
+            "?9 *(sin(atan2(?11 ,?12 )))",
+            "logwidth/2",
+            "?17 +?13 -0",
+            "logheight/2",
+            "?19 +?14 -0",
+            "?17 +?15 -0",
+            "?19 +?16 -0",
+            "min(logwidth,logheight)",
+            "?23 *?2 /100000",
+            "?7 +0-?24 ",
+            "?9 +0-?24 ",
+            "?25 *sin(pi*(?1 )/10800000)",
+            "?26 *cos(pi*(?1 )/10800000)",
+            "?25 *sin(pi*(?0 )/10800000)",
+            "?26 *cos(pi*(?0 )/10800000)",
+            "?25 *(cos(atan2(?27 ,?28 )))",
+            "?26 *(sin(atan2(?27 ,?28 )))",
+            "?25 *(cos(atan2(?29 ,?30 )))",
+            "?26 *(sin(atan2(?29 ,?30 )))",
+            "?17 +?31 -0",
+            "?19 +?32 -0",
+            "?17 +?33 -0",
+            "?19 +?34 -0",
+            "21600000+0-?0 ",
+            "?5 +0-?39 ",
+            "max(?18 ,?35 )",
+            "max(?21 ,?37 )",
+            "max(?41 ,?42 )",
+            "if(?40 ,logwidth,?43 )",
+            "5400000+0-?0 ",
+            "27000000+0-?0 ",
+            "if(?45 ,?45 ,?46 )",
+            "?5 +0-?47 ",
+            "max(?20 ,?36 )",
+            "max(?22 ,?38 )",
+            "max(?49 ,?50 )",
+            "if(?48 ,logheight,?51 )",
+            "10800000+0-?0 ",
+            "32400000+0-?0 ",
+            "if(?53 ,?53 ,?54 )",
+            "?5 +0-?55 ",
+            "min(?18 ,?35 )",
+            "min(?21 ,?37 )",
+            "min(?57 ,?58 )",
+            "if(?56 ,0,?59 )",
+            "16200000+0-?0 ",
+            "37800000+0-?0 ",
+            "if(?61 ,?61 ,?62 )",
+            "?5 +0-?63 ",
+            "min(?20 ,?36 )",
+            "min(?22 ,?38 )",
+            "min(?65 ,?66 )",
+            "if(?64 ,0,?67 )",
+            "(?18 +?37 )/2",
+            "(?20 +?38 )/2",
+            "(?21 +?35 )/2",
+            "(?22 +?36 )/2",
+            "?0 +0-5400000",
+            "?1 +5400000-0",
+            "(?73 +?74 )/2",
+            "(?0 )/60000.0",
+            "(?5 )/60000.0",
+            "(?1 )/60000.0",
+            "(?6 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        {
+            Sequence< PropertyValue > aPropSequence (1);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 20
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (3);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    35, 36
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RadiusRangeMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 50000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RadiusRangeMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -6622,34 +8219,39 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (3);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 20
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 9
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 8
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    76, 77
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 10
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    35, 36
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 8
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 26
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    78, 79
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6659,34 +8261,25 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,4,
+                17,1,
+                2,1,
+                17,1,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 10;
-                aSize.Height = 10;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        60, 68
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6695,13 +8288,13 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 0
+                        44, 52
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -6713,7 +8306,7 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartOffpageConnector"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-blockArc"));
 
     return aPropertyMap;
   }
@@ -6721,43 +8314,45 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCleftRightArrow : public CustomShapeProvider
+class ShapeCborderCallout1 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 18750);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) -8333);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
+        {
+            Any aAny ((sal_Int32) 112500);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) -38333);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "50000*logwidth/?0 ",
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
-            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "?0 *?3 /100000",
-            "logwidth+0-?4 ",
-            "logheight*?2 /200000",
-            "logheight/2",
-            "?7 +0-?6 ",
-            "?7 +?6 -0",
-            "logheight/2",
-            "?8 *?4 /?10 ",
-            "?4 +0-?11 ",
-            "?5 +?11 -0",
+            "logheight*$0 /100000",
+            "logwidth*$1 /100000",
+            "logheight*$2 /100000",
+            "logwidth*$3 /100000",
             "logwidth",
+            "logheight/2",
+            "logwidth/2",
             "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
@@ -6765,72 +8360,114 @@ class ShapeCleftRightArrow : public CustomShapeProvider
     {
         Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 8
+                    1, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [6].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [6].Value = makeAny (aAny);
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
@@ -6849,8 +8486,8 @@ class ShapeCleftRightArrow : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -6860,42 +8497,22 @@ class ShapeCleftRightArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 8
+                    4, 7
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 9
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 9
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 15
+                    3, 2
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6905,8 +8522,12 @@ class ShapeCleftRightArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,9,
+                2,3,
                 4,0,
+                5,0,
+                1,1,
+                2,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -6919,9 +8540,9 @@ class ShapeCleftRightArrow : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        12, 8
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6930,7 +8551,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        13, 9
+                        4, 7
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6948,7 +8569,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftRightArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-borderCallout1"));
 
     return aPropertyMap;
   }
@@ -6956,46 +8577,232 @@ class ShapeCleftRightArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCdecagon : public CustomShapeProvider
+class ShapeCborderCallout2 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (6);
         {
-            Any aAny ((sal_Int32) 105146);
+            Any aAny ((sal_Int32) 18750);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "vf";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) -8333);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 18750);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) -16667);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
+        {
+            Any aAny ((sal_Int32) 112500);
+            aAdjSequence [4].Value = aAny;
+            aAdjSequence [4].Name = "adj5";
+        }
+        {
+            Any aAny ((sal_Int32) -46667);
+            aAdjSequence [5].Value = aAny;
+            aAdjSequence [5].Name = "adj6";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
+            "logheight*$0 /100000",
+            "logwidth*$1 /100000",
+            "logheight*$2 /100000",
+            "logwidth*$3 /100000",
+            "logheight*$4 /100000",
+            "logwidth*$5 /100000",
+            "logwidth",
             "logheight/2",
-            "?0 *$0 /100000",
-            "logwidth/2",
-            "?2 *cos(pi*(2160000)/10800000)",
-            "?2 *cos(pi*(4320000)/10800000)",
             "logwidth/2",
-            "?5 +0-?3 ",
-            "?5 +0-?4 ",
-            "?5 +?4 -0",
-            "?5 +?3 -0",
-            "?1 *sin(pi*(4320000)/10800000)",
-            "?1 *sin(pi*(2160000)/10800000)",
-            "logheight/2",
-            "?12 +0-?10 ",
-            "?12 +0-?11 ",
-            "?12 +?11 -0",
-            "?12 +?10 -0",
-            "logwidth"
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    1, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 4
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 5);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 4);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -7010,53 +8817,38 @@ class ShapeCdecagon : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 12
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 14
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 13
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 13
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 14
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 12
+                    6, 9
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 15
+                    0, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 16
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 16
+                    3, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 15
+                    5, 4
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7066,8 +8858,12 @@ class ShapeCdecagon : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,9,
+                2,3,
                 4,0,
+                5,0,
+                1,1,
+                2,2,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -7080,9 +8876,9 @@ class ShapeCdecagon : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        6, 14
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7091,7 +8887,7 @@ class ShapeCdecagon : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        9, 15
+                        6, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7109,7 +8905,7 @@ class ShapeCdecagon : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-decagon"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-borderCallout2"));
 
     return aPropertyMap;
   }
@@ -7117,90 +8913,300 @@ class ShapeCdecagon : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCactionButtonHelp : public CustomShapeProvider
+class ShapeCborderCallout3 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (8);
+        {
+            Any aAny ((sal_Int32) 18750);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) -8333);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 18750);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) -16667);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
+        {
+            Any aAny ((sal_Int32) 100000);
+            aAdjSequence [4].Value = aAny;
+            aAdjSequence [4].Name = "adj5";
+        }
+        {
+            Any aAny ((sal_Int32) -16667);
+            aAdjSequence [5].Value = aAny;
+            aAdjSequence [5].Name = "adj6";
+        }
+        {
+            Any aAny ((sal_Int32) 112963);
+            aAdjSequence [6].Value = aAny;
+            aAdjSequence [6].Name = "adj7";
+        }
+        {
+            Any aAny ((sal_Int32) -8333);
+            aAdjSequence [7].Value = aAny;
+            aAdjSequence [7].Name = "adj8";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "?0 *3/8",
+            "logheight*$0 /100000",
+            "logwidth*$1 /100000",
+            "logheight*$2 /100000",
+            "logwidth*$3 /100000",
+            "logheight*$4 /100000",
+            "logwidth*$5 /100000",
+            "logheight*$6 /100000",
+            "logwidth*$7 /100000",
+            "logwidth",
             "logheight/2",
-            "?2 +0-?1 ",
             "logwidth/2",
-            "?4 +0-?1 ",
-            "?0 *3/4",
-            "?6 *1/7",
-            "?6 *3/14",
-            "?6 *2/7",
-            "?6 *3/7",
-            "?6 *4/7",
-            "?6 *17/28",
-            "?6 *21/28",
-            "?6 *11/14",
-            "?3 +?9 -0",
-            "?3 +?12 -0",
-            "?3 +?13 -0",
-            "?3 +?14 -0",
-            "?5 +?8 -0",
-            "?5 +?10 -0",
-            "?5 +?11 -0",
-            "?6 *1/14",
-            "?6 *3/28",
-            "logwidth",
-            "logheight",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(-5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(0)/60000.0",
-            "(-10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(21600000)/60000.0",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(-5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(0)/60000.0",
-            "(-10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(21600000)/60000.0",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(-5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(0)/60000.0",
-            "(-10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(21600000)/60000.0"
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    1, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 4
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 5);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 4);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 6
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 7);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 6);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [3] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -7221,322 +9227,37 @@ class ShapeCactionButtonHelp : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    24, 0
+                    8, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 25
+                    8, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 25
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 27
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 29
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    30, 31
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    32, 33
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    34, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    36, 37
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    4, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    38, 39
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    40, 41
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    42, 43
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    44, 45
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    46, 47
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    48, 49
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    50, 51
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    4, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    52, 53
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    54, 55
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    56, 57
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    58, 59
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    60, 61
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    62, 63
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    64, 65
+                    0, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 18
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 23
+                    3, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    66, 67
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    24, 0
+                    5, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 25
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 25
+                    7, 6
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7548,40 +9269,9 @@ class ShapeCactionButtonHelp : public CustomShapeProvider
                 1,1,
                 2,3,
                 4,0,
-                1,1,
-                17,3,
-                2,3,
-                17,3,
-                4,0,
-                1,1,
-                17,1,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                17,3,
-                2,3,
-                17,3,
-                4,0,
-                1,1,
-                17,1,
-                4,0,
-                18,0,
-                7,0,
-                5,0,
-                1,1,
-                17,3,
-                2,3,
-                17,3,
-                4,0,
-                1,1,
-                17,1,
-                4,0,
-                6,0,
                 5,0,
                 1,1,
                 2,3,
-                4,0,
                 6,0,
                 5,0
             };
@@ -7606,7 +9296,7 @@ class ShapeCactionButtonHelp : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        24, 25
+                        8, 11
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7624,7 +9314,7 @@ class ShapeCactionButtonHelp : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonHelp"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-borderCallout3"));
 
     return aPropertyMap;
   }
@@ -7632,7 +9322,7 @@ class ShapeCactionButtonHelp : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCstar24 : public CustomShapeProvider
+class ShapeCbracePair : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -7641,7 +9331,7 @@ class ShapeCstar24 : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 37500);
+            Any aAny ((sal_Int32) 8333);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj";
         }
@@ -7649,91 +9339,55 @@ class ShapeCstar24 : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "logwidth/2",
-            "?1 *cos(pi*(900000)/10800000)",
-            "?1 *cos(pi*(1800000)/10800000)",
-            "?1 *cos(pi*(2700000)/10800000)",
-            "logwidth/4",
-            "?5 ",
-            "?1 *cos(pi*(4500000)/10800000)",
+            "if(0-$0 ,0,if(25000-$0 ,$0 ,25000))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "?1 *?0 /50000",
+            "logwidth+0-?3 ",
+            "logwidth+0-?2 ",
             "logheight/2",
-            "?8 *sin(pi*(4500000)/10800000)",
-            "?8 *sin(pi*(3600000)/10800000)",
-            "?8 *sin(pi*(2700000)/10800000)",
-            "logheight/4",
-            "?12 ",
-            "?8 *sin(pi*(900000)/10800000)",
+            "?6 +0-?2 ",
+            "?6 +?2 -0",
+            "logheight+0-?2 ",
+            "?2 *29289/100000",
+            "?2 +?10 -0",
+            "logwidth+0-?11 ",
+            "logheight+0-?10 ",
             "logwidth/2",
-            "?15 +0-?2 ",
-            "?15 +0-?3 ",
-            "?15 +0-?4 ",
-            "?15 +0-?6 ",
-            "?15 +0-?7 ",
-            "?15 +?7 -0",
-            "?15 +?6 -0",
-            "?15 +?4 -0",
-            "?15 +?3 -0",
-            "?15 +?2 -0",
-            "logheight/2",
-            "?26 +0-?9 ",
-            "?26 +0-?10 ",
-            "?26 +0-?11 ",
-            "?26 +0-?13 ",
-            "?26 +0-?14 ",
-            "?26 +?14 -0",
-            "?26 +?13 -0",
-            "?26 +?11 -0",
-            "?26 +?10 -0",
-            "?26 +?9 -0",
-            "?1 *?0 /50000",
-            "?8 *?0 /50000",
-            "?37 *99144/100000",
-            "?37 *92388/100000",
-            "?37 *79335/100000",
-            "?37 *60876/100000",
-            "?37 *38268/100000",
-            "?37 *13053/100000",
-            "?38 *99144/100000",
-            "?38 *92388/100000",
-            "?38 *79335/100000",
-            "?38 *60876/100000",
-            "?38 *38268/100000",
-            "?38 *13053/100000",
-            "?15 +0-?39 ",
-            "?15 +0-?40 ",
-            "?15 +0-?41 ",
-            "?15 +0-?42 ",
-            "?15 +0-?43 ",
-            "?15 +0-?44 ",
-            "?15 +?44 -0",
-            "?15 +?43 -0",
-            "?15 +?42 -0",
-            "?15 +?41 -0",
-            "?15 +?40 -0",
-            "?15 +?39 -0",
-            "?26 +0-?45 ",
-            "?26 +0-?46 ",
-            "?26 +0-?47 ",
-            "?26 +0-?48 ",
-            "?26 +0-?49 ",
-            "?26 +0-?50 ",
-            "?26 +?50 -0",
-            "?26 +?49 -0",
-            "?26 +?48 -0",
-            "?26 +?47 -0",
-            "?26 +?46 -0",
-            "?26 +?45 -0",
-            "?37 *cos(pi*(2700000)/10800000)",
-            "?38 *sin(pi*(2700000)/10800000)",
-            "?15 +0-?75 ",
-            "?26 +0-?76 ",
-            "?15 +?75 -0",
-            "?26 +?76 -0",
-            "?26 +0-?38 ",
-            "min(logwidth,logheight)/2",
             "logheight",
-            "logwidth"
+            "logwidth",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(-5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(-5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(-5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(-5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -7745,18 +9399,18 @@ class ShapeCstar24 : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    15, 81
+                    0, 2
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 82);
+                Any aAny ((sal_Int32) 25000);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -7788,244 +9442,224 @@ class ShapeCstar24 : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 26
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    51, 68
+                    3, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 31
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    52, 67
+                    17, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 30
+                    2, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    53, 66
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 29
+                    19, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    54, 65
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 28
+                    21, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    55, 64
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 27
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    56, 63
+                    23, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    15, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    57, 63
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 27
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    58, 64
+                    4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 28
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    59, 65
+                    25, 26
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 29
+                    5, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    60, 66
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 30
+                    27, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    61, 67
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 31
+                    29, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    62, 68
+                    5, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    84, 26
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    62, 69
+                    31, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 32
+                    3, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    61, 70
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 33
+                    33, 34
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    60, 71
+                    2, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 34
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    59, 72
+                    35, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 35
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    58, 73
+                    37, 38
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 36
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    57, 74
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 83
+                    39, 40
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    56, 74
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 36
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    55, 73
+                    41, 42
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 35
+                    5, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    54, 72
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 34
+                    43, 44
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    53, 71
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 33
+                    45, 46
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    52, 70
+                    5, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 32
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    51, 69
+                    47, 48
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8035,8 +9669,33 @@ class ShapeCstar24 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,47,
+                17,1,
+                2,1,
+                17,2,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,2,
+                2,1,
+                17,1,
                 4,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                2,1,
+                17,2,
+                2,1,
+                17,1,
+                1,1,
+                17,1,
+                2,1,
+                17,2,
+                2,1,
+                17,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -8051,7 +9710,7 @@ class ShapeCstar24 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        77, 78
+                        11, 11
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8060,7 +9719,7 @@ class ShapeCstar24 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        79, 80
+                        12, 13
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -8078,7 +9737,7 @@ class ShapeCstar24 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star24"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bracePair"));
 
     return aPropertyMap;
   }
@@ -8086,67 +9745,56 @@ class ShapeCstar24 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCmathDivide : public CustomShapeProvider
+class ShapeCbracketPair : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 23520);
+            Any aAny ((sal_Int32) 16667);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 5880);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 11760);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(1000-$0 ,1000,if(36745-$0 ,$0 ,36745))",
-            "0+0-?0 ",
-            "(73490+?1 )/4",
-            "36745*logwidth/logheight",
-            "min(?2 ,?3 )",
-            "if(1000-$2 ,1000,if(?4 -$2 ,$2 ,?4 ))",
-            "-4*?5 /1",
-            "73490+?6 -?0 ",
-            "if(0-$1 ,0,if(?7 -$1 ,$1 ,?7 ))",
-            "logheight*?0 /200000",
-            "logheight*?8 /100000",
-            "logheight*?5 /100000",
-            "logwidth*73490/200000",
-            "logheight/2",
-            "?13 +0-?9 ",
-            "?13 +?9 -0",
-            "?10 +?11 -0",
-            "?14 +0-?16 ",
-            "?17 +0-?11 ",
-            "logheight+0-?18 ",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "logwidth+0-?2 ",
+            "logheight+0-?2 ",
+            "?2 *29289/100000",
+            "logwidth+0-?5 ",
+            "logheight+0-?5 ",
             "logwidth/2",
-            "?20 +0-?12 ",
-            "?20 +?12 -0",
-            "?20 +0-?11 ",
+            "logheight/2",
+            "logheight",
             "logwidth",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
             "(16200000)/60000.0",
-            "(21600000)/60000.0",
             "(5400000)/60000.0",
-            "(21600000)/60000.0"
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -8155,14 +9803,14 @@ class ShapeCmathDivide : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 14
+                    0, 2
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 36745);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -8170,7 +9818,7 @@ class ShapeCmathDivide : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1000);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
@@ -8182,76 +9830,6 @@ class ShapeCmathDivide : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 17
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 7);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    23, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 4);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -8266,54 +9844,124 @@ class ShapeCmathDivide : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 2
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 18
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 11
+                    12, 13
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 19
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 11
+                    11, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 28
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 14
+                    16, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 14
+                    2, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 15
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 15
+                    18, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 25
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 27
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8324,13 +9972,24 @@ class ShapeCmathDivide : public CustomShapeProvider
             // Command, Count
                 1,1,
                 17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
                 4,0,
+                7,0,
+                5,0,
                 1,1,
                 17,1,
-                4,0,
+                2,1,
+                17,1,
                 1,1,
-                2,3,
-                4,0,
+                17,1,
+                2,1,
+                17,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -8345,7 +10004,7 @@ class ShapeCmathDivide : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        21, 14
+                        5, 5
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8354,7 +10013,7 @@ class ShapeCmathDivide : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        22, 15
+                        6, 7
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -8372,7 +10031,7 @@ class ShapeCmathDivide : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-mathDivide"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bracketPair"));
 
     return aPropertyMap;
   }
@@ -8380,39 +10039,45 @@ class ShapeCmathDivide : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcurvedConnector4 : public CustomShapeProvider
+class ShapeCcallout1 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 18750);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) -8333);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
+        {
+            Any aAny ((sal_Int32) 112500);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) -38333);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logwidth*$0 /100000",
-            "(0+?0 )/2",
-            "(logwidth+?0 )/2",
-            "(?0 +?2 )/2",
-            "(?2 +logwidth)/2",
-            "logheight*$1 /100000",
-            "(0+?5 )/2",
-            "(0+?6 )/2",
-            "(?6 +?5 )/2",
-            "(logheight+?5 )/2",
+            "logheight*$0 /100000",
+            "logwidth*$1 /100000",
+            "logheight*$2 /100000",
+            "logwidth*$3 /100000",
             "logwidth",
+            "logheight/2",
+            "logwidth/2",
             "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
@@ -8420,14 +10085,14 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider
     {
         Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 6
+                    1, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -8448,26 +10113,47 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [6].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 5
+                    3, 2
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
@@ -8475,7 +10161,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
@@ -8483,9 +10169,30 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [6].Value = makeAny (aAny);
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
@@ -8510,227 +10217,12 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 6
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    4, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 11
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                3,3,
-                6,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        10, 11
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedConnector4"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCflowChartOr : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "logwidth/2",
-            "?0 *cos(pi*(2700000)/10800000)",
-            "logheight/2",
-            "?2 *sin(pi*(2700000)/10800000)",
-            "logwidth/2",
-            "?4 +0-?1 ",
-            "?4 +?1 -0",
-            "logheight/2",
-            "?7 +0-?3 ",
-            "?7 +?3 -0",
-            "logheight",
-            "logwidth",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    18, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
                     4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 10
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 7
+                    4, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
@@ -8740,42 +10232,12 @@ class ShapeCflowChartOr : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 25
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 27
+                    3, 2
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8785,19 +10247,12 @@ class ShapeCflowChartOr : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,4,
+                2,3,
                 4,0,
                 7,0,
                 5,0,
                 1,1,
                 2,1,
-                1,1,
-                2,1,
-                6,0,
-                5,0,
-                1,1,
-                17,4,
-                4,0,
                 6,0,
                 5,0
             };
@@ -8811,9 +10266,9 @@ class ShapeCflowChartOr : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        5, 8
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8822,7 +10277,7 @@ class ShapeCflowChartOr : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 9
+                        4, 7
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -8840,7 +10295,7 @@ class ShapeCflowChartOr : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartOr"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-callout1"));
 
     return aPropertyMap;
   }
@@ -8848,14 +10303,14 @@ class ShapeCflowChartOr : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCborderCallout3 : public CustomShapeProvider
+class ShapeCcallout2 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (8);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (6);
         {
             Any aAny ((sal_Int32) 18750);
             aAdjSequence [0].Value = aAny;
@@ -8877,25 +10332,15 @@ class ShapeCborderCallout3 : public CustomShapeProvider
             aAdjSequence [3].Name = "adj4";
         }
         {
-            Any aAny ((sal_Int32) 100000);
+            Any aAny ((sal_Int32) 112500);
             aAdjSequence [4].Value = aAny;
             aAdjSequence [4].Name = "adj5";
         }
         {
-            Any aAny ((sal_Int32) -16667);
+            Any aAny ((sal_Int32) -46667);
             aAdjSequence [5].Value = aAny;
             aAdjSequence [5].Name = "adj6";
         }
-        {
-            Any aAny ((sal_Int32) 112963);
-            aAdjSequence [6].Value = aAny;
-            aAdjSequence [6].Name = "adj7";
-        }
-        {
-            Any aAny ((sal_Int32) -8333);
-            aAdjSequence [7].Value = aAny;
-            aAdjSequence [7].Name = "adj8";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
@@ -8906,8 +10351,6 @@ class ShapeCborderCallout3 : public CustomShapeProvider
             "logwidth*$3 /100000",
             "logheight*$4 /100000",
             "logwidth*$5 /100000",
-            "logheight*$6 /100000",
-            "logwidth*$7 /100000",
             "logwidth",
             "logheight/2",
             "logwidth/2",
@@ -8916,7 +10359,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
         {
             Sequence< PropertyValue > aPropSequence (7);
             {
@@ -9085,62 +10528,6 @@ class ShapeCborderCallout3 : public CustomShapeProvider
             }
             aPropSequenceSequence [2] = aPropSequence;
         }
-        {
-            Sequence< PropertyValue > aPropSequence (7);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 6
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 7);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 6);
-                aPropSequence [6].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [3] = aPropSequence;
-        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -9162,17 +10549,17 @@ class ShapeCborderCallout3 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
+                    6, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 11
+                    6, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 11
+                    0, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -9188,11 +10575,6 @@ class ShapeCborderCallout3 : public CustomShapeProvider
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
                     5, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 6
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -9204,9 +10586,10 @@ class ShapeCborderCallout3 : public CustomShapeProvider
                 1,1,
                 2,3,
                 4,0,
+                7,0,
                 5,0,
                 1,1,
-                2,3,
+                2,2,
                 6,0,
                 5,0
             };
@@ -9231,7 +10614,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        8, 11
+                        6, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -9249,7 +10632,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-borderCallout3"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-callout2"));
 
     return aPropertyMap;
   }
@@ -9257,63 +10640,69 @@ class ShapeCborderCallout3 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCupDownArrowCallout : public CustomShapeProvider
+class ShapeCcallout3 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (8);
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 18750);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) -8333);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 18750);
             aAdjSequence [2].Value = aAny;
             aAdjSequence [2].Name = "adj3";
         }
         {
-            Any aAny ((sal_Int32) 48123);
+            Any aAny ((sal_Int32) -16667);
             aAdjSequence [3].Value = aAny;
             aAdjSequence [3].Name = "adj4";
         }
+        {
+            Any aAny ((sal_Int32) 100000);
+            aAdjSequence [4].Value = aAny;
+            aAdjSequence [4].Name = "adj5";
+        }
+        {
+            Any aAny ((sal_Int32) -16667);
+            aAdjSequence [5].Value = aAny;
+            aAdjSequence [5].Name = "adj6";
+        }
+        {
+            Any aAny ((sal_Int32) 112963);
+            aAdjSequence [6].Value = aAny;
+            aAdjSequence [6].Name = "adj7";
+        }
+        {
+            Any aAny ((sal_Int32) -8333);
+            aAdjSequence [7].Value = aAny;
+            aAdjSequence [7].Name = "adj8";
+        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "50000*logwidth/?0 ",
-            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "?2 *2/1",
-            "if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))",
-            "50000*logheight/?0 ",
-            "if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))",
+            "logheight*$0 /100000",
+            "logwidth*$1 /100000",
+            "logheight*$2 /100000",
+            "logwidth*$3 /100000",
+            "logheight*$4 /100000",
+            "logwidth*$5 /100000",
+            "logheight*$6 /100000",
+            "logwidth*$7 /100000",
+            "logwidth",
             "logheight/2",
-            "?6 *?0 /?7 ",
-            "100000+0-?8 ",
-            "if(0-$3 ,0,if(?9 -$3 ,$3 ,?9 ))",
-            "?0 *?2 /100000",
-            "?0 *?4 /200000",
             "logwidth/2",
-            "?13 +0-?11 ",
-            "?13 +0-?12 ",
-            "?13 +?12 -0",
-            "?13 +?11 -0",
-            "?0 *?6 /100000",
-            "logheight+0-?18 ",
-            "logheight*?10 /200000",
-            "logheight/2",
-            "?21 +0-?20 ",
-            "?21 +?20 -0",
-            "logwidth",
             "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
@@ -9321,142 +10710,226 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider
     {
         Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 18
+                    1, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 3);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [6].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    14, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [6].Value = makeAny (aAny);
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 18
+                    5, 4
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 5);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 5);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 4);
+                aPropSequence [6].Value = makeAny (aAny);
             }
             aPropSequenceSequence [2] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 22
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 6
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 9);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 7);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 6);
+                aPropSequence [6].Value = makeAny (aAny);
             }
             aPropSequenceSequence [3] = aPropSequence;
         }
@@ -9475,93 +10948,43 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    15, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    15, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    13, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 23
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 23
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    8, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 19
+                    8, 11
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 19
+                    0, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 25
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 19
+                    3, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 19
+                    5, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 23
+                    7, 6
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -9571,8 +10994,13 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,17,
+                2,3,
                 4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,3,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -9586,8 +11014,8 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        0, 22
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -9596,7 +11024,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        24, 23
+                        8, 11
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -9614,133 +11042,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-upDownArrowCallout"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCflowChartDecision : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "logwidth*3/4",
-            "logheight*3/4",
-            "logwidth/2",
-            "logheight/2",
-            "logheight",
-            "logwidth",
-            "logwidth/4",
-            "logheight/4"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (4);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 2
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,3,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 2;
-                aSize.Height = 2;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        6, 7
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        0, 1
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartDecision"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-callout3"));
 
     return aPropertyMap;
   }
@@ -9751,41 +11053,41 @@ class ShapeCflowChartDecision : public CustomShapeProvider
 } // anonymous namespace
 void CustomShapeProperties::initializePresetsMap1()
 {
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonSound" ) ] = new ShapeCactionButtonSound();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "borderCallout1" ) ] = new ShapeCborderCallout1();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "plaqueTabs" ) ] = new ShapeCplaqueTabs();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedLeftArrow" ) ] = new ShapeCcurvedLeftArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "octagon" ) ] = new ShapeCoctagon();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftRightRibbon" ) ] = new ShapeCleftRightRibbon();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonInformation" ) ] = new ShapeCactionButtonInformation();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentConnector5" ) ] = new ShapeCbentConnector5();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "circularArrow" ) ] = new ShapeCcircularArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "downArrowCallout" ) ] = new ShapeCdownArrowCallout();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "mathMinus" ) ] = new ShapeCmathMinus();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "gear9" ) ] = new ShapeCgear9();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "round1Rect" ) ] = new ShapeCround1Rect();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "sun" ) ] = new ShapeCsun();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "plaque" ) ] = new ShapeCplaque();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "chevron" ) ] = new ShapeCchevron();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartPreparation" ) ] = new ShapeCflowChartPreparation();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "diagStripe" ) ] = new ShapeCdiagStripe();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "pentagon" ) ] = new ShapeCpentagon();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "funnel" ) ] = new ShapeCfunnel();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "chartStar" ) ] = new ShapeCchartStar();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "accentBorderCallout1" ) ] = new ShapeCaccentBorderCallout1();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "notchedRightArrow" ) ] = new ShapeCnotchedRightArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "rightBracket" ) ] = new ShapeCrightBracket();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartOffpageConnector" ) ] = new ShapeCflowChartOffpageConnector();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftRightArrow" ) ] = new ShapeCleftRightArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "decagon" ) ] = new ShapeCdecagon();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "accentBorderCallout2" ) ] = new ShapeCaccentBorderCallout2();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "accentBorderCallout3" ) ] = new ShapeCaccentBorderCallout3();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "accentCallout1" ) ] = new ShapeCaccentCallout1();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "accentCallout2" ) ] = new ShapeCaccentCallout2();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "accentCallout3" ) ] = new ShapeCaccentCallout3();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonBackPrevious" ) ] = new ShapeCactionButtonBackPrevious();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonBeginning" ) ] = new ShapeCactionButtonBeginning();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonBlank" ) ] = new ShapeCactionButtonBlank();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonDocument" ) ] = new ShapeCactionButtonDocument();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonEnd" ) ] = new ShapeCactionButtonEnd();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonForwardNext" ) ] = new ShapeCactionButtonForwardNext();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonHelp" ) ] = new ShapeCactionButtonHelp();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star24" ) ] = new ShapeCstar24();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "mathDivide" ) ] = new ShapeCmathDivide();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedConnector4" ) ] = new ShapeCcurvedConnector4();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartOr" ) ] = new ShapeCflowChartOr();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonHome" ) ] = new ShapeCactionButtonHome();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonInformation" ) ] = new ShapeCactionButtonInformation();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonMovie" ) ] = new ShapeCactionButtonMovie();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonReturn" ) ] = new ShapeCactionButtonReturn();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonSound" ) ] = new ShapeCactionButtonSound();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "arc" ) ] = new ShapeCarc();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentArrow" ) ] = new ShapeCbentArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentConnector2" ) ] = new ShapeCbentConnector2();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentConnector3" ) ] = new ShapeCbentConnector3();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentConnector4" ) ] = new ShapeCbentConnector4();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentConnector5" ) ] = new ShapeCbentConnector5();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentUpArrow" ) ] = new ShapeCbentUpArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bevel" ) ] = new ShapeCbevel();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "blockArc" ) ] = new ShapeCblockArc();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "borderCallout1" ) ] = new ShapeCborderCallout1();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "borderCallout2" ) ] = new ShapeCborderCallout2();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "borderCallout3" ) ] = new ShapeCborderCallout3();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "upDownArrowCallout" ) ] = new ShapeCupDownArrowCallout();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartDecision" ) ] = new ShapeCflowChartDecision();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bracePair" ) ] = new ShapeCbracePair();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bracketPair" ) ] = new ShapeCbracketPair();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "callout1" ) ] = new ShapeCcallout1();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "callout2" ) ] = new ShapeCcallout2();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "callout3" ) ] = new ShapeCcallout3();
 }
 
 } } // oox // drawingml
diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx
index 19e781906aca..c45200fcd35b 100644
--- a/oox/source/drawingml/customshapepresets2.cxx
+++ b/oox/source/drawingml/customshapepresets2.cxx
@@ -23,33 +23,18 @@ namespace oox { namespace drawingml {
 
 namespace
 {
-class ShapeCleftRightArrowCallout : public CustomShapeProvider
+class ShapeCcan : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
             Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) 48123);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
@@ -57,35 +42,34 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider
         static const char *aStrings[] = {
             "min(logwidth,logheight)",
             "50000*logheight/?0 ",
-            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "?2 *2/1",
-            "if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))",
-            "50000*logwidth/?0 ",
-            "if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "?0 *?2 /200000",
+            "?3 +?3 -0",
+            "logheight+0-?3 ",
             "logwidth/2",
-            "?6 *?0 /?7 ",
-            "100000+0-?8 ",
-            "if(0-$3 ,0,if(?9 -$3 ,$3 ,?9 ))",
-            "?0 *?2 /100000",
-            "?0 *?4 /200000",
             "logheight/2",
-            "?13 +0-?11 ",
-            "?13 +0-?12 ",
-            "?13 +?12 -0",
-            "?13 +?11 -0",
-            "?0 *?6 /100000",
-            "logwidth+0-?18 ",
-            "logwidth*?10 /200000",
-            "logwidth/2",
-            "?21 +0-?20 ",
-            "?21 +?20 -0",
             "logheight",
-            "logwidth"
+            "logwidth",
+            "logwidth/2",
+            "(10800000)/60000.0",
+            "(-10800000)/60000.0",
+            "(0)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(10800000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -94,42 +78,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 15
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 3);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 14
+                    6, 4
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -151,80 +100,10 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider
             }
             {
                 aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 5);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 2);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 24
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 9);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [3] = aPropSequence;
+            aPropSequenceSequence [0] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -242,92 +121,102 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 13
+                    0, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 14
+                    10, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 15
+                    11, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 15
+                    9, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    22, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 14
+                },
+                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    23, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 15
+                    10, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 15
+                    15, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 14
+                    10, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 13
+                    17, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 17
+                    9, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 16
+                    10, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 16
+                    19, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 24
+                    10, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 24
+                    21, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 16
+                    9, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 16
+                    10, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 17
+                    23, 24
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 3
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -337,8 +226,24 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,17,
+                17,1,
+                2,1,
+                17,1,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                17,2,
                 4,0,
+                20,0,
+                7,0,
+                5,0,
+                1,1,
+                17,2,
+                2,1,
+                17,1,
+                2,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -351,9 +256,9 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::NORMAL,
-                        22, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        0, 4
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -362,7 +267,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        23, 24
+                        9, 5
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -380,7 +285,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftRightArrowCallout"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-can"));
 
     return aPropertyMap;
   }
@@ -388,7 +293,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartManualOperation : public CustomShapeProvider
+class ShapeCchartPlus : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -398,16 +303,7 @@ class ShapeCflowChartManualOperation : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
-        static const char *aStrings[] = {
-            "logwidth*4/5",
-            "logwidth*9/10",
-            "logwidth/2",
-            "logwidth/10",
-            "logheight/2",
-            "logheight",
-            "logwidth/5"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+        aPropertyMap.setProperty(PROP_Equations, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
@@ -419,29 +315,49 @@ class ShapeCflowChartManualOperation : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (3);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
                     0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    0, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4, 5
+                    10, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 5
+                    10, 0
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -451,49 +367,35 @@ class ShapeCflowChartManualOperation : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
+                2,1,
+                1,1,
+                2,1,
+                6,0,
+                5,0,
+                1,1,
                 2,3,
                 4,0,
+                7,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
             aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
+            Sequence< awt::Size > aSizeSequence (2);
             {
                 awt::Size aSize;
-                aSize.Width = 5;
-                aSize.Height = 5;
+                aSize.Width = 10;
+                aSize.Height = 10;
                 aSizeSequence [0] = aSize;
             }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        6, 0
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        0, 5
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
+                awt::Size aSize;
+                aSize.Width = 10;
+                aSize.Height = 10;
+                aSizeSequence [1] = aSize;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aSizeSequence);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -501,11 +403,11 @@ class ShapeCflowChartManualOperation : public CustomShapeProvider
         awt::Rectangle aRectangle;
         aRectangle.X = 0;
         aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
+        aRectangle.Width = 400000;
+        aRectangle.Height = 400000;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartManualOperation"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-chartPlus"));
 
     return aPropertyMap;
   }
@@ -513,118 +415,154 @@ class ShapeCflowChartManualOperation : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCsnipRoundRect : public CustomShapeProvider
+class ShapeCchartStar : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
-        {
-            Any aAny ((sal_Int32) 16667);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 16667);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
-        static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
-            "min(logwidth,logheight)",
-            "?2 *?0 /100000",
-            "?2 *?1 /100000",
-            "logwidth+0-?4 ",
-            "?3 *29289/100000",
-            "(?5 +logwidth)/2",
-            "logwidth",
-            "logheight/2",
-            "logwidth/2",
-            "logheight",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+        aPropertyMap.setProperty(PROP_Equations, Sequence< OUString >(0));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
         {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
                     5, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 0
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,1,
+                1,1,
+                2,1,
+                1,1,
+                2,1,
+                6,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
+                7,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (2);
             {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
+                awt::Size aSize;
+                aSize.Width = 10;
+                aSize.Height = 10;
+                aSizeSequence [0] = aSize;
             }
             {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
+                awt::Size aSize;
+                aSize.Width = 10;
+                aSize.Height = 10;
+                aSizeSequence [1] = aSize;
             }
-            aPropSequenceSequence [1] = aPropSequence;
+            aPropSequence [2].Value = makeAny (aSizeSequence);
         }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 400000;
+        aRectangle.Height = 400000;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-chartStar"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCchartX : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_Equations, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -638,44 +576,44 @@ class ShapeCsnipRoundRect : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 10
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 10
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 11
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 11
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 10
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 10
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 0
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -685,39 +623,35 @@ class ShapeCsnipRoundRect : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,5,
-                17,1,
+                2,1,
+                1,1,
+                2,1,
+                6,0,
+                5,0,
+                1,1,
+                2,3,
                 4,0,
+                7,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (2);
             {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        6, 6
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        7, 11
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
+                awt::Size aSize;
+                aSize.Width = 10;
+                aSize.Height = 10;
+                aSizeSequence [0] = aSize;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            {
+                awt::Size aSize;
+                aSize.Width = 10;
+                aSize.Height = 10;
+                aSizeSequence [1] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -725,11 +659,11 @@ class ShapeCsnipRoundRect : public CustomShapeProvider
         awt::Rectangle aRectangle;
         aRectangle.X = 0;
         aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
+        aRectangle.Width = 400000;
+        aRectangle.Height = 400000;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-snipRoundRect"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-chartX"));
 
     return aPropertyMap;
   }
@@ -737,7 +671,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCmathPlus : public CustomShapeProvider
+class ShapeCchevron : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -746,29 +680,26 @@ class ShapeCmathPlus : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 23520);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(73490-$0 ,$0 ,73490))",
-            "logwidth*73490/200000",
-            "logheight*73490/200000",
             "min(logwidth,logheight)",
-            "?3 *?0 /200000",
-            "logwidth/2",
-            "?5 +0-?1 ",
-            "?5 +0-?4 ",
-            "?5 +?4 -0",
-            "?5 +?1 -0",
+            "100000*logwidth/?0 ",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "?0 *?2 /100000",
+            "logwidth+0-?3 ",
+            "?4 *1/2",
+            "?4 +0-?3 ",
+            "if(?6 ,?3 ,0)",
+            "if(?6 ,?4 ,logwidth)",
             "logheight/2",
-            "?10 +0-?2 ",
-            "?10 +0-?4 ",
-            "?10 +?4 -0",
-            "?10 +?2 -0"
+            "logheight",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -780,22 +711,22 @@ class ShapeCmathPlus : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 12
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 73490);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -803,7 +734,7 @@ class ShapeCmathPlus : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -823,64 +754,34 @@ class ShapeCmathPlus : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 12
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 12
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 11
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 11
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 12
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 12
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 13
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 13
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 14
+                    11, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 14
+                    4, 10
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 13
+                    0, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 13
+                    3, 9
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -890,7 +791,7 @@ class ShapeCmathPlus : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,11,
+                2,5,
                 4,0,
                 5,0
             };
@@ -905,8 +806,8 @@ class ShapeCmathPlus : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        6, 12
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        7, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -915,7 +816,7 @@ class ShapeCmathPlus : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        9, 13
+                        8, 10
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -933,7 +834,7 @@ class ShapeCmathPlus : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-mathPlus"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-chevron"));
 
     return aPropertyMap;
   }
@@ -941,32 +842,95 @@ class ShapeCmathPlus : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCactionButtonForwardNext : public CustomShapeProvider
+class ShapeCchord : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        {
+            Any aAny ((sal_Int32) 2700000);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 16200000);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "?0 *3/8",
+            "if(0-$0 ,0,if(21599999-$0 ,$0 ,21599999))",
+            "if(0-$1 ,0,if(21599999-$1 ,$1 ,21599999))",
+            "?1 +0-?0 ",
+            "?2 +21600000-0",
+            "if(?2 ,?2 ,?3 )",
+            "logwidth/2",
+            "?5 *sin(pi*(?0 )/10800000)",
             "logheight/2",
-            "?2 +0-?1 ",
-            "?2 +?1 -0",
+            "?7 *cos(pi*(?0 )/10800000)",
+            "?5 *(cos(atan2(?6 ,?8 )))",
+            "?7 *(sin(atan2(?6 ,?8 )))",
+            "?5 *sin(pi*(?1 )/10800000)",
+            "?7 *cos(pi*(?1 )/10800000)",
+            "?5 *(cos(atan2(?11 ,?12 )))",
+            "?7 *(sin(atan2(?11 ,?12 )))",
             "logwidth/2",
-            "?5 +0-?1 ",
-            "?5 +?1 -0",
-            "logwidth",
-            "logheight"
+            "?15 +?9 -0",
+            "logheight/2",
+            "?17 +?10 -0",
+            "?15 +?13 -0",
+            "?17 +?14 -0",
+            "(?16 +?19 )/2",
+            "(?18 +?20 )/2",
+            "?4 *1/2",
+            "?0 +?23 -10800000",
+            "?5 *cos(pi*(2700000)/10800000)",
+            "?7 *sin(pi*(2700000)/10800000)",
+            "?15 +0-?25 ",
+            "?15 +?25 -0",
+            "?17 +0-?26 ",
+            "?17 +?26 -0",
+            "(?0 )/60000.0",
+            "(?4 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        {
+            Sequence< PropertyValue > aPropSequence (1);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    16, 18
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (1);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 20
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -980,89 +944,19 @@ class ShapeCactionButtonForwardNext : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 3
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 4
+                    16, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
+                    5, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
+                    31, 32
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1072,28 +966,8 @@ class ShapeCactionButtonForwardNext : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
-                4,0,
-                1,1,
-                2,2,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,2,
-                4,0,
-                18,0,
-                7,0,
-                5,0,
-                1,1,
-                2,2,
-                4,0,
-                6,0,
-                5,0,
-                1,1,
-                2,3,
+                17,1,
                 4,0,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -1106,9 +980,9 @@ class ShapeCactionButtonForwardNext : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        27, 29
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1117,7 +991,7 @@ class ShapeCactionButtonForwardNext : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        8, 9
+                        28, 30
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -1135,7 +1009,7 @@ class ShapeCactionButtonForwardNext : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonForwardNext"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-chord"));
 
     return aPropertyMap;
   }
@@ -1143,67 +1017,291 @@ class ShapeCactionButtonForwardNext : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcan : public CustomShapeProvider
+class ShapeCcircularArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (5);
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 12500);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 1142319);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 20457681);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) 10800000);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
+        {
+            Any aAny ((sal_Int32) 12500);
+            aAdjSequence [4].Value = aAny;
+            aAdjSequence [4].Name = "adj5";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "50000*logheight/?0 ",
+            "if(0-$4 ,0,if(25000-$4 ,$4 ,25000))",
+            "?0 *2/1",
             "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "?0 *?2 /200000",
-            "?3 +?3 -0",
-            "logheight+0-?3 ",
+            "if(1-$2 ,1,if(21599999-$2 ,$2 ,21599999))",
+            "if(0-$3 ,0,if(21599999-$3 ,$3 ,21599999))",
+            "min(logwidth,logheight)",
+            "?5 *?2 /100000",
+            "?5 *?0 /100000",
+            "?6 *1/2",
             "logwidth/2",
+            "?9 +?8 -?7 ",
             "logheight/2",
-            "logheight",
-            "logwidth",
+            "?11 +?8 -?7 ",
+            "?10 +0-?6 ",
+            "?12 +0-?6 ",
+            "?13 +?8 -0",
+            "?14 +?8 -0",
+            "?15 *sin(pi*(?3 )/10800000)",
+            "?16 *cos(pi*(?3 )/10800000)",
+            "?15 *(cos(atan2(?17 ,?18 )))",
+            "?16 *(sin(atan2(?17 ,?18 )))",
             "logwidth/2",
-            "(10800000)/60000.0",
-            "(-10800000)/60000.0",
-            "(0)/60000.0",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(10800000)/60000.0"
+            "?21 +?19 -0",
+            "logheight/2",
+            "?23 +?20 -0",
+            "min(?13 ,?14 )",
+            "?19 *?19 /1",
+            "?20 *?20 /1",
+            "?25 *?25 /1",
+            "?26 +0-?28 ",
+            "?27 +0-?28 ",
+            "?29 *?30 /?26 ",
+            "?31 *1/?27 ",
+            "1+0-?32 ",
+            "sqrt(?33 )",
+            "?29 *1/?19 ",
+            "?35 *1/?20 ",
+            "(1+?34 )/?36 ",
+            "(10800000*atan2(?37 ,1))/pi",
+            "?38 +21600000-0",
+            "if(?38 ,?38 ,?39 )",
+            "?40 +0-?3 ",
+            "?41 +21600000-0",
+            "if(?41 ,?41 ,?42 )",
+            "?43 +0-10800000",
+            "?43 +0-21600000",
+            "if(?44 ,?45 ,?43 )",
+            "abs(?46 )",
+            "if(0-$1 ,0,if(?47 -$1 ,$1 ,?47 ))",
+            "?3 +?48 -0",
+            "?15 *sin(pi*(?49 )/10800000)",
+            "?16 *cos(pi*(?49 )/10800000)",
+            "?15 *(cos(atan2(?50 ,?51 )))",
+            "?16 *(sin(atan2(?50 ,?51 )))",
+            "?21 +?52 -0",
+            "?23 +?53 -0",
+            "?10 *sin(pi*(?4 )/10800000)",
+            "?12 *cos(pi*(?4 )/10800000)",
+            "?10 *(cos(atan2(?56 ,?57 )))",
+            "?12 *(sin(atan2(?56 ,?57 )))",
+            "?21 +?58 -0",
+            "?23 +?59 -0",
+            "?7 *cos(pi*(?49 )/10800000)",
+            "?7 *sin(pi*(?49 )/10800000)",
+            "?22 +?62 -0",
+            "?24 +?63 -0",
+            "?7 *cos(pi*(?49 )/10800000)",
+            "?7 *sin(pi*(?49 )/10800000)",
+            "?22 +0-?66 ",
+            "?24 +0-?67 ",
+            "?68 +0-?21 ",
+            "?69 +0-?23 ",
+            "?64 +0-?21 ",
+            "?65 +0-?23 ",
+            "min(?10 ,?12 )",
+            "?70 *?74 /?10 ",
+            "?71 *?74 /?12 ",
+            "?72 *?74 /?10 ",
+            "?73 *?74 /?12 ",
+            "?77 +0-?75 ",
+            "?78 +0-?76 ",
+            "sqrt(?79 *?79 +?80 *?80 +0*0)",
+            "?75 *?78 /1",
+            "?77 *?76 /1",
+            "?82 +0-?83 ",
+            "?74 *?74 /1",
+            "?81 *?81 /1",
+            "?85 *?86 /1",
+            "?84 *?84 /1",
+            "?87 +0-?88 ",
+            "max(?89 ,0)",
+            "sqrt(?90 )",
+            "?80 *-1/1",
+            "if(?92 ,-1,1)",
+            "?93 *?79 /1",
+            "?94 *?91 /1",
+            "?84 *?80 /1",
+            "(?96 +?95 )/?86 ",
+            "?96 +0-?95 ",
+            "?98 *1/?86 ",
+            "abs(?80 )",
+            "?100 *?91 /1",
+            "?84 *?79 /-1",
+            "(?102 +?101 )/?86 ",
+            "?102 +0-?101 ",
+            "?104 *1/?86 ",
+            "?77 +0-?97 ",
+            "?77 +0-?99 ",
+            "?78 +0-?103 ",
+            "?78 +0-?105 ",
+            "sqrt(?106 *?106 +?108 *?108 +0*0)",
+            "sqrt(?107 *?107 +?109 *?109 +0*0)",
+            "?111 +0-?110 ",
+            "if(?112 ,?97 ,?99 )",
+            "if(?112 ,?103 ,?105 )",
+            "?113 *?10 /?74 ",
+            "?114 *?12 /?74 ",
+            "?21 +?115 -0",
+            "?23 +?116 -0",
+            "?70 *?25 /?13 ",
+            "?71 *?25 /?14 ",
+            "?72 *?25 /?13 ",
+            "?73 *?25 /?14 ",
+            "?121 +0-?119 ",
+            "?122 +0-?120 ",
+            "sqrt(?123 *?123 +?124 *?124 +0*0)",
+            "?119 *?122 /1",
+            "?121 *?120 /1",
+            "?126 +0-?127 ",
+            "?25 *?25 /1",
+            "?125 *?125 /1",
+            "?129 *?130 /1",
+            "?128 *?128 /1",
+            "?131 +0-?132 ",
+            "max(?133 ,0)",
+            "sqrt(?134 )",
+            "?93 *?123 /1",
+            "?136 *?135 /1",
+            "?128 *?124 /1",
+            "(?138 +?137 )/?130 ",
+            "?138 +0-?137 ",
+            "?140 *1/?130 ",
+            "abs(?124 )",
+            "?142 *?135 /1",
+            "?128 *?123 /-1",
+            "(?144 +?143 )/?130 ",
+            "?144 +0-?143 ",
+            "?146 *1/?130 ",
+            "?119 +0-?139 ",
+            "?119 +0-?141 ",
+            "?120 +0-?145 ",
+            "?120 +0-?147 ",
+            "sqrt(?148 *?148 +?150 *?150 +0*0)",
+            "sqrt(?149 *?149 +?151 *?151 +0*0)",
+            "?153 +0-?152 ",
+            "if(?154 ,?139 ,?141 )",
+            "if(?154 ,?145 ,?147 )",
+            "?155 *?13 /?25 ",
+            "?156 *?14 /?25 ",
+            "?21 +?157 -0",
+            "?23 +?158 -0",
+            "(10800000*atan2(?158 ,?157 ))/pi",
+            "?161 +21600000-0",
+            "if(?161 ,?161 ,?162 )",
+            "?4 +0-?163 ",
+            "?164 +0-21600000",
+            "if(?164 ,?165 ,?164 )",
+            "?117 +0-?159 ",
+            "?118 +0-?160 ",
+            "sqrt(?167 *?167 +?168 *?168 +0*0)",
+            "?169 *1/2",
+            "?170 +0-?7 ",
+            "if(?171 ,?117 ,?64 )",
+            "if(?171 ,?118 ,?65 )",
+            "if(?171 ,?159 ,?68 )",
+            "if(?171 ,?160 ,?69 )",
+            "(10800000*atan2(?116 ,?115 ))/pi",
+            "?176 +21600000-0",
+            "if(?176 ,?176 ,?177 )",
+            "?178 +0-?4 ",
+            "?179 +21600000-0",
+            "if(?179 ,?179 ,?180 )",
+            "?15 *sin(pi*(?4 )/10800000)",
+            "?16 *cos(pi*(?4 )/10800000)",
+            "?15 *(cos(atan2(?182 ,?183 )))",
+            "?16 *(sin(atan2(?182 ,?183 )))",
+            "?21 +?184 -0",
+            "?23 +?185 -0",
+            "?4 +0-5400000",
+            "?49 +5400000-0",
+            "?49 +10800000-0",
+            "?10 *cos(pi*(2700000)/10800000)",
+            "?12 *sin(pi*(2700000)/10800000)",
+            "?21 +0-?191 ",
+            "?21 +?191 -0",
+            "?23 +0-?192 ",
+            "?23 +?192 -0",
+            "(?4 )/60000.0",
+            "(?181 )/60000.0",
+            "(?163 )/60000.0",
+            "(?166 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (1);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 4
+                    54, 55
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (1);
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    60, 61
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (3);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    117, 118
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RadiusRangeMaximum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
@@ -1211,19 +1309,44 @@ class ShapeCcan : public CustomShapeProvider
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RadiusRangeMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (3);
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    68, 69
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RadiusRangeMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 25000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RadiusRangeMinimum";
+                EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
             }
-            aPropSequenceSequence [0] = aPropSequence;
+            aPropSequenceSequence [3] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -1239,104 +1362,49 @@ class ShapeCcan : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 12
+                    60, 61
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 5
+                    10, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
+                    197, 198
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 14
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    172, 173
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
+                    54, 55
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 16
+                    174, 175
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
+                    159, 160
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
+                    13, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    199, 200
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1347,23 +1415,9 @@ class ShapeCcan : public CustomShapeProvider
             // Command, Count
                 1,1,
                 17,1,
-                2,1,
+                2,4,
                 17,1,
                 4,0,
-                7,0,
-                5,0,
-                1,1,
-                17,2,
-                4,0,
-                20,0,
-                7,0,
-                5,0,
-                1,1,
-                17,2,
-                2,1,
-                17,1,
-                2,1,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -1376,9 +1430,9 @@ class ShapeCcan : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 4
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        193, 195
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1387,7 +1441,7 @@ class ShapeCcan : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        9, 5
+                        194, 196
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -1405,7 +1459,7 @@ class ShapeCcan : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-can"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-circularArrow"));
 
     return aPropertyMap;
   }
@@ -1413,76 +1467,76 @@ class ShapeCcan : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCfoldedCorner : public CustomShapeProvider
+class ShapeCcloud : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 16667);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "?2 *1/5",
-            "logwidth+0-?2 ",
-            "?4 +?3 -0",
-            "logheight+0-?2 ",
-            "?6 +?3 -0",
-            "logheight",
-            "logwidth/2",
+            "logwidth*2977/21600",
+            "logheight*3262/21600",
+            "logwidth*17087/21600",
+            "logheight*17337/21600",
+            "logwidth*67/21600",
+            "logheight*21577/21600",
+            "logwidth*21582/21600",
+            "logheight*1235/21600",
             "logheight/2",
-            "logwidth"
+            "logwidth/2",
+            "(-11429249)/60000.0",
+            "(7426832)/60000.0",
+            "(-8646143)/60000.0",
+            "(5396714)/60000.0",
+            "(-8748475)/60000.0",
+            "(5983381)/60000.0",
+            "(-7859164)/60000.0",
+            "(7034504)/60000.0",
+            "(-4722533)/60000.0",
+            "(6541615)/60000.0",
+            "(-2776035)/60000.0",
+            "(7816140)/60000.0",
+            "(37501)/60000.0",
+            "(6842000)/60000.0",
+            "(1347096)/60000.0",
+            "(6910353)/60000.0",
+            "(3974558)/60000.0",
+            "(4542661)/60000.0",
+            "(-16496525)/60000.0",
+            "(8804134)/60000.0",
+            "(-14809710)/60000.0",
+            "(9151131)/60000.0",
+            "(5204520)/60000.0",
+            "(1585770)/60000.0",
+            "(4416628)/60000.0",
+            "(686848)/60000.0",
+            "(8257449)/60000.0",
+            "(844866)/60000.0",
+            "(387196)/60000.0",
+            "(959901)/60000.0",
+            "(-4217541)/60000.0",
+            "(4255042)/60000.0",
+            "(1819082)/60000.0",
+            "(1665090)/60000.0",
+            "(-824660)/60000.0",
+            "(891534)/60000.0",
+            "(-8950887)/60000.0",
+            "(1091722)/60000.0",
+            "(-9809656)/60000.0",
+            "(1061181)/60000.0",
+            "(-4002417)/60000.0",
+            "(739161)/60000.0",
+            "(9459261)/60000.0",
+            "(711490)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    4, 8
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -1491,89 +1545,289 @@ class ShapeCfoldedCorner : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    3900, 14370
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6753, 9190
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 11
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    11, 0
+                    5333, 7267
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 6
+                    12, 13
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4365, 5945
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 8
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4857, 6595
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    16, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5333, 7273
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 8
+                    18, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6775, 9220
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 7
+                    20, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5785, 7867
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 6
+                    22, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6752, 9215
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 8
+                    24, 25
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    7720, 10543
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 7
+                    26, 27
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4360, 5918
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 6
+                    28, 29
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4345, 5945
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 8
+                    30, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4693, 26177
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4345, 5945
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 33
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    6928, 34899
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4360, 5918
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    34, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    16478, 39090
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6752, 9215
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    36, 37
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    28827, 34751
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6752, 9215
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    38, 39
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    34129, 22954
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5785, 7867
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    40, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    41798, 15354
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5333, 7273
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    42, 43
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    38324, 5426
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4857, 6595
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    44, 45
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    11, 0
+                    29078, 3952
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4857, 6595
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 6
+                    46, 47
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    22141, 4720
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4365, 5945
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    48, 49
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    14000, 5192
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6753, 9190
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    50, 51
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4127, 15789
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6753, 9190
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    52, 53
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1583,34 +1837,64 @@ class ShapeCfoldedCorner : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,4,
+                17,11,
                 4,0,
-                7,0,
                 5,0,
                 1,1,
-                2,2,
-                4,0,
-                19,0,
-                7,0,
-                5,0,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
                 1,1,
-                2,7,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
                 6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (2);
+            {
+                awt::Size aSize;
+                aSize.Width = 43200;
+                aSize.Height = 43200;
+                aSizeSequence [0] = aSize;
+            }
+            {
+                awt::Size aSize;
+                aSize.Width = 43200;
+                aSize.Height = 43200;
+                aSizeSequence [1] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        0, 1
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1619,13 +1903,13 @@ class ShapeCfoldedCorner : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        11, 6
+                        2, 3
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -1637,7 +1921,7 @@ class ShapeCfoldedCorner : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-foldedCorner"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-cloud"));
 
     return aPropertyMap;
   }
@@ -1645,167 +1929,184 @@ class ShapeCfoldedCorner : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCstar32 : public CustomShapeProvider
+class ShapeCcloudCallout : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 37500);
+            Any aAny ((sal_Int32) -20833);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 62500);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "logwidth*$0 /100000",
+            "logheight*$1 /100000",
             "logwidth/2",
-            "?1 *98079/100000",
-            "?1 *92388/100000",
-            "?1 *83147/100000",
-            "?1 *cos(pi*(2700000)/10800000)",
-            "?1 *55557/100000",
-            "?1 *38268/100000",
-            "?1 *19509/100000",
+            "?2 +?0 -0",
             "logheight/2",
-            "?9 *98079/100000",
-            "?9 *92388/100000",
-            "?9 *83147/100000",
-            "?9 *sin(pi*(2700000)/10800000)",
-            "?9 *55557/100000",
-            "?9 *38268/100000",
-            "?9 *19509/100000",
-            "logwidth/2",
-            "?17 +0-?2 ",
-            "?17 +0-?3 ",
-            "?17 +0-?4 ",
-            "?17 +0-?5 ",
-            "?17 +0-?6 ",
-            "?17 +0-?7 ",
-            "?17 +0-?8 ",
-            "?17 +?8 -0",
-            "?17 +?7 -0",
-            "?17 +?6 -0",
-            "?17 +?5 -0",
-            "?17 +?4 -0",
-            "?17 +?3 -0",
-            "?17 +?2 -0",
+            "?4 +?1 -0",
             "logheight/2",
-            "?32 +0-?10 ",
-            "?32 +0-?11 ",
-            "?32 +0-?12 ",
-            "?32 +0-?13 ",
-            "?32 +0-?14 ",
-            "?32 +0-?15 ",
-            "?32 +0-?16 ",
-            "?32 +?16 -0",
-            "?32 +?15 -0",
-            "?32 +?14 -0",
-            "?32 +?13 -0",
-            "?32 +?12 -0",
-            "?32 +?11 -0",
-            "?32 +?10 -0",
-            "?1 *?0 /50000",
-            "?9 *?0 /50000",
-            "?47 *99518/100000",
-            "?47 *95694/100000",
-            "?47 *88192/100000",
-            "?47 *77301/100000",
-            "?47 *63439/100000",
-            "?47 *47140/100000",
-            "?47 *29028/100000",
-            "?47 *9802/100000",
-            "?48 *99518/100000",
-            "?48 *95694/100000",
-            "?48 *88192/100000",
-            "?48 *77301/100000",
-            "?48 *63439/100000",
-            "?48 *47140/100000",
-            "?48 *29028/100000",
-            "?48 *9802/100000",
-            "?17 +0-?49 ",
-            "?17 +0-?50 ",
-            "?17 +0-?51 ",
-            "?17 +0-?52 ",
-            "?17 +0-?53 ",
-            "?17 +0-?54 ",
-            "?17 +0-?55 ",
-            "?17 +0-?56 ",
-            "?17 +?56 -0",
-            "?17 +?55 -0",
-            "?17 +?54 -0",
-            "?17 +?53 -0",
-            "?17 +?52 -0",
-            "?17 +?51 -0",
-            "?17 +?50 -0",
-            "?17 +?49 -0",
-            "?32 +0-?57 ",
-            "?32 +0-?58 ",
-            "?32 +0-?59 ",
-            "?32 +0-?60 ",
-            "?32 +0-?61 ",
-            "?32 +0-?62 ",
-            "?32 +0-?63 ",
-            "?32 +0-?64 ",
-            "?32 +?64 -0",
-            "?32 +?63 -0",
-            "?32 +?62 -0",
-            "?32 +?61 -0",
-            "?32 +?60 -0",
-            "?32 +?59 -0",
-            "?32 +?58 -0",
-            "?32 +?57 -0",
-            "?47 *cos(pi*(2700000)/10800000)",
-            "?48 *sin(pi*(2700000)/10800000)",
-            "?17 +0-?97 ",
-            "?32 +0-?98 ",
-            "?17 +?97 -0",
-            "?32 +?98 -0",
-            "?32 +0-?48 ",
-            "min(logwidth,logheight)/2",
-            "logheight",
-            "logwidth"
+            "?6 *(cos(atan2(?1 ,?0 )))",
+            "logwidth/2",
+            "?8 *(sin(atan2(?1 ,?0 )))",
+            "?8 *(cos(atan2(?9 ,?7 )))",
+            "?6 *(sin(atan2(?9 ,?7 )))",
+            "?2 +?10 -0",
+            "?4 +?11 -0",
+            "?12 +0-?3 ",
+            "?13 +0-?5 ",
+            "sqrt(?14 *?14 +?15 *?15 +0*0)",
+            "min(logwidth,logheight)",
+            "?17 *6600/21600",
+            "?16 +0-?18 ",
+            "?19 *1/3",
+            "?17 *1800/21600",
+            "?20 +?21 -0",
+            "?22 *?14 /?16 ",
+            "?22 *?15 /?16 ",
+            "?23 +?3 -0",
+            "?24 +?5 -0",
+            "?17 *4800/21600",
+            "?20 *2/1",
+            "?27 +?28 -0",
+            "?29 *?14 /?16 ",
+            "?29 *?15 /?16 ",
+            "?30 +?3 -0",
+            "?31 +?5 -0",
+            "?17 *1200/21600",
+            "?17 *600/21600",
+            "?3 +?35 -0",
+            "?25 +?34 -0",
+            "?32 +?21 -0",
+            "logwidth*2977/21600",
+            "logheight*3262/21600",
+            "logwidth*17087/21600",
+            "logheight*17337/21600",
+            "logwidth*67/21600",
+            "logheight*21577/21600",
+            "logwidth*21582/21600",
+            "logheight*1235/21600",
+            "(10800000*atan2(?1 ,?0 ))/pi",
+            "(-11429249)/60000.0",
+            "(7426832)/60000.0",
+            "(-8646143)/60000.0",
+            "(5396714)/60000.0",
+            "(-8748475)/60000.0",
+            "(5983381)/60000.0",
+            "(-7859164)/60000.0",
+            "(7034504)/60000.0",
+            "(-4722533)/60000.0",
+            "(6541615)/60000.0",
+            "(-2776035)/60000.0",
+            "(7816140)/60000.0",
+            "(37501)/60000.0",
+            "(6842000)/60000.0",
+            "(1347096)/60000.0",
+            "(6910353)/60000.0",
+            "(3974558)/60000.0",
+            "(4542661)/60000.0",
+            "(-16496525)/60000.0",
+            "(8804134)/60000.0",
+            "(-14809710)/60000.0",
+            "(9151131)/60000.0",
+            "(0)/60000.0",
+            "(21600000)/60000.0",
+            "(0)/60000.0",
+            "(21600000)/60000.0",
+            "(0)/60000.0",
+            "(21600000)/60000.0",
+            "(5204520)/60000.0",
+            "(1585770)/60000.0",
+            "(4416628)/60000.0",
+            "(686848)/60000.0",
+            "(8257449)/60000.0",
+            "(844866)/60000.0",
+            "(387196)/60000.0",
+            "(959901)/60000.0",
+            "(-4217541)/60000.0",
+            "(4255042)/60000.0",
+            "(1819082)/60000.0",
+            "(1665090)/60000.0",
+            "(-824660)/60000.0",
+            "(891534)/60000.0",
+            "(-8950887)/60000.0",
+            "(1091722)/60000.0",
+            "(-9809656)/60000.0",
+            "(1061181)/60000.0",
+            "(-4002417)/60000.0",
+            "(739161)/60000.0",
+            "(9459261)/60000.0",
+            "(711490)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
         Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 103
+                    3, 5
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 104);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [6].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
@@ -1818,482 +2119,334 @@ class ShapeCstar32 : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    65, 88
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    18, 39
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    66, 87
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 38
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    67, 86
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 37
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    68, 85
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 36
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    69, 84
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3900, 14370
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 35
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6753, 9190
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    70, 83
+                    48, 49
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 34
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5333, 7267
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    71, 82
+                    50, 51
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 33
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4365, 5945
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    72, 81
+                    52, 53
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    17, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    73, 81
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4857, 6595
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 33
+                    54, 55
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    74, 82
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5333, 7273
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 34
+                    56, 57
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    75, 83
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6775, 9220
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 35
+                    58, 59
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    76, 84
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5785, 7867
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 36
+                    60, 61
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    77, 85
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6752, 9215
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 37
+                    62, 63
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    78, 86
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    7720, 10543
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 38
+                    64, 65
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    79, 87
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4360, 5918
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 39
+                    66, 67
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    80, 88
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4345, 5945
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    106, 32
+                    68, 69
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    80, 89
+                    36, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 40
+                    35, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    79, 90
+                    70, 71
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 41
+                    37, 26
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    78, 91
+                    34, 34
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 42
+                    72, 73
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    77, 92
+                    38, 33
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 43
+                    21, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    76, 93
+                    74, 75
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 44
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4693, 26177
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    75, 94
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4345, 5945
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 45
+                    76, 77
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    74, 95
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6928, 34899
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 46
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4360, 5918
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    73, 96
+                    78, 79
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 105
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    16478, 39090
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    72, 96
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6752, 9215
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 46
+                    80, 81
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    71, 95
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    28827, 34751
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 45
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6752, 9215
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    70, 94
+                    82, 83
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 44
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    34129, 22954
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    69, 93
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5785, 7867
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 43
+                    84, 85
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    68, 92
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    41798, 15354
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 42
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5333, 7273
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    67, 91
+                    86, 87
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 41
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    38324, 5426
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    66, 90
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4857, 6595
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 40
+                    88, 89
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    65, 89
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,63,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        99, 100
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        101, 102
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star32"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCflowChartInternalStorage : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "logwidth/2",
-            "logheight/2",
-            "logheight",
-            "logwidth",
-            "logwidth/8",
-            "logheight/8"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (4);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    29078, 3952
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    4857, 6595
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 1
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    90, 91
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
+                    22141, 4720
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    4365, 5945
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 8
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    92, 93
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
+                    14000, 5192
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    8, 1
+                    6753, 9190
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    94, 95
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    4127, 15789
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 1
+                    6753, 9190
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    96, 97
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2303,19 +2456,43 @@ class ShapeCflowChartInternalStorage : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
+                17,11,
                 4,0,
-                7,0,
                 5,0,
                 1,1,
-                2,1,
+                17,1,
+                4,0,
+                5,0,
                 1,1,
-                2,1,
-                6,0,
+                17,1,
+                4,0,
                 5,0,
                 1,1,
-                2,3,
+                17,1,
                 4,0,
+                5,0,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
+                1,1,
+                17,1,
                 6,0,
                 5,0
             };
@@ -2323,25 +2500,37 @@ class ShapeCflowChartInternalStorage : public CustomShapeProvider
         }
         {
             aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (3);
+            Sequence< awt::Size > aSizeSequence (5);
             {
                 awt::Size aSize;
-                aSize.Width = 1;
-                aSize.Height = 1;
+                aSize.Width = 43200;
+                aSize.Height = 43200;
                 aSizeSequence [0] = aSize;
             }
             {
                 awt::Size aSize;
-                aSize.Width = 8;
-                aSize.Height = 8;
+                aSize.Width = 0;
+                aSize.Height = 0;
                 aSizeSequence [1] = aSize;
             }
             {
                 awt::Size aSize;
-                aSize.Width = 1;
-                aSize.Height = 1;
+                aSize.Width = 0;
+                aSize.Height = 0;
                 aSizeSequence [2] = aSize;
             }
+            {
+                awt::Size aSize;
+                aSize.Width = 0;
+                aSize.Height = 0;
+                aSizeSequence [3] = aSize;
+            }
+            {
+                awt::Size aSize;
+                aSize.Width = 43200;
+                aSize.Height = 43200;
+                aSizeSequence [4] = aSize;
+            }
             aPropSequence [2].Value = makeAny (aSizeSequence);
         }
         {
@@ -2354,7 +2543,7 @@ class ShapeCflowChartInternalStorage : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 5
+                        39, 40
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -2363,7 +2552,7 @@ class ShapeCflowChartInternalStorage : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        3, 2
+                        41, 42
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -2381,7 +2570,7 @@ class ShapeCflowChartInternalStorage : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartInternalStorage"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-cloudCallout"));
 
     return aPropertyMap;
   }
@@ -2389,7 +2578,7 @@ class ShapeCflowChartInternalStorage : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCupDownArrow : public CustomShapeProvider
+class ShapeCcorner : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -2412,22 +2601,22 @@ class ShapeCupDownArrow : public CustomShapeProvider
     {
         static const char *aStrings[] = {
             "min(logwidth,logheight)",
-            "50000*logheight/?0 ",
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
-            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "100000*logheight/?0 ",
+            "100000*logwidth/?0 ",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "if(0-$1 ,0,if(?2 -$1 ,$1 ,?2 ))",
+            "?0 *?4 /100000",
             "?0 *?3 /100000",
-            "logheight+0-?4 ",
-            "logwidth*?2 /200000",
-            "logwidth/2",
-            "?7 +0-?6 ",
-            "?7 +?6 -0",
+            "logheight+0-?6 ",
+            "?5 *1/2",
+            "(?7 +logheight)/2",
+            "logwidth+0-logheight",
+            "if(?10 ,?7 ,0)",
+            "if(?10 ,logwidth,?5 )",
+            "logwidth",
             "logwidth/2",
-            "?8 *?4 /?10 ",
-            "?4 +0-?11 ",
-            "?5 +?11 -0",
-            "logheight/2",
             "logheight",
-            "logwidth"
+            "logheight/2"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -2439,22 +2628,22 @@ class ShapeCupDownArrow : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 5
+                    0, 7
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -2462,7 +2651,7 @@ class ShapeCupDownArrow : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -2474,22 +2663,22 @@ class ShapeCupDownArrow : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 2);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -2497,7 +2686,7 @@ class ShapeCupDownArrow : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 1);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -2518,53 +2707,33 @@ class ShapeCupDownArrow : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    7, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 4
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 5
+                    5, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 5
+                    13, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 15
+                    13, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 4
+                    0, 15
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2574,7 +2743,7 @@ class ShapeCupDownArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,9,
+                2,5,
                 4,0,
                 5,0
             };
@@ -2588,9 +2757,9 @@ class ShapeCupDownArrow : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
+                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        8, 12
+                        0, 11
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -2599,7 +2768,7 @@ class ShapeCupDownArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        9, 13
+                        12, 15
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -2617,7 +2786,7 @@ class ShapeCupDownArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-upDownArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-corner"));
 
     return aPropertyMap;
   }
@@ -2625,7 +2794,7 @@ class ShapeCupDownArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCirregularSeal2 : public CustomShapeProvider
+class ShapeCcornerTabs : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -2636,17 +2805,11 @@ class ShapeCirregularSeal2 : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth*9722/21600",
-            "logwidth*5372/21600",
-            "logwidth*11612/21600",
-            "logwidth*14640/21600",
-            "logheight*1887/21600",
-            "logheight*6382/21600",
-            "logheight*12877/21600",
-            "logheight*19712/21600",
-            "logheight*18842/21600",
-            "logheight*15935/21600",
-            "logheight*6645/21600",
+            "sqrt(logwidth*logwidth+logheight*logheight+0*0)",
+            "1*?0 /20",
+            "0+logheight-?1 ",
+            "0+logwidth-?1 ",
+            "logheight",
             "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
@@ -2661,149 +2824,69 @@ class ShapeCirregularSeal2 : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (3);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    11462, 4342
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    14790, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    14525, 5777
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18007, 3172
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    16380, 6532
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    21600, 6645
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    16985, 9402
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18270, 11290
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    16380, 12310
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18877, 15632
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    14640, 14350
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    14942, 17370
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    12180, 15935
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    11612, 18842
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9872, 17370
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8700, 19712
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    7527, 18125
+                    0, 0
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4917, 21600
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4805, 18240
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1285, 17825
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3330, 15370
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    1, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 12877
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 4
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3935, 11592
+                    3, 0
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1172, 8270
+                    5, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5372, 7817
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4502, 3625
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8550, 6382
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 4
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9722, 1887
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 4
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2813,25 +2896,26 @@ class ShapeCirregularSeal2 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,27,
+                2,2,
+                4,0,
+                5,0,
+                1,1,
+                2,2,
+                4,0,
+                5,0,
+                1,1,
+                2,2,
+                4,0,
+                5,0,
+                1,1,
+                2,2,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 21600;
-                aSize.Height = 21600;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -2840,7 +2924,7 @@ class ShapeCirregularSeal2 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        1, 5
+                        1, 1
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -2849,13 +2933,13 @@ class ShapeCirregularSeal2 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        3, 9
+                        3, 2
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -2867,7 +2951,7 @@ class ShapeCirregularSeal2 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-irregularSeal2"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-cornerTabs"));
 
     return aPropertyMap;
   }
@@ -2875,51 +2959,39 @@ class ShapeCirregularSeal2 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCmathEqual : public CustomShapeProvider
+class ShapeCcube : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 23520);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 11760);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(36745-$0 ,$0 ,36745))",
-            "?0 *2/1",
-            "100000+0-2",
-            "if(0-$1 ,0,if(?2 -$1 ,$1 ,?2 ))",
-            "logheight*?0 /100000",
-            "logheight*?3 /200000",
-            "logwidth*73490/200000",
-            "logheight/2",
-            "?7 +0-?5 ",
-            "?7 +?5 -0",
-            "?8 +0-?4 ",
-            "?9 +?4 -0",
-            "logwidth/2",
-            "?12 +0-?6 ",
-            "?12 +?6 -0",
-            "(?10 +?8 )/2",
-            "(?9 +?11 )/2",
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "logheight+0-?2 ",
+            "?3 *1/2",
+            "(?2 +logheight)/2",
+            "logwidth+0-?2 ",
+            "?6 *1/2",
+            "(?2 +logwidth)/2",
+            "logheight",
             "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -2928,14 +3000,14 @@ class ShapeCmathEqual : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 10
+                    0, 2
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 36745);
+                Any aAny ((sal_Int32) 100000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -2955,41 +3027,6 @@ class ShapeCmathEqual : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 8
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -3004,44 +3041,119 @@ class ShapeCmathEqual : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 2
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 10
+                    6, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 10
+                    6, 9
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    6, 2
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 8
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 8
+                    10, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 9
+                    6, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 9
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 11
+                    6, 2
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    0, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 11
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 9
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3053,9 +3165,28 @@ class ShapeCmathEqual : public CustomShapeProvider
                 1,1,
                 2,3,
                 4,0,
+                7,0,
+                5,0,
                 1,1,
                 2,3,
                 4,0,
+                19,0,
+                7,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
+                21,0,
+                7,0,
+                5,0,
+                1,1,
+                2,5,
+                4,0,
+                1,1,
+                2,2,
+                1,1,
+                2,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -3068,9 +3199,120 @@ class ShapeCmathEqual : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        0, 2
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        13, 10
+                        6, 9
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-cube"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCcurvedConnector2 : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+    }
+    {
+        static const char *aStrings[] = {
+            "logwidth",
+            "logheight",
+            "logwidth/2",
+            "logheight/2"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 1
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                3,1,
+                6,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3079,7 +3321,7 @@ class ShapeCmathEqual : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        14, 11
+                        0, 1
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -3097,7 +3339,7 @@ class ShapeCmathEqual : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-mathEqual"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedConnector2"));
 
     return aPropertyMap;
   }
@@ -3105,7 +3347,7 @@ class ShapeCmathEqual : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCstar12 : public CustomShapeProvider
+class ShapeCcurvedConnector3 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -3114,52 +3356,22 @@ class ShapeCstar12 : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 37500);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "logwidth/2",
-            "?1 *cos(pi*(1800000)/10800000)",
-            "logheight/2",
-            "?3 *sin(pi*(3600000)/10800000)",
-            "logwidth/2",
-            "?5 +0-?2 ",
-            "logwidth*3/4",
-            "?5 +?2 -0",
-            "logheight/2",
-            "?9 +0-?4 ",
+            "logwidth*$0 /100000",
+            "(0+?0 )/2",
+            "(logwidth+?0 )/2",
             "logheight*3/4",
-            "?9 +?4 -0",
-            "?1 *?0 /50000",
-            "?3 *?0 /50000",
-            "?13 *cos(pi*(900000)/10800000)",
-            "?13 *cos(pi*(2700000)/10800000)",
-            "?13 *cos(pi*(4500000)/10800000)",
-            "?14 *sin(pi*(4500000)/10800000)",
-            "?14 *sin(pi*(2700000)/10800000)",
-            "?14 *sin(pi*(900000)/10800000)",
-            "?5 +0-?15 ",
-            "?5 +0-?16 ",
-            "?5 +0-?17 ",
-            "?5 +?17 -0",
-            "?5 +?16 -0",
-            "?5 +?15 -0",
-            "?9 +0-?18 ",
-            "?9 +0-?19 ",
-            "?9 +0-?20 ",
-            "?9 +?20 -0",
-            "?9 +?19 -0",
-            "?9 +?18 -0",
-            "?9 +0-?14 ",
-            "logheight/4",
+            "logheight/2",
             "logwidth",
             "logheight",
-            "logwidth/4"
+            "logheight/4"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -3173,28 +3385,28 @@ class ShapeCstar12 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 33
+                    0, 4
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -3215,123 +3427,38 @@ class ShapeCstar12 : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 29
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 34
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    37, 10
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 27
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 27
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 10
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 34
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 29
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    35, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 30
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 11
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 31
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 12
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 32
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 36
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 32
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    37, 12
+                    0, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 31
+                    0, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 11
+                    2, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 30
+                    5, 6
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3341,8 +3468,8 @@ class ShapeCstar12 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,23,
-                4,0,
+                3,2,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -3355,9 +3482,9 @@ class ShapeCstar12 : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        22, 28
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3366,7 +3493,7 @@ class ShapeCstar12 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        25, 31
+                        5, 6
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -3384,7 +3511,7 @@ class ShapeCstar12 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star12"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedConnector3"));
 
     return aPropertyMap;
   }
@@ -3392,126 +3519,45 @@ class ShapeCstar12 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCuturnArrow : public CustomShapeProvider
+class ShapeCcurvedConnector4 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (5);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) 43750);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
-        {
-            Any aAny ((sal_Int32) 75000);
-            aAdjSequence [4].Value = aAny;
-            aAdjSequence [4].Name = "adj5";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$1 ,0,if(25000-$1 ,$1 ,25000))",
-            "?0 *2/1",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "min(logwidth,logheight)",
-            "?2 *?3 /logheight",
-            "100000+0-?4 ",
-            "?5 *logheight/?3 ",
-            "if(0-$2 ,0,if(?6 -$2 ,$2 ,?6 ))",
-            "?7 +?2 -0",
-            "?8 *?3 /logheight",
-            "if(?9 -$4 ,?9 ,if(100000-$4 ,$4 ,100000))",
-            "?3 *?2 /100000",
-            "?3 *?0 /100000",
-            "?11 *1/2",
-            "?12 +0-?13 ",
-            "logheight*?10 /100000",
-            "?3 *?7 /100000",
-            "?15 +0-?16 ",
-            "logwidth+0-?14 ",
-            "?18 *1/2",
-            "min(?19 ,?17 )",
-            "?20 *100000/?3 ",
-            "if(0-$3 ,0,if(?21 -$3 ,$3 ,?21 ))",
-            "?3 *?22 /100000",
-            "?23 +0-?11 ",
-            "max(?24 ,0)",
-            "?11 +?25 -0",
-            "logwidth+0-?12 ",
-            "?27 +0-?12 ",
-            "?28 +?14 -0",
-            "?18 +0-?23 ",
-            "?29 +0-?25 ",
-            "(?11 +?29 )/2",
-            "logheight",
+            "logwidth*$0 /100000",
+            "(0+?0 )/2",
+            "(logwidth+?0 )/2",
+            "(?0 +?2 )/2",
+            "(?2 +logwidth)/2",
+            "logheight*$1 /100000",
+            "(0+?5 )/2",
+            "(0+?6 )/2",
+            "(?6 +?5 )/2",
+            "(logheight+?5 )/2",
             "logwidth",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(-5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(-5400000)/60000.0"
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (5);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 33
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -3520,14 +3566,14 @@ class ShapeCuturnArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 33
+                    0, 6
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 25000);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -3535,87 +3581,17 @@ class ShapeCuturnArrow : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 17
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 6);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    23, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 21);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [3] = aPropSequence;
+            aPropSequenceSequence [0] = aPropSequence;
         }
         {
             Sequence< PropertyValue > aPropSequence (4);
@@ -3625,14 +3601,14 @@ class ShapeCuturnArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    34, 15
+                    2, 5
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -3640,17 +3616,17 @@ class ShapeCuturnArrow : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 9);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 4);
+                Any aAny ((sal_Int32) 1);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [4] = aPropSequence;
+            aPropSequenceSequence [1] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -3667,98 +3643,53 @@ class ShapeCuturnArrow : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 33
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    35, 36
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    30, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    37, 38
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    18, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    34, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 17
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 17
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 26
+                    0, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 25
+                    0, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    39, 40
+                    3, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 11
+                    2, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 25
+                    4, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    41, 42
+                    10, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 33
+                    10, 11
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3768,16 +3699,8 @@ class ShapeCuturnArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,6,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                4,0,
+                3,3,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -3801,7 +3724,7 @@ class ShapeCuturnArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        34, 33
+                        10, 11
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -3819,7 +3742,7 @@ class ShapeCuturnArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-uturnArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedConnector4"));
 
     return aPropertyMap;
   }
@@ -3827,28 +3750,160 @@ class ShapeCuturnArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCsquareTabs : public CustomShapeProvider
+class ShapeCcurvedConnector5 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "sqrt(logwidth*logwidth+logheight*logheight+0*0)",
-            "1*?0 /20",
-            "0+logheight-?1 ",
-            "0+logwidth-?1 ",
-            "logheight",
-            "logwidth"
+            "logwidth*$0 /100000",
+            "logwidth*$2 /100000",
+            "(?0 +?1 )/2",
+            "(0+?0 )/2",
+            "(?0 +?2 )/2",
+            "(?1 +?2 )/2",
+            "(?1 +logwidth)/2",
+            "logheight*$1 /100000",
+            "(0+?7 )/2",
+            "(0+?8 )/2",
+            "(?8 +?7 )/2",
+            "(logheight+?7 )/2",
+            "(?11 +?7 )/2",
+            "(?11 +logheight)/2",
+            "logwidth",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 8
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 7
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    1, 11
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -3869,77 +3924,62 @@ class ShapeCsquareTabs : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    3, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 1
+                    0, 9
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    0, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 2
+                    0, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
+                    4, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    2, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 1
+                    5, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 1
+                    1, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    1, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 2
+                    1, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
+                    6, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 4
+                    14, 15
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3949,20 +3989,8 @@ class ShapeCsquareTabs : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
-                4,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
+                3,4,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -3975,9 +4003,9 @@ class ShapeCsquareTabs : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        1, 1
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3986,7 +4014,7 @@ class ShapeCsquareTabs : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        3, 2
+                        14, 15
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4004,7 +4032,7 @@ class ShapeCsquareTabs : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-squareTabs"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedConnector5"));
 
     return aPropertyMap;
   }
@@ -4012,7 +4040,7 @@ class ShapeCsquareTabs : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCleftRightUpArrow : public CustomShapeProvider
+class ShapeCcurvedDownArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -4026,7 +4054,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
@@ -4039,31 +4067,68 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
-            "?0 *2/1",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "100000+0-?1 ",
-            "?3 *1/2",
-            "if(0-$2 ,0,if(?4 -$2 ,$2 ,?4 ))",
             "min(logwidth,logheight)",
-            "?6 *?5 /100000",
-            "?6 *?0 /100000",
+            "50000*logwidth/?0 ",
+            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "?0 *?3 /100000",
+            "?0 *?2 /100000",
+            "(?4 +?5 )/4",
             "logwidth/2",
-            "?9 +0-?8 ",
-            "?9 +?8 -0",
-            "?6 *?2 /200000",
-            "?9 +0-?12 ",
-            "?9 +?12 -0",
-            "logwidth+0-?7 ",
-            "?6 *?0 /50000",
-            "logheight+0-?16 ",
-            "logheight+0-?8 ",
-            "?18 +0-?12 ",
-            "?18 +?12 -0",
-            "?12 *?7 /?8 ",
-            "logwidth+0-?21 ",
+            "?7 +0-?6 ",
+            "?8 *2/1",
+            "?9 *?9 /1",
+            "?4 *?4 /1",
+            "?10 +0-?11 ",
+            "sqrt(?12 )",
+            "?13 *logheight/?9 ",
+            "100000*?14 /?0 ",
+            "if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))",
+            "?0 *$2 /100000",
+            "?8 +?4 -0",
+            "logheight*logheight/1",
+            "?17 *?17 /1",
+            "?19 +0-?20 ",
+            "sqrt(?21 )",
+            "?22 *?8 /logheight",
+            "?8 +?23 -0",
+            "?18 +?23 -0",
+            "?5 +0-?4 ",
+            "?26 *1/2",
+            "?24 +0-?27 ",
+            "?25 +?27 -0",
+            "?5 *1/2",
+            "logwidth+0-?30 ",
+            "logheight+0-?17 ",
+            "(10800000*atan2(?23 ,?17 ))/pi",
+            "0+0-?33 ",
+            "logheight+0-?14 ",
+            "(?8 +?18 )/2",
+            "?4 *1/2",
+            "(10800000*atan2(?37 ,?14 ))/pi",
+            "16200000+?33 -0",
+            "16200000+0-?38 ",
+            "?38 +0-5400000",
+            "5400000+?38 -0",
+            "logheight",
             "logwidth",
-            "logheight"
+            "logheight",
+            "(?39 )/60000.0",
+            "(?34 )/60000.0",
+            "(16200000)/60000.0",
+            "(?33 )/60000.0",
+            "(?40 )/60000.0",
+            "(?41 )/60000.0",
+            "(10800000)/60000.0",
+            "(?42 )/60000.0",
+            "(?40 )/60000.0",
+            "(?41 )/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(?33 )/60000.0",
+            "(?39 )/60000.0",
+            "(?34 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -4077,7 +4142,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 7
+                    25, 32
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -4086,7 +4151,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::ADJUSTMENT;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -4111,17 +4176,17 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 43
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -4147,14 +4212,14 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 7
+                    44, 32
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 4);
+                Any aAny ((sal_Int32) 15);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -4188,89 +4253,154 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    31, 43
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 45
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    46, 47
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
+                    18, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 18
+                    8, 45
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 17
+                    48, 49
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 19
+                    29, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 19
+                    36, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 7
+                    8, 45
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    50, 51
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 43
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 45
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 7
+                    52, 53
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    36, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 45
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    54, 55
+                },
+                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    9, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 43
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 7
+                    8, 45
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 7
+                    56, 57
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 19
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 45
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 19
+                    58, 59
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 17
+                    29, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 18
+                    31, 43
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 24
+                    28, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 20
+                    24, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 20
+                    8, 45
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 24
+                    60, 61
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4280,8 +4410,31 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,16,
+                2,2,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                2,1,
+                17,1,
                 4,0,
+                19,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                2,4,
+                17,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -4294,9 +4447,9 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        21, 19
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4305,7 +4458,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        22, 20
+                        44, 43
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4323,7 +4476,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftRightUpArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedDownArrow"));
 
     return aPropertyMap;
   }
@@ -4331,16 +4484,16 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCupArrow : public CustomShapeProvider
+class ShapeCcurvedLeftArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
@@ -4349,30 +4502,81 @@ class ShapeCupArrow : public CustomShapeProvider
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
             "min(logwidth,logheight)",
-            "100000*logheight/?0 ",
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "50000*logheight/?0 ",
             "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "if(0-$0 ,0,if(?2 -$0 ,$0 ,?2 ))",
             "?0 *?3 /100000",
-            "0+?4 -0",
-            "logwidth*?2 /200000",
-            "logwidth/2",
+            "?0 *?2 /100000",
+            "(?4 +?5 )/4",
+            "logheight/2",
             "?7 +0-?6 ",
-            "?7 +?6 -0",
-            "logwidth/2",
-            "?8 *?4 /?10 ",
-            "?5 +0-?11 ",
+            "?8 *2/1",
+            "?9 *?9 /1",
+            "?4 *?4 /1",
+            "?10 +0-?11 ",
+            "sqrt(?12 )",
+            "?13 *logwidth/?9 ",
+            "100000*?14 /?0 ",
+            "if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))",
+            "?0 *?16 /100000",
+            "?8 +?4 -0",
+            "logwidth*logwidth/1",
+            "?17 *?17 /1",
+            "?19 +0-?20 ",
+            "sqrt(?21 )",
+            "?22 *?8 /logwidth",
+            "?8 +?23 -0",
+            "?18 +?23 -0",
+            "?5 +0-?4 ",
+            "?26 *1/2",
+            "?24 +0-?27 ",
+            "?25 +?27 -0",
+            "?5 *1/2",
+            "logheight+0-?30 ",
+            "0+?17 -0",
+            "(10800000*atan2(?23 ,?17 ))/pi",
+            "0+0-?33 ",
+            "0+?14 -0",
+            "(?8 +?18 )/2",
+            "?4 *1/2",
+            "(10800000*atan2(?37 ,?14 ))/pi",
+            "?38 +0-?33 ",
+            "?33 +?38 -0",
+            "0+0-?38 ",
+            "logwidth",
             "logheight",
-            "logwidth"
+            "logwidth",
+            "(?33 )/60000.0",
+            "(?39 )/60000.0",
+            "(?41 )/60000.0",
+            "(?40 )/60000.0",
+            "(0)/60000.0",
+            "(-5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(-5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(?33 )/60000.0",
+            "(?33 )/60000.0",
+            "(?39 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -4381,20 +4585,20 @@ class ShapeCupArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 13
+                    32, 24
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
+                Any aAny ((sal_Int32) 2);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -4402,7 +4606,7 @@ class ShapeCupArrow : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -4414,9 +4618,9 @@ class ShapeCupArrow : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 5
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    42, 28
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -4443,145 +4647,6 @@ class ShapeCupArrow : public CustomShapeProvider
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    7, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 13
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 13
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 5
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,6,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        8, 12
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        9, 13
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-upArrow"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeChomePlate : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
-    }
-    {
-        static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "100000*logwidth/?0 ",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "?0 *?2 /100000",
-            "logwidth+0-?3 ",
-            "(?4 +logwidth)/2",
-            "?4 *1/2",
-            "logheight/2",
-            "logheight",
-            "logwidth"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -4589,15 +4654,15 @@ class ShapeChomePlate : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 43
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 15);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -4612,10 +4677,10 @@ class ShapeChomePlate : public CustomShapeProvider
             }
             {
                 aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) 2);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [0] = aPropSequence;
+            aPropSequenceSequence [2] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -4632,185 +4697,148 @@ class ShapeChomePlate : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 31
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 7
+                    32, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 8
+                    44, 8
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,4,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    45, 46
+                },
                 {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    44, 8
+                },
                 {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        5, 8
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-homePlate"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCdodecagon : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "logwidth*2894/21600",
-            "logwidth*7906/21600",
-            "logwidth*13694/21600",
-            "logwidth*18706/21600",
-            "logheight*2894/21600",
-            "logheight*7906/21600",
-            "logheight*13694/21600",
-            "logheight*18706/21600",
-            "logwidth",
-            "logheight"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    47, 48
+                },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 5
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
+                    42, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    44, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    49, 50
+                },
+                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 4
+                    44, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 5
+                    51, 52
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 6
+                    42, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 7
+                    44, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 9
+                    53, 54
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 9
+                    44, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
+                    55, 56
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    42, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    44, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    57, 58
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 6
+                    0, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 24
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    44, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    59, 60
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4820,8 +4848,29 @@ class ShapeCdodecagon : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,11,
+                2,2,
+                17,2,
+                2,1,
                 4,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                2,1,
+                17,1,
+                4,0,
+                19,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                2,4,
+                17,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -4834,9 +4883,9 @@ class ShapeCdodecagon : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        0, 4
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4845,7 +4894,7 @@ class ShapeCdodecagon : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        3, 7
+                        42, 43
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4863,7 +4912,7 @@ class ShapeCdodecagon : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-dodecagon"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedLeftArrow"));
 
     return aPropertyMap;
   }
@@ -4871,21 +4920,21 @@ class ShapeCdodecagon : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCleftArrowCallout : public CustomShapeProvider
+class ShapeCcurvedRightArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
         {
             Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
@@ -4894,11 +4943,6 @@ class ShapeCleftArrowCallout : public CustomShapeProvider
             aAdjSequence [2].Value = aAny;
             aAdjSequence [2].Name = "adj3";
         }
-        {
-            Any aAny ((sal_Int32) 64977);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
@@ -4906,31 +4950,70 @@ class ShapeCleftArrowCallout : public CustomShapeProvider
             "min(logwidth,logheight)",
             "50000*logheight/?0 ",
             "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "?2 *2/1",
-            "if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))",
-            "100000*logwidth/?0 ",
-            "if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))",
-            "?6 *?0 /logwidth",
-            "100000+0-?7 ",
-            "if(0-$3 ,0,if(?8 -$3 ,$3 ,?8 ))",
+            "if(0-$0 ,0,if(?2 -$0 ,$0 ,?2 ))",
+            "?0 *?3 /100000",
             "?0 *?2 /100000",
-            "?0 *?4 /200000",
+            "(?4 +?5 )/4",
             "logheight/2",
-            "?12 +0-?10 ",
-            "?12 +0-?11 ",
-            "?12 +?11 -0",
-            "?12 +?10 -0",
-            "?0 *?6 /100000",
-            "logwidth*?9 /100000",
-            "logwidth+0-?18 ",
-            "(?19 +logwidth)/2",
+            "?7 +0-?6 ",
+            "?8 *2/1",
+            "?9 *?9 /1",
+            "?4 *?4 /1",
+            "?10 +0-?11 ",
+            "sqrt(?12 )",
+            "?13 *logwidth/?9 ",
+            "100000*?14 /?0 ",
+            "if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))",
+            "?0 *?16 /100000",
+            "?8 +?4 -0",
+            "logwidth*logwidth/1",
+            "?17 *?17 /1",
+            "?19 +0-?20 ",
+            "sqrt(?21 )",
+            "?22 *?8 /logwidth",
+            "?8 +?23 -0",
+            "?18 +?23 -0",
+            "?5 +0-?4 ",
+            "?26 *1/2",
+            "?24 +0-?27 ",
+            "?25 +?27 -0",
+            "?5 *1/2",
+            "logheight+0-?30 ",
+            "logwidth+0-?17 ",
+            "(10800000*atan2(?23 ,?17 ))/pi",
+            "10800000+0-?33 ",
+            "0+0-?33 ",
+            "logwidth+0-?14 ",
+            "(?8 +?18 )/2",
+            "?4 *1/2",
+            "(10800000*atan2(?38 ,?14 ))/pi",
+            "?39 +0-5400000",
+            "5400000+?39 -0",
+            "10800000+0-?39 ",
+            "logwidth",
             "logheight",
-            "logwidth"
+            "logwidth",
+            "(10800000)/60000.0",
+            "(?35 )/60000.0",
+            "(?34 )/60000.0",
+            "(?33 )/60000.0",
+            "(16200000)/60000.0",
+            "(?40 )/60000.0",
+            "(?42 )/60000.0",
+            "(?41 )/60000.0",
+            "(10800000)/60000.0",
+            "(?35 )/60000.0",
+            "(?34 )/60000.0",
+            "(?33 )/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(?40 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -4939,14 +5022,14 @@ class ShapeCleftArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 14
+                    32, 24
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 3);
+                Any aAny ((sal_Int32) 2);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -4972,9 +5055,9 @@ class ShapeCleftArrowCallout : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 13
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    43, 28
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -5008,15 +5091,15 @@ class ShapeCleftArrowCallout : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    17, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 44
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 5);
+                Any aAny ((sal_Int32) 15);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -5036,41 +5119,6 @@ class ShapeCleftArrowCallout : public CustomShapeProvider
             }
             aPropSequenceSequence [2] = aPropSequence;
         }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 21
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 8);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [3] = aPropSequence;
-        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -5087,232 +5135,147 @@ class ShapeCleftArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 12
+                    0, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 13
+                    45, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 14
+                    46, 47
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 14
+                    32, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    19, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    43, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 25
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    45, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    48, 49
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    43, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    45, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    50, 51
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    45, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    52, 53
+                },
+                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    22, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 21
+                    45, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 21
+                    54, 55
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 15
+                    32, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 15
+                    43, 31
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 16
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,10,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
+                    32, 29
+                },
                 {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        19, 0
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 25
+                },
                 {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        22, 21
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftArrowCallout"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCchord : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
-        {
-            Any aAny ((sal_Int32) 2700000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 16200000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
-    }
-    {
-        static const char *aStrings[] = {
-            "if(0-$0 ,0,if(21599999-$0 ,$0 ,21599999))",
-            "if(0-$1 ,0,if(21599999-$1 ,$1 ,21599999))",
-            "?1 +0-?0 ",
-            "?2 +21600000-0",
-            "if(?2 ,?2 ,?3 )",
-            "logwidth/2",
-            "?5 *sin(pi*(?0 )/10800000)",
-            "logheight/2",
-            "?7 *cos(pi*(?0 )/10800000)",
-            "?5 *(cos(atan2(?6 ,?8 )))",
-            "?7 *(sin(atan2(?6 ,?8 )))",
-            "?5 *sin(pi*(?1 )/10800000)",
-            "?7 *cos(pi*(?1 )/10800000)",
-            "?5 *(cos(atan2(?11 ,?12 )))",
-            "?7 *(sin(atan2(?11 ,?12 )))",
-            "logwidth/2",
-            "?15 +?9 -0",
-            "logheight/2",
-            "?17 +?10 -0",
-            "?15 +?13 -0",
-            "?17 +?14 -0",
-            "(?16 +?19 )/2",
-            "(?18 +?20 )/2",
-            "?4 *1/2",
-            "?0 +?23 -10800000",
-            "?5 *cos(pi*(2700000)/10800000)",
-            "?7 *sin(pi*(2700000)/10800000)",
-            "?15 +0-?25 ",
-            "?15 +?25 -0",
-            "?17 +0-?26 ",
-            "?17 +?26 -0",
-            "(?0 )/60000.0",
-            "(?4 )/60000.0"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
-        {
-            Sequence< PropertyValue > aPropSequence (1);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    45, 8
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 18
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (1);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+                    56, 57
+                },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    0, 8
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 20
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    45, 8
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 18
+                    58, 59
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 7
+                    43, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 32
+                    45, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    60, 61
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5323,7 +5286,26 @@ class ShapeCchord : public CustomShapeProvider
             // Command, Count
                 1,1,
                 17,1,
+                2,4,
+                17,1,
                 4,0,
+                7,0,
+                5,0,
+                1,1,
+                17,2,
+                4,0,
+                19,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                2,4,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -5336,9 +5318,9 @@ class ShapeCchord : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        27, 29
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -5347,7 +5329,7 @@ class ShapeCchord : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        28, 30
+                        43, 44
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -5365,7 +5347,7 @@ class ShapeCchord : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-chord"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedRightArrow"));
 
     return aPropertyMap;
   }
@@ -5373,75 +5355,101 @@ class ShapeCchord : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCquadArrowCallout : public CustomShapeProvider
+class ShapeCcurvedUpArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
         {
-            Any aAny ((sal_Int32) 18515);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 18515);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
         {
-            Any aAny ((sal_Int32) 18515);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [2].Value = aAny;
             aAdjSequence [2].Name = "adj3";
         }
-        {
-            Any aAny ((sal_Int32) 48123);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
-            "?0 *2/1",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "50000+0-?0 ",
-            "if(0-$2 ,0,if(?3 -$2 ,$2 ,?3 ))",
-            "?4 *2/1",
-            "100000+0-?5 ",
-            "if(?2 -$3 ,?2 ,if(?6 -$3 ,$3 ,?6 ))",
             "min(logwidth,logheight)",
-            "?8 *?0 /100000",
-            "?8 *?2 /200000",
-            "?8 *?4 /100000",
-            "logwidth*?7 /200000",
-            "logheight*?7 /200000",
-            "logwidth+0-?11 ",
+            "50000*logwidth/?0 ",
+            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "?0 *?3 /100000",
+            "?0 *?2 /100000",
+            "(?4 +?5 )/4",
             "logwidth/2",
-            "?15 +0-?12 ",
-            "?15 +?12 -0",
-            "?15 +0-?9 ",
-            "?15 +?9 -0",
-            "?15 +0-?10 ",
-            "?15 +?10 -0",
-            "logheight+0-?11 ",
-            "logheight/2",
-            "?23 +0-?13 ",
-            "?23 +?13 -0",
-            "?23 +0-?9 ",
-            "?23 +?9 -0",
-            "?23 +0-?10 ",
-            "?23 +?10 -0",
+            "?7 +0-?6 ",
+            "?8 *2/1",
+            "?9 *?9 /1",
+            "?4 *?4 /1",
+            "?10 +0-?11 ",
+            "sqrt(?12 )",
+            "?13 *logheight/?9 ",
+            "100000*?14 /?0 ",
+            "if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))",
+            "?0 *$2 /100000",
+            "?8 +?4 -0",
+            "logheight*logheight/1",
+            "?17 *?17 /1",
+            "?19 +0-?20 ",
+            "sqrt(?21 )",
+            "?22 *?8 /logheight",
+            "?8 +?23 -0",
+            "?18 +?23 -0",
+            "?5 +0-?4 ",
+            "?26 *1/2",
+            "?24 +0-?27 ",
+            "?25 +?27 -0",
+            "?5 *1/2",
+            "logwidth+0-?30 ",
+            "0+?17 -0",
+            "(10800000*atan2(?23 ,?17 ))/pi",
+            "0+0-?33 ",
+            "0+?14 -0",
+            "(?8 +?18 )/2",
+            "?4 *1/2",
+            "(10800000*atan2(?37 ,?14 ))/pi",
+            "?38 +0-?33 ",
+            "0+0-?39 ",
+            "5400000+0-?33 ",
+            "?33 +?38 -0",
+            "5400000+0-?38 ",
             "logwidth",
-            "logheight"
+            "logheight",
+            "logheight",
+            "(?41 )/60000.0",
+            "(?42 )/60000.0",
+            "(?43 )/60000.0",
+            "(?39 )/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(-5400000)/60000.0",
+            "(?43 )/60000.0",
+            "(?39 )/60000.0",
+            "(?41 )/60000.0",
+            "(?33 )/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(-5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -5450,14 +5458,14 @@ class ShapeCquadArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 11
+                    25, 32
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 2);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -5485,16 +5493,16 @@ class ShapeCquadArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    18, 0
+                    28, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -5520,14 +5528,14 @@ class ShapeCquadArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 11
+                    44, 32
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 3);
+                Any aAny ((sal_Int32) 15);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -5547,41 +5555,6 @@ class ShapeCquadArrowCallout : public CustomShapeProvider
             }
             aPropSequenceSequence [2] = aPropSequence;
         }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 24
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 6);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [3] = aPropSequence;
-        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -5596,164 +5569,149 @@ class ShapeCquadArrowCallout : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 26
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 28
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    31, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 28
+                    29, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 24
+                    25, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 24
+                    8, 46
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 11
+                    47, 48
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 11
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    15, 0
+                    8, 46
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 11
+                    49, 50
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 11
+                    28, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 24
+                    8, 45
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 24
+                    8, 46
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 28
+                    51, 52
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 28
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 26
+                    8, 46
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 23
+                    53, 54
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 27
+                    36, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 29
+                    8, 46
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 29
+                    55, 56
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 25
+                    28, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 25
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    31, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 22
+                    29, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 22
+                    25, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 31
+                    8, 46
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 22
+                    57, 58
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 22
+                    8, 45
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 25
+                    8, 46
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 25
+                    59, 60
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 29
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 29
+                    8, 46
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 27
+                    61, 62
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5763,8 +5721,29 @@ class ShapeCquadArrowCallout : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,31,
+                2,2,
+                17,2,
+                2,1,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                2,1,
+                17,1,
                 4,0,
+                19,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                2,4,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -5777,9 +5756,9 @@ class ShapeCquadArrowCallout : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        16, 24
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -5788,7 +5767,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        17, 25
+                        44, 45
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -5806,7 +5785,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-quadArrowCallout"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedUpArrow"));
 
     return aPropertyMap;
   }
@@ -5814,32 +5793,41 @@ class ShapeCquadArrowCallout : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCactionButtonBeginning : public CustomShapeProvider
+class ShapeCdecagon : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 105146);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "vf";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "?0 *3/8",
             "logheight/2",
-            "?2 +0-?1 ",
-            "?2 +?1 -0",
+            "?0 *$0 /100000",
             "logwidth/2",
-            "?5 +0-?1 ",
-            "?5 +?1 -0",
-            "?0 *3/4",
-            "?8 *1/8",
-            "?8 *1/4",
-            "?6 +?9 -0",
-            "?6 +?10 -0",
-            "logwidth",
-            "logheight"
+            "?2 *cos(pi*(2160000)/10800000)",
+            "?2 *cos(pi*(4320000)/10800000)",
+            "logwidth/2",
+            "?5 +0-?3 ",
+            "?5 +0-?4 ",
+            "?5 +?4 -0",
+            "?5 +?3 -0",
+            "?1 *sin(pi*(4320000)/10800000)",
+            "?1 *sin(pi*(2160000)/10800000)",
+            "logheight/2",
+            "?12 +0-?10 ",
+            "?12 +0-?11 ",
+            "?12 +?11 -0",
+            "?12 +?10 -0",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -5859,148 +5847,213 @@ class ShapeCactionButtonBeginning : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    13, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 14
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 14
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 4
+                    0, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 2
+                    6, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 3
+                    7, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 4
+                    8, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 3
+                    9, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 3
+                    17, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 4
+                    9, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 4
+                    8, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 2
+                    7, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 3
-                },
+                    6, 15
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,9,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 4
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        6, 14
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 3
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        9, 15
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-decagon"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCdiagStripe : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "logwidth*?0 /100000",
+            "?1 *1/2",
+            "(?1 +logwidth)/2",
+            "logheight*?0 /100000",
+            "?4 *1/2",
+            "(?4 +logheight)/2",
+            "logwidth/2",
+            "logheight/2",
+            "logwidth",
+            "logheight"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 4
-                },
+                    0, 4
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 100000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 4
+                    0, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    13, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 14
+                    9, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 14
+                    0, 10
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6012,35 +6065,6 @@ class ShapeCactionButtonBeginning : public CustomShapeProvider
                 1,1,
                 2,3,
                 4,0,
-                1,1,
-                2,2,
-                4,0,
-                1,1,
-                2,3,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,2,
-                4,0,
-                1,1,
-                2,3,
-                4,0,
-                18,0,
-                7,0,
-                5,0,
-                1,1,
-                2,2,
-                4,0,
-                1,1,
-                2,3,
-                4,0,
-                6,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -6064,7 +6088,7 @@ class ShapeCactionButtonBeginning : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        13, 14
+                        3, 6
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6082,7 +6106,7 @@ class ShapeCactionButtonBeginning : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonBeginning"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-diagStripe"));
 
     return aPropertyMap;
   }
@@ -6090,7 +6114,7 @@ class ShapeCactionButtonBeginning : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCellipse : public CustomShapeProvider
+class ShapeCdiamond : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -6101,26 +6125,14 @@ class ShapeCellipse : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
+            "logwidth*3/4",
+            "logheight*3/4",
             "logwidth/2",
-            "?0 *cos(pi*(2700000)/10800000)",
-            "logheight/2",
-            "?2 *sin(pi*(2700000)/10800000)",
-            "logwidth/2",
-            "?4 +0-?1 ",
-            "?4 +?1 -0",
             "logheight/2",
-            "?7 +0-?3 ",
-            "?7 +?3 -0",
             "logheight",
             "logwidth",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0"
+            "logwidth/4",
+            "logheight/4"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -6141,47 +6153,22 @@ class ShapeCellipse : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    0, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 17
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    5, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 19
+                    2, 4
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6191,7 +6178,7 @@ class ShapeCellipse : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,4,
+                2,3,
                 4,0,
                 5,0
             };
@@ -6207,7 +6194,7 @@ class ShapeCellipse : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        5, 8
+                        6, 7
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6216,7 +6203,7 @@ class ShapeCellipse : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 9
+                        0, 1
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6234,7 +6221,7 @@ class ShapeCellipse : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-ellipse"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-diamond"));
 
     return aPropertyMap;
   }
@@ -6242,7 +6229,7 @@ class ShapeCellipse : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCactionButtonEnd : public CustomShapeProvider
+class ShapeCdodecagon : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -6253,19 +6240,14 @@ class ShapeCactionButtonEnd : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "?0 *3/8",
-            "logheight/2",
-            "?2 +0-?1 ",
-            "?2 +?1 -0",
-            "logwidth/2",
-            "?5 +0-?1 ",
-            "?5 +?1 -0",
-            "?0 *3/4",
-            "?8 *3/4",
-            "?8 *7/8",
-            "?6 +?9 -0",
-            "?6 +?10 -0",
+            "logwidth*2894/21600",
+            "logwidth*7906/21600",
+            "logwidth*13694/21600",
+            "logwidth*18706/21600",
+            "logheight*2894/21600",
+            "logheight*7906/21600",
+            "logheight*13694/21600",
+            "logheight*18706/21600",
             "logwidth",
             "logheight"
         };
@@ -6287,148 +6269,63 @@ class ShapeCactionButtonEnd : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    13, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 14
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 14
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 2
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 3
+                    0, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 4
+                    0, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 4
+                    3, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 3
+                    8, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 3
+                    8, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 3
+                    3, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 4
+                    2, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    13, 0
+                    1, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 14
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 14
+                    0, 6
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6438,37 +6335,8 @@ class ShapeCactionButtonEnd : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
-                4,0,
-                1,1,
-                2,2,
-                4,0,
-                1,1,
-                2,3,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,2,
-                4,0,
-                1,1,
-                2,3,
-                4,0,
-                18,0,
-                7,0,
-                5,0,
-                1,1,
-                2,2,
-                4,0,
-                1,1,
-                2,3,
-                4,0,
-                6,0,
-                5,0,
-                1,1,
-                2,3,
+                2,11,
                 4,0,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -6481,9 +6349,9 @@ class ShapeCactionButtonEnd : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        0, 4
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6492,7 +6360,7 @@ class ShapeCactionButtonEnd : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        13, 14
+                        3, 7
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6510,7 +6378,7 @@ class ShapeCactionButtonEnd : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonEnd"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-dodecagon"));
 
     return aPropertyMap;
   }
@@ -6518,110 +6386,90 @@ class ShapeCactionButtonEnd : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCarc : public CustomShapeProvider
+class ShapeCdonut : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 16200000);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 0);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(21599999-$0 ,$0 ,21599999))",
-            "if(0-$1 ,0,if(21599999-$1 ,$1 ,21599999))",
-            "?1 +0-?0 ",
-            "?2 +21600000-0",
-            "if(?2 ,?2 ,?3 )",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
             "logwidth/2",
-            "?5 *sin(pi*(?0 )/10800000)",
+            "?3 +0-?2 ",
             "logheight/2",
-            "?7 *cos(pi*(?0 )/10800000)",
-            "?5 *(cos(atan2(?6 ,?8 )))",
-            "?7 *(sin(atan2(?6 ,?8 )))",
-            "?5 *sin(pi*(?1 )/10800000)",
-            "?7 *cos(pi*(?1 )/10800000)",
-            "?5 *(cos(atan2(?11 ,?12 )))",
-            "?7 *(sin(atan2(?11 ,?12 )))",
+            "?5 +0-?2 ",
+            "?3 *cos(pi*(2700000)/10800000)",
+            "?5 *sin(pi*(2700000)/10800000)",
             "logwidth/2",
-            "?15 +?9 -0",
+            "?9 +0-?7 ",
+            "?9 +?7 -0",
             "logheight/2",
-            "?17 +?10 -0",
-            "?15 +?13 -0",
-            "?17 +?14 -0",
-            "21600000+0-?0 ",
-            "?4 +0-?21 ",
-            "max(?16 ,?19 )",
-            "if(?22 ,logwidth,?23 )",
-            "5400000+0-?0 ",
-            "27000000+0-?0 ",
-            "if(?25 ,?25 ,?26 )",
-            "?4 +0-?27 ",
-            "max(?18 ,?20 )",
-            "if(?28 ,logheight,?29 )",
-            "10800000+0-?0 ",
-            "32400000+0-?0 ",
-            "if(?31 ,?31 ,?32 )",
-            "?4 +0-?33 ",
-            "min(?16 ,?19 )",
-            "if(?34 ,0,?35 )",
-            "16200000+0-?0 ",
-            "37800000+0-?0 ",
-            "if(?37 ,?37 ,?38 )",
-            "?4 +0-?39 ",
-            "min(?18 ,?20 )",
-            "if(?40 ,0,?41 )",
-            "?0 +0-5400000",
-            "?1 +5400000-0",
-            "(?43 +?44 )/2",
-            "(?0 )/60000.0",
-            "(?4 )/60000.0",
-            "(?0 )/60000.0",
-            "(?4 )/60000.0"
+            "?12 +0-?8 ",
+            "?12 +?8 -0",
+            "logheight",
+            "logwidth",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(-5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(-5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
-            Sequence< PropertyValue > aPropSequence (1);
+            Sequence< PropertyValue > aPropSequence (3);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 18
+                    2, 12
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (1);
             {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 20
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+                aPropSequence [1].Name = "RadiusRangeMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 50000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
             }
-            aPropSequenceSequence [1] = aPropSequence;
+            {
+                aPropSequence [2].Name = "RadiusRangeMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -6637,39 +6485,94 @@ class ShapeCarc : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    0, 12
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 18
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 7
+                    17, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    46, 47
+                    3, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 17
+                    19, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 18
+                    3, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 7
+                    21, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    48, 49
+                    3, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 24
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 12
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 6
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 26
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 6
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 6
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    29, 30
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 6
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    31, 32
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6679,14 +6582,11 @@ class ShapeCarc : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,1,
-                2,1,
+                17,4,
                 4,0,
-                7,0,
-                5,0,
                 1,1,
-                17,1,
-                6,0,
+                17,4,
+                4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -6701,7 +6601,7 @@ class ShapeCarc : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        36, 42
+                        10, 13
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6710,7 +6610,7 @@ class ShapeCarc : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        24, 30
+                        11, 14
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6728,7 +6628,7 @@ class ShapeCarc : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-arc"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-donut"));
 
     return aPropertyMap;
   }
@@ -6736,102 +6636,88 @@ class ShapeCarc : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCstar16 : public CustomShapeProvider
+class ShapeCdoubleWave : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 37500);
+            Any aAny ((sal_Int32) 6250);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 0);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "logwidth/2",
-            "?1 *92388/100000",
-            "?1 *70711/100000",
-            "?1 *38268/100000",
-            "logheight/2",
-            "?5 *92388/100000",
-            "?5 *70711/100000",
-            "?5 *38268/100000",
+            "if(0-$0 ,0,if(12500-$0 ,$0 ,12500))",
+            "if(-10000-$1 ,-10000,if(10000-$1 ,$1 ,10000))",
+            "logheight*?0 /100000",
+            "?2 *10/3",
+            "?2 +0-?3 ",
+            "?2 +?3 -0",
+            "logheight+0-?2 ",
+            "?6 +0-?3 ",
+            "?6 +?3 -0",
+            "logwidth*?1 /100000",
+            "logwidth*?1 /50000",
+            "abs(?9 )",
+            "if(?10 ,0,?10 )",
+            "0+0-?12 ",
+            "if(?10 ,?10 ,0)",
+            "logwidth+0-?14 ",
+            "(?12 +?15 )/6",
+            "?13 +?16 -0",
+            "(?12 +?15 )/3",
+            "?13 +?18 -0",
+            "(?13 +?15 )/2",
+            "?20 +?16 -0",
+            "(?21 +?15 )/2",
+            "0+?14 -0",
+            "logwidth+?12 -0",
+            "?23 +?16 -0",
+            "?23 +?18 -0",
+            "(?23 +?24 )/2",
+            "?27 +?16 -0",
+            "(?28 +?24 )/2",
+            "logwidth+0-?11 ",
             "logwidth/2",
-            "?9 +0-?2 ",
-            "?9 +0-?3 ",
-            "?9 +0-?4 ",
-            "?9 +?4 -0",
-            "?9 +?3 -0",
-            "?9 +?2 -0",
-            "logheight/2",
-            "?16 +0-?6 ",
-            "?16 +0-?7 ",
-            "?16 +0-?8 ",
-            "?16 +?8 -0",
-            "?16 +?7 -0",
-            "?16 +?6 -0",
-            "?1 *?0 /50000",
-            "?5 *?0 /50000",
-            "?23 *98079/100000",
-            "?23 *83147/100000",
-            "?23 *55557/100000",
-            "?23 *19509/100000",
-            "?24 *98079/100000",
-            "?24 *83147/100000",
-            "?24 *55557/100000",
-            "?24 *19509/100000",
-            "?9 +0-?25 ",
-            "?9 +0-?26 ",
-            "?9 +0-?27 ",
-            "?9 +0-?28 ",
-            "?9 +?28 -0",
-            "?9 +?27 -0",
-            "?9 +?26 -0",
-            "?9 +?25 -0",
-            "?16 +0-?29 ",
-            "?16 +0-?30 ",
-            "?16 +0-?31 ",
-            "?16 +0-?32 ",
-            "?16 +?32 -0",
-            "?16 +?31 -0",
-            "?16 +?30 -0",
-            "?16 +?29 -0",
-            "?23 *cos(pi*(2700000)/10800000)",
-            "?24 *sin(pi*(2700000)/10800000)",
-            "?9 +0-?49 ",
-            "?16 +0-?50 ",
-            "?9 +?49 -0",
-            "?16 +?50 -0",
-            "?16 +0-?24 ",
-            "logwidth",
-            "logheight"
+            "?31 +?9 -0",
+            "max(?13 ,?23 )",
+            "min(?15 ,?24 )",
+            "logheight*?0 /50000",
+            "logheight+0-?35 ",
+            "logheight",
+            "logheight/2"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 55
+                    0, 2
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 12500);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -6851,6 +6737,41 @@ class ShapeCstar16 : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 37
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 10000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -10000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -6865,164 +6786,74 @@ class ShapeCstar16 : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 16
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    33, 44
+                    13, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 19
+                    17, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    34, 43
+                    19, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 18
+                    20, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    35, 42
+                    21, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 17
+                    22, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    36, 41
+                    15, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9, 0
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    37, 41
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    38, 42
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    39, 43
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    15, 19
+                    24, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    40, 44
+                    29, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    56, 16
+                    28, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    40, 45
+                    27, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    39, 46
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    38, 47
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    37, 48
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 57
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    36, 48
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    35, 47
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    34, 46
+                    26, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 20
+                    25, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    33, 45
+                    23, 6
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7032,7 +6863,9 @@ class ShapeCstar16 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,31,
+                3,2,
+                2,1,
+                3,2,
                 4,0,
                 5,0
             };
@@ -7048,7 +6881,7 @@ class ShapeCstar16 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        51, 52
+                        33, 35
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7057,7 +6890,7 @@ class ShapeCstar16 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        53, 54
+                        34, 36
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7075,7 +6908,7 @@ class ShapeCstar16 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star16"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-doubleWave"));
 
     return aPropertyMap;
   }
@@ -7083,52 +6916,48 @@ class ShapeCstar16 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCparallelogram : public CustomShapeProvider
+class ShapeCdownArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
             "min(logwidth,logheight)",
-            "100000*logwidth/?0 ",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "?0 *?2 /200000",
-            "?0 *?2 /100000",
-            "logwidth+0-?3 ",
-            "logwidth+0-?4 ",
-            "?6 *1/2",
-            "logwidth+0-?7 ",
+            "100000*logheight/?0 ",
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "?0 *?3 /100000",
+            "logheight+0-?4 ",
+            "logwidth*?2 /200000",
             "logwidth/2",
-            "?9 *?2 /?1 ",
-            "5*?2 /?1 ",
-            "(1+?11 )/12",
-            "?12 *logwidth/1",
-            "?12 *logheight/1",
-            "logwidth+0-?13 ",
-            "logheight+0-?14 ",
+            "?7 +0-?6 ",
+            "?7 +?6 -0",
             "logwidth/2",
-            "logheight*?17 /?4 ",
-            "if(0-?18 ,0,if(logheight-?18 ,?18 ,logheight))",
-            "logheight+0-?19 ",
-            "logheight/2",
+            "?8 *?4 /?10 ",
+            "?5 +?11 -0",
             "logheight",
             "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -7137,16 +6966,16 @@ class ShapeCparallelogram : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    8, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 100000);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -7164,6 +6993,41 @@ class ShapeCparallelogram : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 5
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 1);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -7180,22 +7044,37 @@ class ShapeCparallelogram : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 22
+                    0, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    8, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    23, 0
+                    9, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 22
+                    9, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 13
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7205,7 +7084,7 @@ class ShapeCparallelogram : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
+                2,6,
                 4,0,
                 5,0
             };
@@ -7220,8 +7099,8 @@ class ShapeCparallelogram : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        13, 14
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        8, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7230,7 +7109,7 @@ class ShapeCparallelogram : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        15, 16
+                        9, 12
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7248,7 +7127,7 @@ class ShapeCparallelogram : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-parallelogram"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-downArrow"));
 
     return aPropertyMap;
   }
@@ -7256,37 +7135,66 @@ class ShapeCparallelogram : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCbevel : public CustomShapeProvider
+class ShapeCdownArrowCallout : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
         {
-            Any aAny ((sal_Int32) 12500);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) 64977);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
             "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "logwidth+0-?2 ",
-            "logheight+0-?2 ",
-            "logwidth",
-            "logheight/2",
+            "50000*logwidth/?0 ",
+            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "?2 *2/1",
+            "if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))",
+            "100000*logheight/?0 ",
+            "if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))",
+            "?6 *?0 /logheight",
+            "100000+0-?7 ",
+            "if(0-$3 ,0,if(?8 -$3 ,$3 ,?8 ))",
+            "?0 *?2 /100000",
+            "?0 *?4 /200000",
             "logwidth/2",
-            "logheight"
+            "?12 +0-?10 ",
+            "?12 +0-?11 ",
+            "?12 +?11 -0",
+            "?12 +?10 -0",
+            "?0 *?6 /100000",
+            "logheight+0-?17 ",
+            "logheight*?9 /100000",
+            "?19 *1/2",
+            "logheight",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -7294,17 +7202,17 @@ class ShapeCbevel : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 18
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 3);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -7322,6 +7230,111 @@ class ShapeCbevel : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 21
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 1);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 18
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 5);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 19
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 8);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [3] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -7336,26 +7349,6 @@ class ShapeCbevel : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 4
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
                     0, 0
@@ -7363,157 +7356,204 @@ class ShapeCbevel : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    22, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    22, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 4
+                    15, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 4
+                    15, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    16, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    12, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 4
+                    13, 18
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 4
+                    14, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    14, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                },
+                    0, 19
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,10,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 8
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        22, 19
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-downArrowCallout"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCellipse : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+    }
+    {
+        static const char *aStrings[] = {
+            "logwidth/2",
+            "?0 *cos(pi*(2700000)/10800000)",
+            "logheight/2",
+            "?2 *sin(pi*(2700000)/10800000)",
+            "logwidth/2",
+            "?4 +0-?1 ",
+            "?4 +?1 -0",
+            "logheight/2",
+            "?7 +0-?3 ",
+            "?7 +?3 -0",
+            "logheight",
+            "logwidth",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 4
+                    12, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    16, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 8
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 4
+                    18, 19
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7523,49 +7563,8 @@ class ShapeCbevel : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                21,0,
-                7,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                19,0,
-                7,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                20,0,
-                7,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                18,0,
-                7,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                1,1,
-                2,3,
+                17,4,
                 4,0,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -7580,7 +7579,7 @@ class ShapeCbevel : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        2, 2
+                        5, 8
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7589,7 +7588,7 @@ class ShapeCbevel : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        3, 4
+                        6, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7607,7 +7606,7 @@ class ShapeCbevel : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bevel"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-ellipse"));
 
     return aPropertyMap;
   }
@@ -7615,48 +7614,85 @@ class ShapeCbevel : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCroundRect : public CustomShapeProvider
+class ShapeCellipseRibbon : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
         {
-            Any aAny ((sal_Int32) 16667);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 12500);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "logwidth+0-?2 ",
-            "logheight+0-?2 ",
-            "?2 *29289/100000",
-            "logwidth+0-?5 ",
-            "logheight+0-?5 ",
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "if(25000-$1 ,25000,if(75000-$1 ,$1 ,75000))",
+            "100000+0-?0 ",
+            "?2 *1/2",
+            "?0 +0-?3 ",
+            "max(0,?4 )",
+            "if(?5 -$2 ,?5 ,if(?0 -$2 ,$2 ,?0 ))",
+            "logwidth*?1 /200000",
             "logwidth/2",
-            "logheight/2",
+            "?8 +0-?7 ",
+            "logwidth/8",
+            "?9 +?10 -0",
+            "logwidth+0-?11 ",
+            "logwidth+0-?9 ",
+            "logwidth+0-?10 ",
+            "logheight*?6 /100000",
+            "4*?15 /logwidth",
+            "?11 *?11 /logwidth",
+            "?11 +0-?17 ",
+            "?16 *?18 /1",
+            "?11 *1/2",
+            "?16 *?20 /1",
+            "logwidth+0-?20 ",
+            "logheight*?0 /100000",
+            "?23 +0-?15 ",
+            "?9 *?9 /logwidth",
+            "?9 +0-?25 ",
+            "?16 *?26 /1",
+            "?27 +?24 -0",
+            "?15 +?24 -?28 ",
+            "?29 +?15 -0",
+            "?30 +?24 -0",
+            "logheight+0-?23 ",
+            "?15 *14/16",
+            "(?33 +?32 )/2",
+            "?27 +?32 -0",
+            "?28 +?32 -0",
+            "?9 *1/2",
+            "?16 *?37 /1",
+            "?38 +?32 -0",
+            "logwidth+0-?37 ",
+            "?31 +?32 -0",
+            "?19 +?24 -0",
+            "?23 +?23 -?42 ",
+            "logheight+0-?15 ",
             "logheight",
-            "logwidth",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0"
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -7664,15 +7700,50 @@ class ShapeCroundRect : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 23
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 100000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 45
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 75000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -7680,17 +7751,52 @@ class ShapeCroundRect : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) 25000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 44
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 5);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [0] = aPropSequence;
+            aPropSequenceSequence [2] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -7707,63 +7813,288 @@ class ShapeCroundRect : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    11, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
+                    9, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    46, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    14, 34
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
+                    46, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 4
+                    40, 39
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    13, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 17
+                    13, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 10
+                    8, 41
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    9, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 19
+                    9, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    37, 39
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 34
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 42
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 42
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 43
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 42
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    46, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 34
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    46, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    40, 39
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 36
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 36
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    37, 39
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 34
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 42
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 42
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 19
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7773,14 +8104,53 @@ class ShapeCroundRect : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,1,
+                16,1,
                 2,1,
-                17,1,
+                16,1,
                 2,1,
-                17,1,
+                16,1,
+                2,2,
+                16,1,
                 2,1,
-                17,1,
+                16,1,
+                2,1,
+                16,1,
+                2,1,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,2,
+                16,1,
+                2,2,
+                16,1,
                 4,0,
+                19,0,
+                7,0,
+                5,0,
+                1,1,
+                16,1,
+                2,1,
+                16,1,
+                2,1,
+                16,1,
+                2,2,
+                16,1,
+                2,1,
+                16,1,
+                2,1,
+                16,1,
+                2,1,
+                4,0,
+                1,1,
+                2,1,
+                1,1,
+                2,1,
+                1,1,
+                2,1,
+                1,1,
+                2,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -7795,7 +8165,7 @@ class ShapeCroundRect : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        5, 5
+                        9, 23
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7804,7 +8174,7 @@ class ShapeCroundRect : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 7
+                        13, 36
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7822,7 +8192,7 @@ class ShapeCroundRect : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-roundRect"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-ellipseRibbon"));
 
     return aPropertyMap;
   }
@@ -7830,123 +8200,146 @@ class ShapeCroundRect : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCaccentCallout1 : public CustomShapeProvider
+class ShapeCellipseRibbon2 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
         {
-            Any aAny ((sal_Int32) 18750);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) -8333);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
         {
-            Any aAny ((sal_Int32) 112500);
+            Any aAny ((sal_Int32) 12500);
             aAdjSequence [2].Value = aAny;
             aAdjSequence [2].Name = "adj3";
         }
-        {
-            Any aAny ((sal_Int32) -38333);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logheight*$0 /100000",
-            "logwidth*$1 /100000",
-            "logheight*$2 /100000",
-            "logwidth*$3 /100000",
-            "logwidth",
-            "logheight/2",
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "if(25000-$1 ,25000,if(75000-$1 ,$1 ,75000))",
+            "100000+0-?0 ",
+            "?2 *1/2",
+            "?0 +0-?3 ",
+            "max(0,?4 )",
+            "if(?5 -$2 ,?5 ,if(?0 -$2 ,$2 ,?0 ))",
+            "logwidth*?1 /200000",
             "logwidth/2",
-            "logheight"
+            "?8 +0-?7 ",
+            "logwidth/8",
+            "?9 +?10 -0",
+            "logwidth+0-?11 ",
+            "logwidth+0-?9 ",
+            "logwidth+0-?10 ",
+            "logheight*?6 /100000",
+            "4*?15 /logwidth",
+            "?11 *?11 /logwidth",
+            "?11 +0-?17 ",
+            "?16 *?18 /1",
+            "logheight+0-?19 ",
+            "?11 *1/2",
+            "?16 *?21 /1",
+            "logheight+0-?22 ",
+            "logwidth+0-?21 ",
+            "logheight*?0 /100000",
+            "?25 +0-?15 ",
+            "?9 *?9 /logwidth",
+            "?9 +0-?27 ",
+            "?16 *?28 /1",
+            "?29 +?26 -0",
+            "logheight+0-?30 ",
+            "?15 +?26 -?30 ",
+            "?32 +?15 -0",
+            "?33 +?26 -0",
+            "logheight+0-?34 ",
+            "logheight+0-?25 ",
+            "?15 *14/16",
+            "(?37 +?36 )/2",
+            "logheight+0-?38 ",
+            "?29 +?36 -0",
+            "logheight+0-?40 ",
+            "?30 +?36 -0",
+            "logheight+0-?42 ",
+            "?9 *1/2",
+            "?16 *?44 /1",
+            "?45 +?36 -0",
+            "logheight+0-?46 ",
+            "logwidth+0-?44 ",
+            "?34 +?36 -0",
+            "logheight+0-?49 ",
+            "?19 +?26 -0",
+            "logheight+0-?51 ",
+            "?25 +?25 -?51 ",
+            "logheight+0-?53 ",
+            "logheight",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    8, 36
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 100000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 100000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -7954,38 +8347,52 @@ class ShapeCaccentCallout1 : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 25000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
             }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
             {
-                aPropSequence [4].Name = "RangeYMinimum";
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 15
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [5].Value = makeAny (aAny);
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 5);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [6].Name = "RefY";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 2);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [1] = aPropSequence;
+            aPropSequenceSequence [2] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -8002,43 +8409,293 @@ class ShapeCaccentCallout1 : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 55
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    56, 55
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 39
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    56, 25
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    48, 47
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 43
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 50
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 43
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    44, 47
+                },
+                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 25
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 39
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 52
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 52
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 54
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 52
+                },
+                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 55
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 7
+                    10, 39
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
+                    0, 25
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    44, 47
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 43
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 50
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 43
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    48, 47
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    56, 25
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 39
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    56, 55
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 23
+                },
+                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 55
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 7
+                    9, 31
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    9, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 52
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    12, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 52
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8048,15 +8705,51 @@ class ShapeCaccentCallout1 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
+                16,1,
+                2,1,
+                16,1,
+                2,1,
+                16,1,
+                2,2,
+                16,1,
+                2,1,
+                16,1,
+                2,1,
+                16,1,
+                2,1,
                 4,0,
                 7,0,
                 5,0,
                 1,1,
-                2,1,
-                6,0,
+                2,2,
+                16,1,
+                2,2,
+                16,1,
+                4,0,
+                19,0,
+                7,0,
                 5,0,
                 1,1,
+                2,2,
+                16,1,
+                2,1,
+                16,1,
+                2,1,
+                16,1,
+                2,2,
+                16,1,
+                2,1,
+                16,1,
+                2,1,
+                16,1,
+                4,0,
+                1,1,
+                2,1,
+                1,1,
+                2,1,
+                1,1,
+                2,1,
+                1,1,
                 2,1,
                 6,0,
                 5,0
@@ -8071,9 +8764,9 @@ class ShapeCaccentCallout1 : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        9, 43
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8082,7 +8775,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 7
+                        13, 36
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -8100,7 +8793,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentCallout1"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-ellipseRibbon2"));
 
     return aPropertyMap;
   }
@@ -8108,7 +8801,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartSort : public CustomShapeProvider
+class ShapeCflowChartAlternateProcess : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -8119,14 +8812,24 @@ class ShapeCflowChartSort : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth*3/4",
-            "logheight*3/4",
+            "min(logwidth,logheight)/6",
+            "logwidth+0-?0 ",
+            "logheight+0-?0 ",
+            "?0 *29289/100000",
+            "logwidth+0-?3 ",
+            "logheight+0-?3 ",
             "logwidth/2",
             "logheight/2",
             "logheight",
             "logwidth",
-            "logwidth/4",
-            "logheight/4"
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -8140,59 +8843,69 @@ class ShapeCflowChartSort : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (3);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 11
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
                     1, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 1
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 13
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 1
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 15
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 8
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 1
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    16, 17
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8202,47 +8915,20 @@ class ShapeCflowChartSort : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
+                17,1,
                 2,1,
-                6,0,
-                5,0,
-                1,1,
-                2,3,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
                 4,0,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (3);
-            {
-                awt::Size aSize;
-                aSize.Width = 2;
-                aSize.Height = 2;
-                aSizeSequence [0] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 2;
-                aSize.Height = 2;
-                aSizeSequence [1] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 2;
-                aSize.Height = 2;
-                aSizeSequence [2] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -8251,7 +8937,7 @@ class ShapeCflowChartSort : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 7
+                        3, 3
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8260,13 +8946,13 @@ class ShapeCflowChartSort : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 1
+                        4, 5
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -8278,7 +8964,7 @@ class ShapeCflowChartSort : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartSort"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartAlternateProcess"));
 
     return aPropertyMap;
   }
@@ -8286,92 +8972,29 @@ class ShapeCflowChartSort : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCstar8 : public CustomShapeProvider
+class ShapeCflowChartCollate : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 37500);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "logwidth/2",
-            "?1 *cos(pi*(2700000)/10800000)",
+            "logwidth*3/4",
+            "logheight*3/4",
             "logwidth/2",
-            "?3 +0-?2 ",
-            "?3 +?2 -0",
-            "logheight/2",
-            "?6 *sin(pi*(2700000)/10800000)",
             "logheight/2",
-            "?8 +0-?7 ",
-            "?8 +?7 -0",
-            "?1 *?0 /50000",
-            "?6 *?0 /50000",
-            "?11 *92388/100000",
-            "?11 *38268/100000",
-            "?12 *92388/100000",
-            "?12 *38268/100000",
-            "?3 +0-?13 ",
-            "?3 +0-?14 ",
-            "?3 +?14 -0",
-            "?3 +?13 -0",
-            "?8 +0-?15 ",
-            "?8 +0-?16 ",
-            "?8 +?16 -0",
-            "?8 +?15 -0",
-            "?8 +0-?12 ",
-            "logwidth",
-            "logheight"
+            "logheight",
+            "logwidth/4",
+            "logheight/4"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 25
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -8380,89 +9003,39 @@ class ShapeCstar8 : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    4, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    18, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 10
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 24
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 27
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    18, 24
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    4, 10
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 23
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 1
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8472,14 +9045,25 @@ class ShapeCstar8 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,15,
+                2,5,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 2;
+                aSize.Height = 2;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -8488,7 +9072,7 @@ class ShapeCstar8 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        17, 21
+                        5, 6
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8497,13 +9081,13 @@ class ShapeCstar8 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        20, 24
+                        0, 1
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -8515,7 +9099,7 @@ class ShapeCstar8 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star8"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartCollate"));
 
     return aPropertyMap;
   }
@@ -8523,7 +9107,7 @@ class ShapeCstar8 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartAlternateProcess : public CustomShapeProvider
+class ShapeCflowChartConnector : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -8534,14 +9118,16 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)/6",
-            "logwidth+0-?0 ",
-            "logheight+0-?0 ",
-            "?0 *29289/100000",
-            "logwidth+0-?3 ",
-            "logheight+0-?3 ",
             "logwidth/2",
+            "?0 *cos(pi*(2700000)/10800000)",
+            "logheight/2",
+            "?2 *sin(pi*(2700000)/10800000)",
+            "logwidth/2",
+            "?4 +0-?1 ",
+            "?4 +?1 -0",
             "logheight/2",
+            "?7 +0-?3 ",
+            "?7 +?3 -0",
             "logheight",
             "logwidth",
             "(10800000)/60000.0",
@@ -8572,27 +9158,12 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 11
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 0
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -8602,32 +9173,32 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 2
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 0
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
+                    16, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 0
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 17
+                    18, 19
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8637,13 +9208,7 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
+                17,4,
                 4,0,
                 5,0
             };
@@ -8659,7 +9224,7 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        3, 3
+                        5, 8
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8668,7 +9233,7 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 5
+                        6, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -8686,7 +9251,7 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartAlternateProcess"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartConnector"));
 
     return aPropertyMap;
   }
@@ -8694,108 +9259,30 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCmoon : public CustomShapeProvider
+class ShapeCflowChartDecision : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(87500-$0 ,$0 ,87500))",
-            "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "?2 *logwidth/?1 ",
-            "?1 +0-?2 ",
-            "?2 *?2 /?4 ",
-            "?1 *?1 /?4 ",
-            "?6 *2/1",
-            "?7 +0-?5 ",
-            "?8 +0-?2 ",
-            "?9 *logwidth/?1 ",
-            "?8 *1/2",
-            "?11 +0-?2 ",
-            "logheight/2",
-            "?12 *?13 /?1 ",
+            "logwidth*3/4",
+            "logheight*3/4",
+            "logwidth/2",
             "logheight/2",
-            "?15 +0-?14 ",
-            "?15 +?14 -0",
-            "?2 *9598/32768",
-            "?18 *logwidth/?1 ",
-            "?1 +0-?18 ",
-            "?1 *?1 /1",
-            "?20 *?20 /1",
-            "?21 +0-?22 ",
-            "sqrt(?23 )",
-            "?24 *?13 /?1 ",
-            "?15 +0-?25 ",
-            "?15 +?25 -0",
-            "?10 +0-?3 ",
-            "?28 *1/2",
-            "?3 +?29 -logwidth",
-            "?30 *-1/1",
-            "?13 *-1/1",
-            "(10800000*atan2(?32 ,?31 ))/pi",
-            "(10800000*atan2(?13 ,?31 ))/pi",
-            "?34 +0-21600000",
-            "?35 +0-?33 ",
-            "logwidth",
             "logheight",
             "logwidth",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(?33 )/60000.0",
-            "(?36 )/60000.0"
+            "logwidth/4",
+            "logheight/4"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 15
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 87500);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -8804,34 +9291,29 @@ class ShapeCmoon : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    37, 38
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    39, 13
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    40, 41
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    29, 14
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    42, 43
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 2
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8841,14 +9323,25 @@ class ShapeCmoon : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,2,
+                2,3,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 2;
+                aSize.Height = 2;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -8857,7 +9350,7 @@ class ShapeCmoon : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        19, 26
+                        6, 7
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8866,13 +9359,13 @@ class ShapeCmoon : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        3, 27
+                        0, 1
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -8884,7 +9377,7 @@ class ShapeCmoon : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-moon"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartDecision"));
 
     return aPropertyMap;
   }
@@ -8895,41 +9388,41 @@ class ShapeCmoon : public CustomShapeProvider
 } // anonymous namespace
 void CustomShapeProperties::initializePresetsMap2()
 {
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftRightArrowCallout" ) ] = new ShapeCleftRightArrowCallout();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartManualOperation" ) ] = new ShapeCflowChartManualOperation();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "snipRoundRect" ) ] = new ShapeCsnipRoundRect();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "mathPlus" ) ] = new ShapeCmathPlus();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonForwardNext" ) ] = new ShapeCactionButtonForwardNext();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "can" ) ] = new ShapeCcan();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "foldedCorner" ) ] = new ShapeCfoldedCorner();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star32" ) ] = new ShapeCstar32();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartInternalStorage" ) ] = new ShapeCflowChartInternalStorage();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "upDownArrow" ) ] = new ShapeCupDownArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "irregularSeal2" ) ] = new ShapeCirregularSeal2();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "mathEqual" ) ] = new ShapeCmathEqual();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star12" ) ] = new ShapeCstar12();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "uturnArrow" ) ] = new ShapeCuturnArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "squareTabs" ) ] = new ShapeCsquareTabs();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftRightUpArrow" ) ] = new ShapeCleftRightUpArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "upArrow" ) ] = new ShapeCupArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "homePlate" ) ] = new ShapeChomePlate();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "dodecagon" ) ] = new ShapeCdodecagon();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftArrowCallout" ) ] = new ShapeCleftArrowCallout();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "chartPlus" ) ] = new ShapeCchartPlus();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "chartStar" ) ] = new ShapeCchartStar();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "chartX" ) ] = new ShapeCchartX();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "chevron" ) ] = new ShapeCchevron();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "chord" ) ] = new ShapeCchord();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "quadArrowCallout" ) ] = new ShapeCquadArrowCallout();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonBeginning" ) ] = new ShapeCactionButtonBeginning();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "circularArrow" ) ] = new ShapeCcircularArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "cloud" ) ] = new ShapeCcloud();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "cloudCallout" ) ] = new ShapeCcloudCallout();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "corner" ) ] = new ShapeCcorner();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "cornerTabs" ) ] = new ShapeCcornerTabs();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "cube" ) ] = new ShapeCcube();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedConnector2" ) ] = new ShapeCcurvedConnector2();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedConnector3" ) ] = new ShapeCcurvedConnector3();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedConnector4" ) ] = new ShapeCcurvedConnector4();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedConnector5" ) ] = new ShapeCcurvedConnector5();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedDownArrow" ) ] = new ShapeCcurvedDownArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedLeftArrow" ) ] = new ShapeCcurvedLeftArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedRightArrow" ) ] = new ShapeCcurvedRightArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedUpArrow" ) ] = new ShapeCcurvedUpArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "decagon" ) ] = new ShapeCdecagon();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "diagStripe" ) ] = new ShapeCdiagStripe();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "diamond" ) ] = new ShapeCdiamond();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "dodecagon" ) ] = new ShapeCdodecagon();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "donut" ) ] = new ShapeCdonut();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "doubleWave" ) ] = new ShapeCdoubleWave();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "downArrow" ) ] = new ShapeCdownArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "downArrowCallout" ) ] = new ShapeCdownArrowCallout();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "ellipse" ) ] = new ShapeCellipse();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonEnd" ) ] = new ShapeCactionButtonEnd();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "arc" ) ] = new ShapeCarc();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star16" ) ] = new ShapeCstar16();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "parallelogram" ) ] = new ShapeCparallelogram();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bevel" ) ] = new ShapeCbevel();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "roundRect" ) ] = new ShapeCroundRect();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "accentCallout1" ) ] = new ShapeCaccentCallout1();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartSort" ) ] = new ShapeCflowChartSort();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star8" ) ] = new ShapeCstar8();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "ellipseRibbon" ) ] = new ShapeCellipseRibbon();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "ellipseRibbon2" ) ] = new ShapeCellipseRibbon2();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartAlternateProcess" ) ] = new ShapeCflowChartAlternateProcess();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "moon" ) ] = new ShapeCmoon();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartCollate" ) ] = new ShapeCflowChartCollate();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartConnector" ) ] = new ShapeCflowChartConnector();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartDecision" ) ] = new ShapeCflowChartDecision();
 }
 
 } } // oox // drawingml
diff --git a/oox/source/drawingml/customshapepresets3.cxx b/oox/source/drawingml/customshapepresets3.cxx
index 3973ef126223..8516928edb94 100644
--- a/oox/source/drawingml/customshapepresets3.cxx
+++ b/oox/source/drawingml/customshapepresets3.cxx
@@ -23,92 +23,35 @@ namespace oox { namespace drawingml {
 
 namespace
 {
-class ShapeCstar6 : public CustomShapeProvider
+class ShapeCflowChartDelay : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
-        {
-            Any aAny ((sal_Int32) 28868);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        {
-            Any aAny ((sal_Int32) 115470);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "hf";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
             "logwidth/2",
-            "?1 *$1 /100000",
-            "?2 *cos(pi*(1800000)/10800000)",
-            "logwidth/2",
-            "?4 +0-?3 ",
-            "?4 +?3 -0",
+            "?0 *cos(pi*(2700000)/10800000)",
             "logheight/2",
-            "logheight/4",
-            "?7 +?8 -0",
-            "?2 *?0 /50000",
+            "?2 *sin(pi*(2700000)/10800000)",
+            "logwidth/2",
+            "?4 +?1 -0",
             "logheight/2",
-            "?11 *?0 /50000",
-            "?10 *1/2",
-            "?4 +0-?10 ",
-            "?4 +0-?13 ",
-            "?4 +?13 -0",
-            "?4 +?10 -0",
-            "?12 *sin(pi*(3600000)/10800000)",
-            "?7 +0-?18 ",
-            "?7 +?18 -0",
-            "?7 +0-?12 ",
-            "logheight"
+            "?6 +0-?3 ",
+            "?6 +?3 -0",
+            "logheight",
+            "logwidth",
+            "(16200000)/60000.0",
+            "(10800000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    4, 21
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -122,14 +65,9 @@ class ShapeCstar6 : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    15, 19
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -139,47 +77,17 @@ class ShapeCstar6 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    4, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    15, 20
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 9
+                    11, 12
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 7
+                    0, 9
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -189,7 +97,9 @@ class ShapeCstar6 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,11,
+                2,1,
+                17,1,
+                2,1,
                 4,0,
                 5,0
             };
@@ -203,9 +113,9 @@ class ShapeCstar6 : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
+                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        14, 19
+                        0, 7
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -214,7 +124,7 @@ class ShapeCstar6 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        17, 20
+                        5, 8
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -232,7 +142,7 @@ class ShapeCstar6 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star6"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartDelay"));
 
     return aPropertyMap;
   }
@@ -240,130 +150,30 @@ class ShapeCstar6 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCround2SameRect : public CustomShapeProvider
+class ShapeCflowChartDisplay : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
-        {
-            Any aAny ((sal_Int32) 16667);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 0);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
-            "min(logwidth,logheight)",
-            "?2 *?0 /100000",
-            "logwidth+0-?3 ",
-            "?2 *?1 /100000",
-            "logwidth+0-?5 ",
-            "logheight+0-?5 ",
-            "?3 +0-?5 ",
-            "?3 *29289/100000",
-            "?5 *29289/100000",
-            "if(?8 ,?9 ,?10 )",
-            "logwidth+0-?11 ",
-            "logheight+0-?10 ",
+            "logwidth*5/6",
+            "logwidth/2",
+            "logheight/2",
             "logheight",
             "logwidth",
-            "logheight/2",
-            "logwidth/2",
+            "logwidth/6",
             "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0"
+            "(10800000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 14
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -372,74 +182,39 @@ class ShapeCround2SameRect : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    18, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    15, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 14
+                    0, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 5
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    6, 7
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 25
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 6
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -449,21 +224,27 @@ class ShapeCround2SameRect : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
+                2,2,
                 17,1,
                 2,1,
-                17,1,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 6;
+                aSize.Height = 6;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -471,8 +252,8 @@ class ShapeCround2SameRect : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        11, 9
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        5, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -481,13 +262,13 @@ class ShapeCround2SameRect : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        12, 13
+                        0, 3
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -499,7 +280,7 @@ class ShapeCround2SameRect : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-round2SameRect"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartDisplay"));
 
     return aPropertyMap;
   }
@@ -507,124 +288,27 @@ class ShapeCround2SameRect : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider
+class ShapeCflowChartDocument : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "50000*logwidth/?0 ",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "?0 *?2 /200000",
-            "?0 *?2 /100000",
-            "?0 *?3 /100000",
-            "logwidth+0-?6 ",
-            "(logwidth+?7 )/2",
-            "logwidth/3",
-            "?9 *?2 /?1 ",
-            "max(?2 ,?3 )",
-            "logheight/3",
-            "?12 *?11 /?1 ",
-            "?9 *?3 /?1 ",
-            "logwidth+0-?14 ",
-            "logheight/2",
+            "logheight*17322/21600",
+            "logheight*20172/21600",
             "logwidth/2",
-            "logheight",
+            "logheight/2",
             "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    7, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -633,29 +317,39 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 18
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    21600, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    7, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    21600, 17322
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 18
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10800, 17322
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10800, 23922
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 20172
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -665,23 +359,35 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
+                2,2,
+                3,1,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 21600;
+                aSize.Height = 21600;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        10, 13
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -690,13 +396,13 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        15, 18
+                        4, 0
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -708,7 +414,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-nonIsoscelesTrapezoid"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartDocument"));
 
     return aPropertyMap;
   }
@@ -716,7 +422,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCdiamond : public CustomShapeProvider
+class ShapeCflowChartExtract : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -728,13 +434,10 @@ class ShapeCdiamond : public CustomShapeProvider
     {
         static const char *aStrings[] = {
             "logwidth*3/4",
-            "logheight*3/4",
             "logwidth/2",
-            "logheight/2",
-            "logheight",
-            "logwidth",
             "logwidth/4",
-            "logheight/4"
+            "logheight/2",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -748,29 +451,24 @@ class ShapeCdiamond : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    0, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 3
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 2
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -780,14 +478,25 @@ class ShapeCdiamond : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
+                2,2,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 2;
+                aSize.Height = 2;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -796,7 +505,7 @@ class ShapeCdiamond : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 7
+                        2, 3
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -805,13 +514,13 @@ class ShapeCdiamond : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 1
+                        0, 4
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -823,7 +532,7 @@ class ShapeCdiamond : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-diamond"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartExtract"));
 
     return aPropertyMap;
   }
@@ -831,232 +540,31 @@ class ShapeCdiamond : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcallout2 : public CustomShapeProvider
+class ShapeCflowChartInputOutput : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (6);
-        {
-            Any aAny ((sal_Int32) 18750);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) -8333);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 18750);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) -16667);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
-        {
-            Any aAny ((sal_Int32) 112500);
-            aAdjSequence [4].Value = aAny;
-            aAdjSequence [4].Name = "adj5";
-        }
-        {
-            Any aAny ((sal_Int32) -46667);
-            aAdjSequence [5].Value = aAny;
-            aAdjSequence [5].Name = "adj6";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "logheight*$0 /100000",
-            "logwidth*$1 /100000",
-            "logheight*$2 /100000",
-            "logwidth*$3 /100000",
-            "logheight*$4 /100000",
-            "logwidth*$5 /100000",
-            "logwidth",
-            "logheight/2",
+            "logwidth*2/5",
+            "logwidth*3/5",
+            "logwidth*4/5",
+            "logwidth*9/10",
             "logwidth/2",
-            "logheight"
+            "logwidth/10",
+            "logheight/2",
+            "logheight",
+            "logwidth/5"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
-        {
-            Sequence< PropertyValue > aPropSequence (7);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [6].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (7);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [6].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (7);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 5);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 4);
-                aPropSequence [6].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -1065,44 +573,29 @@ class ShapeCcallout2 : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    0, 5
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    6, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 9
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
                     1, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 5
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1114,26 +607,32 @@ class ShapeCcallout2 : public CustomShapeProvider
                 1,1,
                 2,3,
                 4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,2,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 5;
+                aSize.Height = 5;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
+                        EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        8, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1142,13 +641,13 @@ class ShapeCcallout2 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 9
+                        2, 7
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -1160,7 +659,7 @@ class ShapeCcallout2 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-callout2"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartInputOutput"));
 
     return aPropertyMap;
   }
@@ -1168,191 +667,28 @@ class ShapeCcallout2 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCellipseRibbon : public CustomShapeProvider
+class ShapeCflowChartInternalStorage : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 12500);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
-            "if(25000-$1 ,25000,if(75000-$1 ,$1 ,75000))",
-            "100000+0-?0 ",
-            "?2 *1/2",
-            "?0 +0-?3 ",
-            "max(0,?4 )",
-            "if(?5 -$2 ,?5 ,if(?0 -$2 ,$2 ,?0 ))",
-            "logwidth*?1 /200000",
             "logwidth/2",
-            "?8 +0-?7 ",
-            "logwidth/8",
-            "?9 +?10 -0",
-            "logwidth+0-?11 ",
-            "logwidth+0-?9 ",
-            "logwidth+0-?10 ",
-            "logheight*?6 /100000",
-            "4*?15 /logwidth",
-            "?11 *?11 /logwidth",
-            "?11 +0-?17 ",
-            "?16 *?18 /1",
-            "?11 *1/2",
-            "?16 *?20 /1",
-            "logwidth+0-?20 ",
-            "logheight*?0 /100000",
-            "?23 +0-?15 ",
-            "?9 *?9 /logwidth",
-            "?9 +0-?25 ",
-            "?16 *?26 /1",
-            "?27 +?24 -0",
-            "?15 +?24 -?28 ",
-            "?29 +?15 -0",
-            "?30 +?24 -0",
-            "logheight+0-?23 ",
-            "?15 *14/16",
-            "(?33 +?32 )/2",
-            "?27 +?32 -0",
-            "?28 +?32 -0",
-            "?9 *1/2",
-            "?16 *?37 /1",
-            "?38 +?32 -0",
-            "logwidth+0-?37 ",
-            "?31 +?32 -0",
-            "?19 +?24 -0",
-            "?23 +?23 -?42 ",
-            "logheight+0-?15 ",
+            "logheight/2",
             "logheight",
-            "logwidth"
+            "logwidth",
+            "logwidth/8",
+            "logheight/8"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 23
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 45
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 75000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 25000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 44
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 5);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -1361,7 +697,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
@@ -1371,144 +707,39 @@ class ShapeCellipseRibbon : public CustomShapeProvider
                     0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 31
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    46, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 34
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    46, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    40, 39
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 36
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 41
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 36
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    37, 39
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 34
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 42
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 28
+                    1, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 31
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 28
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 19
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 42
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 8
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 43
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 42
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    8, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
@@ -1516,139 +747,19 @@ class ShapeCellipseRibbon : public CustomShapeProvider
                     0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 31
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    46, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 34
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    46, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    40, 39
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 36
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 41
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 36
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    37, 39
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 34
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 42
+                    1, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 42
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 19
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 1
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1658,59 +769,49 @@ class ShapeCellipseRibbon : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                16,1,
-                2,1,
-                16,1,
-                2,1,
-                16,1,
-                2,2,
-                16,1,
-                2,1,
-                16,1,
-                2,1,
-                16,1,
-                2,1,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,2,
-                16,1,
-                2,2,
-                16,1,
+                2,3,
                 4,0,
-                19,0,
                 7,0,
                 5,0,
                 1,1,
-                16,1,
-                2,1,
-                16,1,
-                2,1,
-                16,1,
-                2,2,
-                16,1,
-                2,1,
-                16,1,
-                2,1,
-                16,1,
-                2,1,
-                4,0,
-                1,1,
-                2,1,
-                1,1,
                 2,1,
                 1,1,
                 2,1,
+                6,0,
+                5,0,
                 1,1,
-                2,1,
+                2,3,
+                4,0,
                 6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (3);
+            {
+                awt::Size aSize;
+                aSize.Width = 1;
+                aSize.Height = 1;
+                aSizeSequence [0] = aSize;
+            }
+            {
+                awt::Size aSize;
+                aSize.Width = 8;
+                aSize.Height = 8;
+                aSizeSequence [1] = aSize;
+            }
+            {
+                awt::Size aSize;
+                aSize.Width = 1;
+                aSize.Height = 1;
+                aSizeSequence [2] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -1719,7 +820,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        9, 23
+                        4, 5
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1728,13 +829,13 @@ class ShapeCellipseRibbon : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        13, 36
+                        3, 2
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -1746,7 +847,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-ellipseRibbon"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartInternalStorage"));
 
     return aPropertyMap;
   }
@@ -1754,93 +855,38 @@ class ShapeCellipseRibbon : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCpie : public CustomShapeProvider
+class ShapeCflowChartMagneticDisk : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
-        {
-            Any aAny ((sal_Int32) 0);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 16200000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(21599999-$0 ,$0 ,21599999))",
-            "if(0-$1 ,0,if(21599999-$1 ,$1 ,21599999))",
-            "?1 +0-?0 ",
-            "?2 +21600000-0",
-            "if(?2 ,?2 ,?3 )",
-            "logwidth/2",
-            "?5 *sin(pi*(?0 )/10800000)",
-            "logheight/2",
-            "?7 *cos(pi*(?0 )/10800000)",
-            "?5 *(cos(atan2(?6 ,?8 )))",
-            "?7 *(sin(atan2(?6 ,?8 )))",
+            "logheight*5/6",
             "logwidth/2",
-            "?11 +?9 -0",
+            "logheight/3",
             "logheight/2",
-            "?13 +?10 -0",
-            "?5 *sin(pi*(?1 )/10800000)",
-            "?7 *cos(pi*(?1 )/10800000)",
-            "?5 *(cos(atan2(?15 ,?16 )))",
-            "?7 *(sin(atan2(?15 ,?16 )))",
-            "?11 +?17 -0",
-            "?13 +?18 -0",
-            "?5 *cos(pi*(2700000)/10800000)",
-            "?7 *sin(pi*(2700000)/10800000)",
-            "?11 +0-?21 ",
-            "?11 +?21 -0",
-            "?13 +0-?22 ",
-            "?13 +?22 -0",
-            "logwidth",
             "logheight",
-            "(?0 )/60000.0",
-            "(?4 )/60000.0"
+            "logwidth",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(10800000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
-        {
-            Sequence< PropertyValue > aPropSequence (1);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 14
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (1);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 20
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -1849,215 +895,84 @@ class ShapeCpie : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 14
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 7
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 30
+                    6, 7
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 13
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                17,1,
-                2,1,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        23, 24
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6, 5
+                },
                 {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        25, 26
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-pie"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCstar4 : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 12500);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
-    }
-    {
-        static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "logwidth/2",
-            "?1 *?0 /50000",
-            "logheight/2",
-            "?3 *?0 /50000",
-            "?2 *cos(pi*(2700000)/10800000)",
-            "?4 *sin(pi*(2700000)/10800000)",
-            "logwidth/2",
-            "?7 +0-?5 ",
-            "?7 +?5 -0",
-            "logheight/2",
-            "?10 +0-?6 ",
-            "?10 +?6 -0",
-            "?10 +0-?4 ",
-            "logheight",
-            "logwidth"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 1
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 13
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
+                    8, 9
+                },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 10
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6, 1
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 11
+                    10, 11
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    7, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 11
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 10
+                    12, 13
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 12
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6, 5
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 14
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 12
+                    14, 15
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2067,23 +982,60 @@ class ShapeCstar4 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,7,
+                17,1,
+                2,1,
+                17,1,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                6,0,
+                5,0,
+                1,1,
+                17,1,
+                2,1,
+                17,1,
                 4,0,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (3);
+            {
+                awt::Size aSize;
+                aSize.Width = 6;
+                aSize.Height = 6;
+                aSizeSequence [0] = aSize;
+            }
+            {
+                awt::Size aSize;
+                aSize.Width = 6;
+                aSize.Height = 6;
+                aSizeSequence [1] = aSize;
+            }
+            {
+                awt::Size aSize;
+                aSize.Width = 6;
+                aSize.Height = 6;
+                aSizeSequence [2] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
+                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        8, 11
+                        0, 2
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -2092,13 +1044,13 @@ class ShapeCstar4 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        9, 12
+                        5, 0
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -2110,7 +1062,7 @@ class ShapeCstar4 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star4"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartMagneticDisk"));
 
     return aPropertyMap;
   }
@@ -2118,7 +1070,7 @@ class ShapeCstar4 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartPredefinedProcess : public CustomShapeProvider
+class ShapeCflowChartMagneticDrum : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -2129,12 +1081,22 @@ class ShapeCflowChartPredefinedProcess : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth*7/8",
+            "logwidth*2/3",
             "logwidth/2",
             "logheight/2",
             "logheight",
             "logwidth",
-            "logwidth/8"
+            "logwidth/6",
+            "(16200000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -2155,62 +1117,87 @@ class ShapeCflowChartPredefinedProcess : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    5, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 1
+                    1, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
+                    1, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    1, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 8
+                    5, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    7, 0
+                    1, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    7, 8
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    5, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    1, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 1
+                    1, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
+                    1, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 15
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2220,18 +1207,22 @@ class ShapeCflowChartPredefinedProcess : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
                 4,0,
                 7,0,
                 5,0,
                 1,1,
-                2,1,
-                1,1,
-                2,1,
+                17,1,
                 6,0,
                 5,0,
                 1,1,
-                2,3,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
                 4,0,
                 6,0,
                 5,0
@@ -2243,20 +1234,20 @@ class ShapeCflowChartPredefinedProcess : public CustomShapeProvider
             Sequence< awt::Size > aSizeSequence (3);
             {
                 awt::Size aSize;
-                aSize.Width = 1;
-                aSize.Height = 1;
+                aSize.Width = 6;
+                aSize.Height = 6;
                 aSizeSequence [0] = aSize;
             }
             {
                 awt::Size aSize;
-                aSize.Width = 8;
-                aSize.Height = 8;
+                aSize.Width = 6;
+                aSize.Height = 6;
                 aSizeSequence [1] = aSize;
             }
             {
                 awt::Size aSize;
-                aSize.Width = 1;
-                aSize.Height = 1;
+                aSize.Width = 6;
+                aSize.Height = 6;
                 aSizeSequence [2] = aSize;
             }
             aPropSequence [2].Value = makeAny (aSizeSequence);
@@ -2298,7 +1289,7 @@ class ShapeCflowChartPredefinedProcess : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartPredefinedProcess"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartMagneticDrum"));
 
     return aPropertyMap;
   }
@@ -2306,7 +1297,7 @@ class ShapeCflowChartPredefinedProcess : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartPunchedTape : public CustomShapeProvider
+class ShapeCflowChartMagneticTape : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -2317,21 +1308,27 @@ class ShapeCflowChartPunchedTape : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logheight*9/10",
-            "logheight*4/5",
             "logwidth/2",
-            "logheight/10",
+            "?0 *cos(pi*(2700000)/10800000)",
             "logheight/2",
+            "?2 *sin(pi*(2700000)/10800000)",
+            "logwidth/2",
+            "?4 +0-?1 ",
+            "?4 +?1 -0",
+            "logheight/2",
+            "?7 +0-?3 ",
+            "?7 +?3 -0",
+            "(10800000*atan2(logheight,logwidth))/pi",
+            "logheight",
             "logwidth",
-            "logheight/5",
-            "(10800000)/60000.0",
-            "(-10800000)/60000.0",
-            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
             "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
             "(0)/60000.0",
-            "(-10800000)/60000.0",
-            "(0)/60000.0",
-            "(10800000)/60000.0"
+            "(?10 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -2345,59 +1342,64 @@ class ShapeCflowChartPunchedTape : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (3);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 11
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
                     0, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 8
+                    0, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 10
+                    0, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20, 18
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 18
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 12
+                    19, 20
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 14
+                    12, 11
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2407,36 +1409,24 @@ class ShapeCflowChartPunchedTape : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,2,
-                2,1,
-                17,2,
+                17,4,
+                2,2,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 20;
-                aSize.Height = 20;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 6
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        5, 8
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -2445,13 +1435,13 @@ class ShapeCflowChartPunchedTape : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        5, 1
+                        6, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -2463,7 +1453,7 @@ class ShapeCflowChartPunchedTape : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartPunchedTape"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartMagneticTape"));
 
     return aPropertyMap;
   }
@@ -2471,7 +1461,7 @@ class ShapeCflowChartPunchedTape : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcurvedConnector2 : public CustomShapeProvider
+class ShapeCflowChartManualInput : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -2482,10 +1472,12 @@ class ShapeCcurvedConnector2 : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth",
-            "logheight",
             "logwidth/2",
-            "logheight/2"
+            "logheight/10",
+            "logheight/2",
+            "logheight",
+            "logwidth",
+            "logheight/5"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -2499,29 +1491,29 @@ class ShapeCcurvedConnector2 : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    0, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 5
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 1
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 5
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2531,14 +1523,25 @@ class ShapeCcurvedConnector2 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                3,1,
-                6,0,
+                2,3,
+                4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 5;
+                aSize.Height = 5;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -2546,8 +1549,8 @@ class ShapeCcurvedConnector2 : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        0, 5
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -2556,13 +1559,13 @@ class ShapeCcurvedConnector2 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 1
+                        4, 3
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -2574,7 +1577,7 @@ class ShapeCcurvedConnector2 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedConnector2"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartManualInput"));
 
     return aPropertyMap;
   }
@@ -2582,68 +1585,29 @@ class ShapeCcurvedConnector2 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCbentConnector3 : public CustomShapeProvider
+class ShapeCflowChartManualOperation : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "logwidth*$0 /100000",
+            "logwidth*4/5",
+            "logwidth*9/10",
+            "logwidth/2",
+            "logwidth/10",
             "logheight/2",
-            "logwidth",
-            "logheight"
+            "logheight",
+            "logwidth/5"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 1
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -2652,7 +1616,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
@@ -2662,19 +1626,19 @@ class ShapeCbentConnector3 : public CustomShapeProvider
                     0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 5
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 3
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 5
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2685,22 +1649,33 @@ class ShapeCbentConnector3 : public CustomShapeProvider
             // Command, Count
                 1,1,
                 2,3,
-                6,0,
+                4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 5;
+                aSize.Height = 5;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
+                        EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        6, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -2709,13 +1684,13 @@ class ShapeCbentConnector3 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        2, 3
+                        0, 5
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -2727,7 +1702,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bentConnector3"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartManualOperation"));
 
     return aPropertyMap;
   }
@@ -2735,7 +1710,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcornerTabs : public CustomShapeProvider
+class ShapeCflowChartMerge : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -2746,12 +1721,11 @@ class ShapeCcornerTabs : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "sqrt(logwidth*logwidth+logheight*logheight+0*0)",
-            "1*?0 /20",
-            "0+logheight-?1 ",
-            "0+logwidth-?1 ",
-            "logheight",
-            "logwidth"
+            "logwidth*3/4",
+            "logwidth/2",
+            "logwidth/4",
+            "logheight/2",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -2765,7 +1739,7 @@ class ShapeCcornerTabs : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
@@ -2775,59 +1749,14 @@ class ShapeCcornerTabs : public CustomShapeProvider
                     0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 1
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 4
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
+                    2, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 4
+                    1, 2
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2839,24 +1768,23 @@ class ShapeCcornerTabs : public CustomShapeProvider
                 1,1,
                 2,2,
                 4,0,
-                5,0,
-                1,1,
-                2,2,
-                4,0,
-                5,0,
-                1,1,
-                2,2,
-                4,0,
-                5,0,
-                1,1,
-                2,2,
-                4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 2;
+                aSize.Height = 2;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -2864,8 +1792,8 @@ class ShapeCcornerTabs : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        1, 1
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        2, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -2874,13 +1802,13 @@ class ShapeCcornerTabs : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        3, 2
+                        0, 3
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -2892,7 +1820,7 @@ class ShapeCcornerTabs : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-cornerTabs"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartMerge"));
 
     return aPropertyMap;
   }
@@ -2900,93 +1828,29 @@ class ShapeCcornerTabs : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeChexagon : public CustomShapeProvider
+class ShapeCflowChartMultidocument : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        {
-            Any aAny ((sal_Int32) 115470);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "vf";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "50000*logwidth/?0 ",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "logheight/2",
-            "?3 *$1 /100000",
-            "?0 *?2 /100000",
-            "logwidth+0-?5 ",
-            "?4 *sin(pi*(3600000)/10800000)",
+            "logheight*3675/21600",
+            "logheight*20782/21600",
+            "logwidth*9298/21600",
+            "logwidth*12286/21600",
+            "logwidth*18595/21600",
             "logheight/2",
-            "?8 +0-?7 ",
-            "?8 +?7 -0",
-            "?1 *-1/2",
-            "?2 +?11 -0",
-            "if(?12 ,4,2)",
-            "if(?12 ,3,2)",
-            "if(?12 ,?11 ,0)",
-            "(?2 +?15 )/?11 ",
-            "?16 *?14 /-1",
-            "?13 +?17 -0",
-            "logwidth*?18 /24",
-            "logheight*?18 /24",
-            "logwidth+0-?19 ",
-            "logheight+0-?20 ",
             "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -2995,39 +1859,309 @@ class ShapeChexagon : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 20782
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 9
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9298, 23542
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 9
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9298, 18022
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 8
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18595, 18022
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 10
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18595, 3675
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 10
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 3675
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1532, 3675
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1532, 1815
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20000, 1815
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20000, 16252
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    19298, 16252
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18595, 16352
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18595, 16352
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18595, 3675
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2972, 1815
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2972, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    21600, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    21600, 14392
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20800, 14392
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20000, 14467
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20000, 14467
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20000, 1815
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 3675
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18595, 3675
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18595, 18022
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9298, 18022
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9298, 23542
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 20782
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1532, 3675
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1532, 1815
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20000, 1815
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20000, 16252
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    19298, 16252
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18595, 16352
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18595, 16352
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2972, 1815
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2972, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    21600, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    21600, 14392
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20800, 14392
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20000, 14467
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20000, 14467
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 20782
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9298, 23542
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9298, 18022
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18595, 18022
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18595, 16352
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18595, 16352
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    19298, 16252
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20000, 16252
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20000, 14467
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20000, 14467
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    20800, 14392
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    21600, 14392
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    21600, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2972, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2972, 1815
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1532, 1815
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1532, 3675
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 3675
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3037,23 +2171,81 @@ class ShapeChexagon : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,5,
+                3,1,
+                2,2,
+                4,0,
+                1,1,
+                2,3,
+                3,1,
+                2,1,
+                4,0,
+                1,1,
+                2,3,
+                3,1,
+                2,1,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,2,
+                3,1,
                 4,0,
+                1,1,
+                2,3,
+                3,1,
+                1,1,
+                2,3,
+                3,1,
+                6,0,
+                5,0,
+                1,1,
+                3,1,
+                2,1,
+                3,1,
+                2,1,
+                3,1,
+                2,6,
+                4,0,
+                6,0,
+                7,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (3);
+            {
+                awt::Size aSize;
+                aSize.Width = 21600;
+                aSize.Height = 21600;
+                aSizeSequence [0] = aSize;
+            }
+            {
+                awt::Size aSize;
+                aSize.Width = 21600;
+                aSize.Height = 21600;
+                aSizeSequence [1] = aSize;
+            }
+            {
+                awt::Size aSize;
+                aSize.Width = 21600;
+                aSize.Height = 21600;
+                aSizeSequence [2] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
+                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        19, 20
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3062,13 +2254,13 @@ class ShapeChexagon : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        21, 22
+                        4, 1
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -3080,7 +2272,7 @@ class ShapeChexagon : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-hexagon"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartMultidocument"));
 
     return aPropertyMap;
   }
@@ -3088,7 +2280,7 @@ class ShapeChexagon : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartConnector : public CustomShapeProvider
+class ShapeCflowChartOfflineStorage : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -3099,26 +2291,11 @@ class ShapeCflowChartConnector : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth/2",
-            "?0 *cos(pi*(2700000)/10800000)",
+            "logwidth*3/4",
             "logheight/2",
-            "?2 *sin(pi*(2700000)/10800000)",
             "logwidth/2",
-            "?4 +0-?1 ",
-            "?4 +?1 -0",
-            "logheight/2",
-            "?7 +0-?3 ",
-            "?7 +?3 -0",
             "logheight",
-            "logwidth",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0"
+            "logwidth/4"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -3132,54 +2309,49 @@ class ShapeCflowChartConnector : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 4
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 4
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 17
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    18, 19
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 2
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3189,14 +2361,47 @@ class ShapeCflowChartConnector : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,4,
+                2,2,
                 4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,1,
+                6,0,
+                5,0,
+                1,1,
+                2,2,
+                4,0,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (3);
+            {
+                awt::Size aSize;
+                aSize.Width = 2;
+                aSize.Height = 2;
+                aSizeSequence [0] = aSize;
+            }
+            {
+                awt::Size aSize;
+                aSize.Width = 5;
+                aSize.Height = 5;
+                aSizeSequence [1] = aSize;
+            }
+            {
+                awt::Size aSize;
+                aSize.Width = 2;
+                aSize.Height = 2;
+                aSizeSequence [2] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -3204,8 +2409,8 @@ class ShapeCflowChartConnector : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        5, 8
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        4, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3214,13 +2419,13 @@ class ShapeCflowChartConnector : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 9
+                        0, 1
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -3232,7 +2437,7 @@ class ShapeCflowChartConnector : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartConnector"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartOfflineStorage"));
 
     return aPropertyMap;
   }
@@ -3240,7 +2445,7 @@ class ShapeCflowChartConnector : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartMagneticDisk : public CustomShapeProvider
+class ShapeCflowChartOffpageConnector : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -3251,22 +2456,11 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logheight*5/6",
+            "logheight*4/5",
             "logwidth/2",
-            "logheight/3",
             "logheight/2",
             "logheight",
-            "logwidth",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(10800000)/60000.0"
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -3287,77 +2481,27 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 11
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
+                    10, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
+                    10, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    6, 5
+                    5, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
+                    0, 8
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3367,47 +2511,21 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,1,
-                2,1,
-                17,1,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                17,1,
-                6,0,
-                5,0,
-                1,1,
-                17,1,
-                2,1,
-                17,1,
+                2,4,
                 4,0,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
             aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (3);
+            Sequence< awt::Size > aSizeSequence (1);
             {
                 awt::Size aSize;
-                aSize.Width = 6;
-                aSize.Height = 6;
+                aSize.Width = 10;
+                aSize.Height = 10;
                 aSizeSequence [0] = aSize;
             }
-            {
-                awt::Size aSize;
-                aSize.Width = 6;
-                aSize.Height = 6;
-                aSizeSequence [1] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 6;
-                aSize.Height = 6;
-                aSizeSequence [2] = aSize;
-            }
             aPropSequence [2].Value = makeAny (aSizeSequence);
         }
         {
@@ -3419,8 +2537,8 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        0, 2
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3429,7 +2547,7 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        5, 0
+                        4, 0
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -3447,7 +2565,7 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartMagneticDisk"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartOffpageConnector"));
 
     return aPropertyMap;
   }
@@ -3455,7 +2573,7 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCheart : public CustomShapeProvider
+class ShapeCflowChartOnlineStorage : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -3466,20 +2584,15 @@ class ShapeCheart : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth*49/48",
-            "logwidth*10/48",
-            "logwidth/2",
-            "?2 +0-?0 ",
-            "?2 +0-?1 ",
-            "?2 +?1 -0",
-            "?2 +?0 -0",
-            "logheight/3",
-            "0+0-?7 ",
-            "logwidth*1/6",
             "logwidth*5/6",
-            "logheight*2/3",
-            "logheight/4",
-            "logheight"
+            "logwidth/2",
+            "logheight/2",
+            "logheight",
+            "logwidth/6",
+            "(16200000)/60000.0",
+            "(-10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -3493,44 +2606,44 @@ class ShapeCheart : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 12
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 8
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 12
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 13
+                    5, 6
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 12
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 6
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    4, 8
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 12
+                    7, 8
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3540,14 +2653,28 @@ class ShapeCheart : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                3,2,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 6;
+                aSize.Height = 6;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -3555,8 +2682,8 @@ class ShapeCheart : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        9, 12
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        4, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3565,13 +2692,13 @@ class ShapeCheart : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        10, 11
+                        0, 3
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -3583,7 +2710,7 @@ class ShapeCheart : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-heart"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartOnlineStorage"));
 
     return aPropertyMap;
   }
@@ -3591,162 +2718,50 @@ class ShapeCheart : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCribbon2 : public CustomShapeProvider
+class ShapeCflowChartOr : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
-        {
-            Any aAny ((sal_Int32) 16667);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(33333-$0 ,$0 ,33333))",
-            "if(25000-$1 ,25000,if(75000-$1 ,$1 ,75000))",
-            "logwidth/8",
-            "logwidth+0-?2 ",
-            "logwidth*?1 /200000",
             "logwidth/2",
-            "?5 +0-?4 ",
-            "?5 +?4 -0",
-            "logwidth/32",
-            "?6 +?8 -0",
-            "?7 +0-?8 ",
-            "?6 +?2 -0",
-            "?7 +0-?2 ",
-            "?11 +0-?8 ",
-            "?12 +?8 -0",
-            "logheight*?0 /200000",
-            "logheight+0-?15 ",
-            "logheight*?0 /100000",
-            "logheight+0-?17 ",
-            "0+?17 -0",
-            "(?19 +logheight)/2",
-            "logheight*?0 /400000",
-            "logheight+0-?21 ",
-            "?16 +0-?21 ",
+            "?0 *cos(pi*(2700000)/10800000)",
+            "logheight/2",
+            "?2 *sin(pi*(2700000)/10800000)",
+            "logwidth/2",
+            "?4 +0-?1 ",
+            "?4 +?1 -0",
+            "logheight/2",
+            "?7 +0-?3 ",
+            "?7 +?3 -0",
             "logheight",
-            "(5400000)/60000.0",
-            "(-10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(-10800000)/60000.0",
             "logwidth",
-            "(0)/60000.0",
-            "(-5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
             "(16200000)/60000.0",
-            "(-5400000)/60000.0",
+            "(5400000)/60000.0",
             "(0)/60000.0",
-            "(-5400000)/60000.0",
             "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
             "(5400000)/60000.0",
             "(5400000)/60000.0",
-            "(-10800000)/60000.0",
             "(10800000)/60000.0",
             "(5400000)/60000.0",
             "(16200000)/60000.0",
             "(5400000)/60000.0",
+            "(0)/60000.0",
             "(5400000)/60000.0",
-            "(10800000)/60000.0",
             "(5400000)/60000.0",
-            "(-10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(-10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0"
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 18
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 33333);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 24
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 75000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 25000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -3762,377 +2777,112 @@ class ShapeCribbon2 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    29, 30
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    31, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    33, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    33, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    34, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    36, 37
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    38, 39
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    40, 41
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 18
+                    12, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 22
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    42, 43
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 16
+                    16, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    44, 45
+                    18, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 18
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 24
+                    4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 20
+                    4, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    46, 47
+                    11, 7
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    48, 49
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    33, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    33, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    50, 51
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    52, 53
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    54, 55
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    56, 57
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 18
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 22
+                    20, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 22
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 18
+                    22, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 23
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 19
+                    24, 25
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 19
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 23
+                    26, 27
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4142,59 +2892,19 @@ class ShapeCribbon2 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,5,
-                17,1,
-                2,1,
-                17,1,
-                2,3,
+                17,4,
                 4,0,
                 7,0,
                 5,0,
                 1,1,
-                17,1,
-                2,1,
-                17,1,
                 2,1,
-                4,0,
                 1,1,
-                17,1,
                 2,1,
-                17,1,
-                2,1,
-                4,0,
-                19,0,
-                7,0,
+                6,0,
                 5,0,
                 1,1,
-                2,4,
-                17,1,
-                2,1,
-                17,1,
-                2,6,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
+                17,4,
                 4,0,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
                 6,0,
                 5,0
             };
@@ -4209,8 +2919,8 @@ class ShapeCribbon2 : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        6, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        5, 8
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4219,7 +2929,7 @@ class ShapeCribbon2 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        7, 18
+                        6, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4237,7 +2947,7 @@ class ShapeCribbon2 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-ribbon2"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartOr"));
 
     return aPropertyMap;
   }
@@ -4245,113 +2955,28 @@ class ShapeCribbon2 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCbracePair : public CustomShapeProvider
+class ShapeCflowChartPredefinedProcess : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 8333);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(25000-$0 ,$0 ,25000))",
-            "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "?1 *?0 /50000",
-            "logwidth+0-?3 ",
-            "logwidth+0-?2 ",
-            "logheight/2",
-            "?6 +0-?2 ",
-            "?6 +?2 -0",
-            "logheight+0-?2 ",
-            "?2 *29289/100000",
-            "?2 +?10 -0",
-            "logwidth+0-?11 ",
-            "logheight+0-?10 ",
+            "logwidth*7/8",
             "logwidth/2",
+            "logheight/2",
             "logheight",
             "logwidth",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(-5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(-5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(-5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(-5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(-5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(-5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0"
+            "logwidth/8"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 25000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -4360,229 +2985,69 @@ class ShapeCbracePair : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    29, 30
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    31, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    33, 34
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    35, 36
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    37, 38
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    39, 40
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    41, 42
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 7
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 8
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    43, 44
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    7, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    7, 8
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    45, 46
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 9
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    47, 48
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 1
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4592,39 +3057,49 @@ class ShapeCbracePair : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,1,
-                2,1,
-                17,2,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,2,
-                2,1,
-                17,1,
+                2,3,
                 4,0,
                 7,0,
                 5,0,
                 1,1,
-                17,1,
                 2,1,
-                17,2,
-                2,1,
-                17,1,
                 1,1,
-                17,1,
-                2,1,
-                17,2,
                 2,1,
-                17,1,
+                6,0,
+                5,0,
+                1,1,
+                2,3,
+                4,0,
                 6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (3);
+            {
+                awt::Size aSize;
+                aSize.Width = 1;
+                aSize.Height = 1;
+                aSizeSequence [0] = aSize;
+            }
+            {
+                awt::Size aSize;
+                aSize.Width = 8;
+                aSize.Height = 8;
+                aSizeSequence [1] = aSize;
+            }
+            {
+                awt::Size aSize;
+                aSize.Width = 1;
+                aSize.Height = 1;
+                aSizeSequence [2] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -4632,8 +3107,8 @@ class ShapeCbracePair : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        11, 11
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        5, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4642,13 +3117,13 @@ class ShapeCbracePair : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        12, 13
+                        0, 3
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -4660,7 +3135,7 @@ class ShapeCbracePair : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bracePair"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartPredefinedProcess"));
 
     return aPropertyMap;
   }
@@ -4668,7 +3143,7 @@ class ShapeCbracePair : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartExtract : public CustomShapeProvider
+class ShapeCflowChartPreparation : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -4679,11 +3154,12 @@ class ShapeCflowChartExtract : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth*3/4",
+            "logwidth*4/5",
             "logwidth/2",
-            "logwidth/4",
             "logheight/2",
-            "logheight"
+            "logheight",
+            "logwidth",
+            "logwidth/5"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -4704,17 +3180,32 @@ class ShapeCflowChartExtract : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 2
+                    0, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    2, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    2, 2
+                    8, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    8, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 10
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4724,7 +3215,7 @@ class ShapeCflowChartExtract : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,2,
+                2,5,
                 4,0,
                 5,0
             };
@@ -4735,8 +3226,8 @@ class ShapeCflowChartExtract : public CustomShapeProvider
             Sequence< awt::Size > aSizeSequence (1);
             {
                 awt::Size aSize;
-                aSize.Width = 2;
-                aSize.Height = 2;
+                aSize.Width = 10;
+                aSize.Height = 10;
                 aSizeSequence [0] = aSize;
             }
             aPropSequence [2].Value = makeAny (aSizeSequence);
@@ -4750,8 +3241,8 @@ class ShapeCflowChartExtract : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        2, 3
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        5, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4760,7 +3251,7 @@ class ShapeCflowChartExtract : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 4
+                        0, 3
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4778,7 +3269,7 @@ class ShapeCflowChartExtract : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartExtract"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartPreparation"));
 
     return aPropertyMap;
   }
@@ -4786,7 +3277,7 @@ class ShapeCflowChartExtract : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCactionButtonHome : public CustomShapeProvider
+class ShapeCflowChartProcess : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -4797,37 +3288,10 @@ class ShapeCactionButtonHome : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "?0 *3/8",
-            "logheight/2",
-            "?2 +0-?1 ",
-            "?2 +?1 -0",
             "logwidth/2",
-            "?5 +0-?1 ",
-            "?5 +?1 -0",
-            "?0 *3/4",
-            "?8 *1/16",
-            "?8 *1/8",
-            "?8 *3/16",
-            "?8 *5/16",
-            "?8 *7/16",
-            "?8 *9/16",
-            "?8 *11/16",
-            "?8 *3/4",
-            "?8 *13/16",
-            "?8 *7/8",
-            "?3 +?9 -0",
-            "?3 +?11 -0",
-            "?3 +?12 -0",
-            "?3 +?16 -0",
-            "?6 +?10 -0",
-            "?6 +?13 -0",
-            "?6 +?14 -0",
-            "?6 +?15 -0",
-            "?6 +?17 -0",
-            "?6 +?18 -0",
-            "logwidth",
-            "logheight"
+            "logheight/2",
+            "logheight",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -4841,7 +3305,7 @@ class ShapeCactionButtonHome : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
@@ -4851,284 +3315,19 @@ class ShapeCactionButtonHome : public CustomShapeProvider
                     0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    29, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    29, 30
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 30
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 4
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    1, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    29, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    29, 30
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 30
+                    0, 1
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5140,50 +3339,23 @@ class ShapeCactionButtonHome : public CustomShapeProvider
                 1,1,
                 2,3,
                 4,0,
-                1,1,
-                2,10,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                1,1,
-                2,7,
-                4,0,
-                19,0,
-                7,0,
-                5,0,
-                1,1,
-                2,2,
-                4,0,
-                1,1,
-                2,3,
-                4,0,
-                18,0,
-                7,0,
-                5,0,
-                1,1,
-                2,10,
-                4,0,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                1,1,
-                2,3,
-                6,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 1;
+                aSize.Height = 1;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -5201,13 +3373,13 @@ class ShapeCactionButtonHome : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        29, 30
+                        3, 2
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -5219,7 +3391,7 @@ class ShapeCactionButtonHome : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonHome"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartProcess"));
 
     return aPropertyMap;
   }
@@ -5227,300 +3399,27 @@ class ShapeCactionButtonHome : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCaccentBorderCallout3 : public CustomShapeProvider
+class ShapeCflowChartPunchedCard : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (8);
-        {
-            Any aAny ((sal_Int32) 18750);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) -8333);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 18750);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) -16667);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
-        {
-            Any aAny ((sal_Int32) 100000);
-            aAdjSequence [4].Value = aAny;
-            aAdjSequence [4].Name = "adj5";
-        }
-        {
-            Any aAny ((sal_Int32) -16667);
-            aAdjSequence [5].Value = aAny;
-            aAdjSequence [5].Name = "adj6";
-        }
-        {
-            Any aAny ((sal_Int32) 112963);
-            aAdjSequence [6].Value = aAny;
-            aAdjSequence [6].Name = "adj7";
-        }
-        {
-            Any aAny ((sal_Int32) -8333);
-            aAdjSequence [7].Value = aAny;
-            aAdjSequence [7].Name = "adj8";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "logheight*$0 /100000",
-            "logwidth*$1 /100000",
-            "logheight*$2 /100000",
-            "logwidth*$3 /100000",
-            "logheight*$4 /100000",
-            "logwidth*$5 /100000",
-            "logheight*$6 /100000",
-            "logwidth*$7 /100000",
-            "logwidth",
-            "logheight/2",
             "logwidth/2",
-            "logheight"
+            "logheight/2",
+            "logheight",
+            "logwidth",
+            "logheight/5"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
-        {
-            Sequence< PropertyValue > aPropSequence (7);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [6].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (7);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [6].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (7);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 5);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 4);
-                aPropSequence [6].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (7);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 6
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 7);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 6);
-                aPropSequence [6].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [3] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -5529,59 +3428,34 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 11
+                    0, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 11
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
                     1, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 11
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 5
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 6
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 5
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5591,22 +3465,25 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
+                2,4,
                 4,0,
-                5,0,
-                1,1,
-                2,1,
-                6,0,
-                5,0,
-                1,1,
-                2,3,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 5;
+                aSize.Height = 5;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -5614,8 +3491,8 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        0, 4
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -5624,13 +3501,13 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        8, 11
+                        3, 2
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -5642,7 +3519,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentBorderCallout3"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartPunchedCard"));
 
     return aPropertyMap;
   }
@@ -5650,7 +3527,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartOfflineStorage : public CustomShapeProvider
+class ShapeCflowChartPunchedTape : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -5661,11 +3538,21 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth*3/4",
-            "logheight/2",
+            "logheight*9/10",
+            "logheight*4/5",
             "logwidth/2",
-            "logheight",
-            "logwidth/4"
+            "logheight/10",
+            "logheight/2",
+            "logwidth",
+            "logheight/5",
+            "(10800000)/60000.0",
+            "(-10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(-10800000)/60000.0",
+            "(0)/60000.0",
+            "(10800000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -5686,42 +3573,52 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    5, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    2, 4
+                    5, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 4
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    20, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    5, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 2
+                    5, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 14
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5731,43 +3628,23 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,2,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
+                17,2,
                 2,1,
-                6,0,
-                5,0,
-                1,1,
-                2,2,
+                17,2,
                 4,0,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
             aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (3);
+            Sequence< awt::Size > aSizeSequence (1);
             {
                 awt::Size aSize;
-                aSize.Width = 2;
-                aSize.Height = 2;
+                aSize.Width = 20;
+                aSize.Height = 20;
                 aSizeSequence [0] = aSize;
             }
-            {
-                awt::Size aSize;
-                aSize.Width = 5;
-                aSize.Height = 5;
-                aSizeSequence [1] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 2;
-                aSize.Height = 2;
-                aSizeSequence [2] = aSize;
-            }
             aPropSequence [2].Value = makeAny (aSizeSequence);
         }
         {
@@ -5778,9 +3655,9 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::NORMAL,
-                        4, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        0, 6
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -5789,7 +3666,7 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 1
+                        5, 1
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -5807,7 +3684,7 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartOfflineStorage"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartPunchedTape"));
 
     return aPropertyMap;
   }
@@ -5815,7 +3692,7 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCirregularSeal1 : public CustomShapeProvider
+class ShapeCflowChartSort : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -5826,16 +3703,14 @@ class ShapeCirregularSeal1 : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth*4627/21600",
-            "logwidth*8485/21600",
-            "logwidth*16702/21600",
-            "logwidth*14522/21600",
-            "logheight*6320/21600",
-            "logheight*8615/21600",
-            "logheight*13937/21600",
-            "logheight*13290/21600",
+            "logwidth*3/4",
+            "logheight*3/4",
+            "logwidth/2",
+            "logheight/2",
             "logheight",
-            "logwidth"
+            "logwidth",
+            "logwidth/4",
+            "logheight/4"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -5856,122 +3731,52 @@ class ShapeCirregularSeal1 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    10800, 5800
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    14522, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    14155, 5325
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18380, 4457
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    16702, 7315
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    21097, 8137
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    17607, 10475
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    21600, 13290
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    16837, 12942
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18145, 18095
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    14020, 14457
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    13247, 19737
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10532, 14935
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8485, 21600
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    7715, 15627
+                    0, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4762, 17617
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5667, 13937
+                    2, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    135, 14587
+                    1, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3722, 11775
+                    0, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 8615
+                    2, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4627, 7617
+                    0, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    370, 2295
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    7312, 6320
+                    2, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    8352, 2295
+                    1, 2
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5981,21 +3786,43 @@ class ShapeCirregularSeal1 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,23,
+                2,3,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,1,
+                6,0,
+                5,0,
+                1,1,
+                2,3,
                 4,0,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
             aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
+            Sequence< awt::Size > aSizeSequence (3);
             {
                 awt::Size aSize;
-                aSize.Width = 21600;
-                aSize.Height = 21600;
+                aSize.Width = 2;
+                aSize.Height = 2;
                 aSizeSequence [0] = aSize;
             }
+            {
+                awt::Size aSize;
+                aSize.Width = 2;
+                aSize.Height = 2;
+                aSizeSequence [1] = aSize;
+            }
+            {
+                awt::Size aSize;
+                aSize.Width = 2;
+                aSize.Height = 2;
+                aSizeSequence [2] = aSize;
+            }
             aPropSequence [2].Value = makeAny (aSizeSequence);
         }
         {
@@ -6008,7 +3835,7 @@ class ShapeCirregularSeal1 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 4
+                        6, 7
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6017,7 +3844,7 @@ class ShapeCirregularSeal1 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        2, 6
+                        0, 1
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6035,7 +3862,7 @@ class ShapeCirregularSeal1 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-irregularSeal1"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartSort"));
 
     return aPropertyMap;
   }
@@ -6043,170 +3870,50 @@ class ShapeCirregularSeal1 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCquadArrow : public CustomShapeProvider
+class ShapeCflowChartSummingJunction : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
-        {
-            Any aAny ((sal_Int32) 22500);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 22500);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 22500);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
-            "?0 *2/1",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "100000+0-?1 ",
-            "?3 *1/2",
-            "if(0-$2 ,0,if(?4 -$2 ,$2 ,?4 ))",
-            "min(logwidth,logheight)",
-            "?6 *?5 /100000",
-            "?6 *?0 /100000",
             "logwidth/2",
-            "?9 +0-?8 ",
-            "?9 +?8 -0",
-            "?6 *?2 /200000",
-            "?9 +0-?12 ",
-            "?9 +?12 -0",
-            "logwidth+0-?7 ",
+            "?0 *cos(pi*(2700000)/10800000)",
+            "logheight/2",
+            "?2 *sin(pi*(2700000)/10800000)",
+            "logwidth/2",
+            "?4 +0-?1 ",
+            "?4 +?1 -0",
             "logheight/2",
-            "?16 +0-?8 ",
-            "?16 +?8 -0",
-            "?16 +0-?12 ",
-            "?16 +?12 -0",
-            "logheight+0-?7 ",
-            "?12 *?7 /?8 ",
-            "logwidth+0-?22 ",
+            "?7 +0-?3 ",
+            "?7 +?3 -0",
+            "logheight",
             "logwidth",
-            "logheight"
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 7
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 7
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 4);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -6222,122 +3929,112 @@ class ShapeCquadArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 17
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 19
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 19
+                    12, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 7
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9, 0
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 7
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 7
+                    16, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 19
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 19
+                    18, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 17
+                    5, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 16
+                    6, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 18
+                    6, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 20
+                    5, 9
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 20
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 21
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 21
+                    20, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 25
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 21
+                    22, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 21
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 20
+                    24, 25
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 20
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 18
+                    26, 27
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6347,8 +4044,20 @@ class ShapeCquadArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,23,
+                17,4,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                2,1,
+                1,1,
+                2,1,
+                6,0,
+                5,0,
+                1,1,
+                17,4,
                 4,0,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -6363,7 +4072,7 @@ class ShapeCquadArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        22, 19
+                        5, 8
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6372,7 +4081,7 @@ class ShapeCquadArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        23, 20
+                        6, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6390,7 +4099,7 @@ class ShapeCquadArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-quadArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartSummingJunction"));
 
     return aPropertyMap;
   }
@@ -6398,139 +4107,34 @@ class ShapeCquadArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCleftBrace : public CustomShapeProvider
+class ShapeCflowChartTerminator : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
-        {
-            Any aAny ((sal_Int32) 8333);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$1 ,0,if(100000-$1 ,$1 ,100000))",
-            "100000+0-?0 ",
-            "min(?1 ,?0 )",
-            "?2 *1/2",
-            "min(logwidth,logheight)",
-            "?3 *logheight/?4 ",
-            "if(0-$0 ,0,if(?5 -$0 ,$0 ,?5 ))",
-            "?4 *?6 /100000",
-            "logheight*?0 /100000",
-            "?8 +?7 -0",
-            "logwidth/2",
-            "?10 *cos(pi*(2700000)/10800000)",
-            "?7 *sin(pi*(2700000)/10800000)",
-            "logwidth+0-?11 ",
-            "?7 +0-?12 ",
-            "logheight+?12 -?7 ",
+            "logwidth*1018/21600",
+            "logwidth*20582/21600",
+            "logheight*3163/21600",
+            "logheight*18437/21600",
             "logwidth/2",
-            "logwidth",
+            "logheight/2",
             "logheight",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(-5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
+            "logwidth",
+            "(16200000)/60000.0",
             "(10800000)/60000.0",
             "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(-5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0"
+            "(10800000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 7
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 5);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -6539,119 +4143,44 @@ class ShapeCleftBrace : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 7
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3475, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    29, 30
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18125, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 7
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3475, 10800
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 32
+                    8, 9
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 7
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3475, 21600
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 7
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3475, 10800
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    33, 34
+                    10, 11
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6661,27 +4190,28 @@ class ShapeCleftBrace : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,1,
-                2,1,
-                17,2,
                 2,1,
                 17,1,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                17,1,
-                2,1,
-                17,2,
                 2,1,
                 17,1,
-                6,0,
+                4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 21600;
+                aSize.Height = 21600;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -6690,7 +4220,7 @@ class ShapeCleftBrace : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        13, 14
+                        0, 2
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6699,13 +4229,13 @@ class ShapeCleftBrace : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        17, 15
+                        1, 3
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -6717,7 +4247,7 @@ class ShapeCleftBrace : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftBrace"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartTerminator"));
 
     return aPropertyMap;
   }
@@ -6725,7 +4255,7 @@ class ShapeCleftBrace : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCleftBracket : public CustomShapeProvider
+class ShapeCfoldedCorner : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -6734,7 +4264,7 @@ class ShapeCleftBracket : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 8333);
+            Any aAny ((sal_Int32) 16667);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj";
         }
@@ -6742,28 +4272,18 @@ class ShapeCleftBracket : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
             "min(logwidth,logheight)",
-            "50000*logheight/?0 ",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "?0 *?2 /100000",
-            "logheight+0-?3 ",
-            "logwidth*cos(pi*(2700000)/10800000)",
-            "?3 *sin(pi*(2700000)/10800000)",
-            "logwidth+0-?5 ",
-            "?3 +0-?6 ",
-            "logheight+?6 -?3 ",
-            "logwidth",
-            "logheight/2",
+            "?1 *?0 /100000",
+            "?2 *1/5",
+            "logwidth+0-?2 ",
+            "?4 +?3 -0",
+            "logheight+0-?2 ",
+            "?6 +?3 -0",
             "logheight",
-            "logwidth",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0"
+            "logwidth/2",
+            "logheight/2",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -6775,22 +4295,22 @@ class ShapeCleftBracket : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 8
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -6798,7 +4318,7 @@ class ShapeCleftBracket : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -6818,64 +4338,84 @@ class ShapeCleftBracket : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 12
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    11, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 3
+                    11, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
+                    4, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    0, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 3
+                    4, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 17
+                    5, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 12
+                    11, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 3
+                    4, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 19
+                    5, 7
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 3
+                    4, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    11, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 21
+                    11, 6
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6885,16 +4425,18 @@ class ShapeCleftBracket : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,1,
-                2,1,
-                17,1,
+                2,4,
                 4,0,
                 7,0,
                 5,0,
                 1,1,
-                17,1,
-                2,1,
-                17,1,
+                2,2,
+                4,0,
+                19,0,
+                7,0,
+                5,0,
+                1,1,
+                2,7,
                 6,0,
                 5,0
             };
@@ -6908,9 +4450,9 @@ class ShapeCleftBracket : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        7, 8
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6919,7 +4461,7 @@ class ShapeCleftBracket : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        10, 9
+                        11, 6
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6937,7 +4479,7 @@ class ShapeCleftBracket : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftBracket"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-foldedCorner"));
 
     return aPropertyMap;
   }
@@ -6945,146 +4487,51 @@ class ShapeCleftBracket : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCblockArc : public CustomShapeProvider
+class ShapeCframe : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 10800000);
+            Any aAny ((sal_Int32) 12500);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
-        {
-            Any aAny ((sal_Int32) 0);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(21599999-$0 ,$0 ,21599999))",
-            "if(0-$1 ,0,if(21599999-$1 ,$1 ,21599999))",
-            "if(0-$2 ,0,if(50000-$2 ,$2 ,50000))",
-            "?1 +0-?0 ",
-            "?3 +21600000-0",
-            "if(?3 ,?3 ,?4 )",
-            "0+0-?5 ",
-            "logwidth/2",
-            "?7 *sin(pi*(?0 )/10800000)",
-            "logheight/2",
-            "?9 *cos(pi*(?0 )/10800000)",
-            "?7 *sin(pi*(?1 )/10800000)",
-            "?9 *cos(pi*(?1 )/10800000)",
-            "?7 *(cos(atan2(?8 ,?10 )))",
-            "?9 *(sin(atan2(?8 ,?10 )))",
-            "?7 *(cos(atan2(?11 ,?12 )))",
-            "?9 *(sin(atan2(?11 ,?12 )))",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "logwidth+0-?2 ",
+            "logheight+0-?2 ",
             "logwidth/2",
-            "?17 +?13 -0",
             "logheight/2",
-            "?19 +?14 -0",
-            "?17 +?15 -0",
-            "?19 +?16 -0",
-            "min(logwidth,logheight)",
-            "?23 *?2 /100000",
-            "?7 +0-?24 ",
-            "?9 +0-?24 ",
-            "?25 *sin(pi*(?1 )/10800000)",
-            "?26 *cos(pi*(?1 )/10800000)",
-            "?25 *sin(pi*(?0 )/10800000)",
-            "?26 *cos(pi*(?0 )/10800000)",
-            "?25 *(cos(atan2(?27 ,?28 )))",
-            "?26 *(sin(atan2(?27 ,?28 )))",
-            "?25 *(cos(atan2(?29 ,?30 )))",
-            "?26 *(sin(atan2(?29 ,?30 )))",
-            "?17 +?31 -0",
-            "?19 +?32 -0",
-            "?17 +?33 -0",
-            "?19 +?34 -0",
-            "21600000+0-?0 ",
-            "?5 +0-?39 ",
-            "max(?18 ,?35 )",
-            "max(?21 ,?37 )",
-            "max(?41 ,?42 )",
-            "if(?40 ,logwidth,?43 )",
-            "5400000+0-?0 ",
-            "27000000+0-?0 ",
-            "if(?45 ,?45 ,?46 )",
-            "?5 +0-?47 ",
-            "max(?20 ,?36 )",
-            "max(?22 ,?38 )",
-            "max(?49 ,?50 )",
-            "if(?48 ,logheight,?51 )",
-            "10800000+0-?0 ",
-            "32400000+0-?0 ",
-            "if(?53 ,?53 ,?54 )",
-            "?5 +0-?55 ",
-            "min(?18 ,?35 )",
-            "min(?21 ,?37 )",
-            "min(?57 ,?58 )",
-            "if(?56 ,0,?59 )",
-            "16200000+0-?0 ",
-            "37800000+0-?0 ",
-            "if(?61 ,?61 ,?62 )",
-            "?5 +0-?63 ",
-            "min(?20 ,?36 )",
-            "min(?22 ,?38 )",
-            "min(?65 ,?66 )",
-            "if(?64 ,0,?67 )",
-            "(?18 +?37 )/2",
-            "(?20 +?38 )/2",
-            "(?21 +?35 )/2",
-            "(?22 +?36 )/2",
-            "?0 +0-5400000",
-            "?1 +5400000-0",
-            "(?73 +?74 )/2",
-            "(?0 )/60000.0",
-            "(?5 )/60000.0",
-            "(?1 )/60000.0",
-            "(?6 )/60000.0"
+            "logheight",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
-        {
-            Sequence< PropertyValue > aPropSequence (1);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    18, 20
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
-            Sequence< PropertyValue > aPropSequence (3);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    35, 36
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RadiusRangeMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
@@ -7092,14 +4539,19 @@ class ShapeCblockArc : public CustomShapeProvider
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RadiusRangeMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
-            aPropSequenceSequence [1] = aPropSequence;
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -7115,34 +4567,44 @@ class ShapeCblockArc : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    18, 20
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    8, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 9
+                    8, 7
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    76, 77
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    35, 36
+                    2, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
+                    3, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    78, 79
+                    3, 2
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7152,9 +4614,10 @@ class ShapeCblockArc : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,1,
-                2,1,
-                17,1,
+                2,3,
+                4,0,
+                1,1,
+                2,3,
                 4,0,
                 5,0
             };
@@ -7170,7 +4633,7 @@ class ShapeCblockArc : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        60, 68
+                        2, 2
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7179,7 +4642,7 @@ class ShapeCblockArc : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        44, 52
+                        3, 4
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7197,7 +4660,7 @@ class ShapeCblockArc : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-blockArc"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-frame"));
 
     return aPropertyMap;
   }
@@ -7205,72 +4668,65 @@ class ShapeCblockArc : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcurvedConnector3 : public CustomShapeProvider
+class ShapeCfunnel : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "logwidth*$0 /100000",
-            "(0+?0 )/2",
-            "(logwidth+?0 )/2",
-            "logheight*3/4",
-            "logheight/2",
+            "min(logwidth,logheight)",
+            "?0 *1/20",
+            "logwidth/2",
+            "?2 +0-?1 ",
+            "logheight/4",
+            "?4 +0-?1 ",
+            "?2 *cos(pi*(480000)/10800000)",
+            "?4 *sin(pi*(480000)/10800000)",
+            "(10800000*atan2(?7 ,?6 ))/pi",
+            "?8 *2/1",
+            "10800000+0-?8 ",
+            "10800000+2-0",
+            "10800000+0-2",
+            "?2 *1/4",
+            "?4 *1/4",
+            "?4 *cos(pi*(?10 )/10800000)",
+            "?2 *sin(pi*(?10 )/10800000)",
+            "sqrt(?15 *?15 +?16 *?16 +0*0)",
+            "?2 *?4 /?17 ",
+            "?18 *cos(pi*(?10 )/10800000)",
+            "?18 *sin(pi*(?10 )/10800000)",
+            "logwidth/2",
+            "?21 +?19 -0",
+            "?4 +?20 -0",
+            "?14 *cos(pi*(?8 )/10800000)",
+            "?13 *sin(pi*(?8 )/10800000)",
+            "sqrt(?24 *?24 +?25 *?25 +0*0)",
+            "?13 *?14 /?26 ",
+            "?27 *cos(pi*(?8 )/10800000)",
+            "?27 *sin(pi*(?8 )/10800000)",
+            "?21 +?28 -0",
+            "logheight+0-?14 ",
+            "?31 +?29 -0",
+            "?2 +0-?3 ",
+            "10800000*2/1",
             "logwidth",
             "logheight",
-            "logheight/4"
+            "(?10 )/60000.0",
+            "(?11 )/60000.0",
+            "(?8 )/60000.0",
+            "(?12 )/60000.0",
+            "(10800000)/60000.0",
+            "(-21600000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -7284,39 +4740,49 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
+                    37, 38
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
+                    30, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    13, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 6
+                    39, 40
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 6
+                    33, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    41, 42
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7326,8 +4792,13 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                3,2,
-                6,0,
+                17,1,
+                2,1,
+                17,1,
+                4,0,
+                1,1,
+                17,1,
+                4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -7351,7 +4822,7 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        5, 6
+                        35, 36
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7369,7 +4840,7 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedConnector3"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-funnel"));
 
     return aPropertyMap;
   }
@@ -7377,144 +4848,226 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCwedgeRoundRectCallout : public CustomShapeProvider
+class ShapeCgear6 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) -20833);
+            Any aAny ((sal_Int32) 15000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 62500);
+            Any aAny ((sal_Int32) 3526);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
-        {
-            Any aAny ((sal_Int32) 16667);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logwidth*$0 /100000",
-            "logheight*$1 /100000",
+            "if(0-$0 ,0,if(20000-$0 ,$0 ,20000))",
+            "if(0-$1 ,0,if(5358-$1 ,$1 ,5358))",
+            "min(logwidth,logheight)",
+            "?2 *?0 /100000",
+            "?2 *?1 /100000",
+            "?3 *1/2",
+            "?4 *1/2",
+            "?5 +?6 -0",
+            "logheight/2",
+            "?8 +0-?3 ",
             "logwidth/2",
-            "?2 +?0 -0",
+            "?10 +0-?3 ",
+            "?11 +0-?9 ",
+            "if(?12 ,?9 ,?11 )",
+            "(10800000*atan2(?7 ,?13 ))/pi",
+            "19800000+0-?14 ",
+            "19800000+?14 -0",
+            "?11 *cos(pi*(?15 )/10800000)",
+            "?9 *sin(pi*(?15 )/10800000)",
+            "(10800000*atan2(?18 ,?17 ))/pi",
+            "?9 *cos(pi*(?19 )/10800000)",
+            "?11 *sin(pi*(?19 )/10800000)",
+            "sqrt(?20 *?20 +?21 *?21 +0*0)",
+            "?11 *?9 /?22 ",
+            "?23 *cos(pi*(?19 )/10800000)",
+            "?23 *sin(pi*(?19 )/10800000)",
+            "logwidth/2",
+            "?26 +?24 -0",
             "logheight/2",
-            "?4 +?1 -0",
-            "?0 *logheight/logwidth",
-            "abs(?1 )",
-            "abs(?6 )",
-            "?7 +0-?8 ",
-            "if(?0 ,7,2)",
-            "if(?0 ,10,5)",
-            "logwidth*?10 /12",
-            "logwidth*?11 /12",
-            "if(?1 ,7,2)",
-            "if(?1 ,10,5)",
-            "logheight*?14 /12",
-            "logheight*?15 /12",
-            "if(?0 ,0,?3 )",
-            "if(?9 ,0,?18 )",
-            "if(?1 ,?12 ,?3 )",
-            "if(?9 ,?20 ,?12 )",
-            "if(?0 ,?3 ,logwidth)",
-            "if(?9 ,logwidth,?22 )",
-            "if(?1 ,?3 ,?12 )",
-            "if(?9 ,?24 ,?12 )",
-            "if(?0 ,?16 ,?5 )",
-            "if(?9 ,?16 ,?26 )",
-            "if(?1 ,0,?5 )",
-            "if(?9 ,?28 ,0)",
-            "if(?0 ,?5 ,?16 )",
-            "if(?9 ,?16 ,?30 )",
-            "if(?1 ,?5 ,logheight)",
-            "if(?9 ,?32 ,logheight)",
-            "min(logwidth,logheight)",
-            "?34 *$2 /100000",
-            "logwidth+0-?35 ",
-            "logheight+0-?35 ",
-            "?35 *29289/100000",
-            "logwidth+0-?38 ",
-            "logheight+0-?38 ",
-            "logheight",
-            "logwidth",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0"
+            "?28 +?25 -0",
+            "?11 *cos(pi*(?16 )/10800000)",
+            "?9 *sin(pi*(?16 )/10800000)",
+            "(10800000*atan2(?31 ,?30 ))/pi",
+            "?9 *cos(pi*(?32 )/10800000)",
+            "?11 *sin(pi*(?32 )/10800000)",
+            "sqrt(?33 *?33 +?34 *?34 +0*0)",
+            "?11 *?9 /?35 ",
+            "?36 *cos(pi*(?32 )/10800000)",
+            "?36 *sin(pi*(?32 )/10800000)",
+            "?26 +?37 -0",
+            "?28 +?38 -0",
+            "?27 +0-?39 ",
+            "?29 +0-?40 ",
+            "sqrt(?41 *?41 +?42 *?42 +0*0)",
+            "(10800000*atan2(?41 ,?42 ))/pi",
+            "?4 *sin(pi*(?44 )/10800000)",
+            "?4 *cos(pi*(?44 )/10800000)",
+            "?39 +?45 -0",
+            "?40 +?46 -0",
+            "?27 +0-?45 ",
+            "?29 +0-?46 ",
+            "?3 *sin(pi*(?44 )/10800000)",
+            "?3 *cos(pi*(?44 )/10800000)",
+            "?48 +?51 -0",
+            "?47 +0-?52 ",
+            "?50 +?51 -0",
+            "?49 +0-?52 ",
+            "16200000+?14 -0",
+            "?11 *cos(pi*(?57 )/10800000)",
+            "?9 *sin(pi*(?57 )/10800000)",
+            "(10800000*atan2(?59 ,?58 ))/pi",
+            "?9 *cos(pi*(?60 )/10800000)",
+            "?11 *sin(pi*(?60 )/10800000)",
+            "sqrt(?61 *?61 +?62 *?62 +0*0)",
+            "?11 *?9 /?63 ",
+            "?64 *cos(pi*(?60 )/10800000)",
+            "?64 *sin(pi*(?60 )/10800000)",
+            "?26 +?65 -0",
+            "?28 +?66 -0",
+            "?26 +0-?65 ",
+            "?67 +0-?4 ",
+            "?69 +?4 -0",
+            "?68 +0-?3 ",
+            "?19 +0-?60 ",
+            "1800000+0-?14 ",
+            "1800000+?14 -0",
+            "?11 *cos(pi*(?74 )/10800000)",
+            "?9 *sin(pi*(?74 )/10800000)",
+            "(10800000*atan2(?77 ,?76 ))/pi",
+            "logheight+0-?40 ",
+            "?11 *cos(pi*(?75 )/10800000)",
+            "?9 *sin(pi*(?75 )/10800000)",
+            "(10800000*atan2(?81 ,?80 ))/pi",
+            "logheight+0-?29 ",
+            "logheight+0-?55 ",
+            "logheight+0-?53 ",
+            "?54 ",
+            "?78 +0-?32 ",
+            "5400000+?14 -0",
+            "?11 *cos(pi*(?88 )/10800000)",
+            "?9 *sin(pi*(?88 )/10800000)",
+            "(10800000*atan2(?90 ,?89 ))/pi",
+            "logheight+0-?68 ",
+            "logheight+0-?72 ",
+            "9000000+?14 -0",
+            "?11 *cos(pi*(?94 )/10800000)",
+            "?9 *sin(pi*(?94 )/10800000)",
+            "(10800000*atan2(?96 ,?95 ))/pi",
+            "logwidth+0-?39 ",
+            "logwidth+0-?54 ",
+            "logwidth+0-?56 ",
+            "12600000+?14 -0",
+            "?11 *cos(pi*(?101 )/10800000)",
+            "?9 *sin(pi*(?101 )/10800000)",
+            "(10800000*atan2(?103 ,?102 ))/pi",
+            "logwidth+0-?27 ",
+            "logwidth+0-?56 ",
+            "logwidth+0-?54 ",
+            "(?56 +?54 )/2",
+            "(?55 +?53 )/2",
+            "logheight+0-?109 ",
+            "(logwidth+0)/?108 ",
+            "(?32 )/60000.0",
+            "(?87 )/60000.0",
+            "(?82 )/60000.0",
+            "(?73 )/60000.0",
+            "(?91 )/60000.0",
+            "(?73 )/60000.0",
+            "(?97 )/60000.0",
+            "(?87 )/60000.0",
+            "(?104 )/60000.0",
+            "(?73 )/60000.0",
+            "(?60 )/60000.0",
+            "(?73 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    67, 68
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 20000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
             }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
             {
-                aPropSequence [4].Name = "RangeYMinimum";
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    69, 68
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 5358);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
+                aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [5].Name = "RefX";
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [5].Value = makeAny (aAny);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [6].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 1);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [0] = aPropSequence;
+            aPropSequenceSequence [1] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -7530,589 +5083,159 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    35, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    43, 44
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    12, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 29
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    13, 0
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    36, 0
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    35, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    45, 46
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    42, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 31
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    42, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    42, 37
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    35, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    47, 48
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 41
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 33
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 41
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    35, 41
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    35, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    49, 50
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 27
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 16
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                17,1,
-                2,4,
-                17,1,
-                2,4,
-                17,1,
-                2,4,
-                17,1,
-                2,3,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        38, 38
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        39, 40
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-wedgeRoundRectCallout"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCactionButtonMovie : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "?0 *3/8",
-            "logheight/2",
-            "?2 +0-?1 ",
-            "?2 +?1 -0",
-            "logwidth/2",
-            "?5 +0-?1 ",
-            "?5 +?1 -0",
-            "?0 *3/4",
-            "?8 *1455/21600",
-            "?8 *1905/21600",
-            "?8 *2325/21600",
-            "?8 *16155/21600",
-            "?8 *17010/21600",
-            "?8 *19335/21600",
-            "?8 *19725/21600",
-            "?8 *20595/21600",
-            "?8 *5280/21600",
-            "?8 *5730/21600",
-            "?8 *6630/21600",
-            "?8 *7492/21600",
-            "?8 *9067/21600",
-            "?8 *9555/21600",
-            "?8 *13342/21600",
-            "?8 *14580/21600",
-            "?8 *15592/21600",
-            "?6 +?9 -0",
-            "?6 +?10 -0",
-            "?6 +?11 -0",
-            "?6 +?12 -0",
-            "?6 +?13 -0",
-            "?6 +?14 -0",
-            "?6 +?15 -0",
-            "?6 +?16 -0",
-            "?3 +?17 -0",
-            "?3 +?18 -0",
-            "?3 +?19 -0",
-            "?3 +?20 -0",
-            "?3 +?21 -0",
-            "?3 +?22 -0",
-            "?3 +?23 -0",
-            "?3 +?24 -0",
-            "?3 +?25 -0",
-            "?3 +?26 -0",
-            "logwidth",
-            "logheight"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    44, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    44, 45
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 45
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 34
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 39
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 39
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 38
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 38
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 42
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    30, 42
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    30, 40
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    31, 40
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    33, 41
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 41
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 36
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    33, 36
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    32, 37
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    30, 37
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    30, 36
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    29, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 34
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 34
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 39
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 39
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 38
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 38
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 42
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    30, 42
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    30, 40
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    31, 40
+                    27, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    33, 41
+                    56, 55
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 41
+                    54, 53
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 36
+                    39, 40
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    33, 36
+                    11, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 37
+                    112, 113
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 37
+                    54, 85
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 36
+                    56, 84
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 35
+                    27, 83
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 35
+                    11, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 34
+                    114, 115
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 34
+                    70, 93
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 34
+                    71, 93
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 35
+                    69, 92
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 35
+                    11, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 36
+                    116, 117
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 37
+                    100, 84
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 37
+                    99, 85
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    33, 36
+                    98, 79
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 36
+                    11, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 41
+                    118, 119
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    33, 41
+                    107, 53
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 40
+                    106, 55
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 40
+                    105, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 42
+                    11, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 42
+                    120, 121
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 38
+                    71, 72
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 38
+                    70, 72
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 39
+                    67, 68
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 39
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    44, 0
+                    11, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    44, 45
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 45
+                    122, 123
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8123,159 +5246,16 @@ class ShapeCactionButtonMovie : public CustomShapeProvider
             // Command, Count
                 1,1,
                 2,3,
-                4,0,
-                1,1,
-                2,18,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,18,
-                4,0,
-                18,0,
-                7,0,
-                5,0,
-                1,1,
-                2,18,
-                4,0,
-                6,0,
-                5,0,
-                1,1,
+                17,1,
                 2,3,
-                4,0,
-                6,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        44, 45
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonMovie"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCflowChartOnlineStorage : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "logwidth*5/6",
-            "logwidth/2",
-            "logheight/2",
-            "logheight",
-            "logwidth/6",
-            "(16200000)/60000.0",
-            "(-10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (4);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 6
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 6
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 8
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,1,
                 17,1,
-                2,1,
+                2,3,
+                17,1,
+                2,3,
+                17,1,
+                2,3,
+                17,1,
+                2,3,
                 17,1,
                 4,0,
                 5,0
@@ -8283,18 +5263,7 @@ class ShapeCflowChartOnlineStorage : public CustomShapeProvider
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 6;
-                aSize.Height = 6;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -8302,8 +5271,8 @@ class ShapeCflowChartOnlineStorage : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        4, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        105, 29
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8312,13 +5281,13 @@ class ShapeCflowChartOnlineStorage : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 3
+                        27, 83
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -8330,7 +5299,7 @@ class ShapeCflowChartOnlineStorage : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartOnlineStorage"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-gear6"));
 
     return aPropertyMap;
   }
@@ -8338,7 +5307,7 @@ class ShapeCflowChartOnlineStorage : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCgear6 : public CustomShapeProvider
+class ShapeCgear9 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -8347,12 +5316,12 @@ class ShapeCgear6 : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 15000);
+            Any aAny ((sal_Int32) 10000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 3526);
+            Any aAny ((sal_Int32) 1763);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
@@ -8361,7 +5330,7 @@ class ShapeCgear6 : public CustomShapeProvider
     {
         static const char *aStrings[] = {
             "if(0-$0 ,0,if(20000-$0 ,$0 ,20000))",
-            "if(0-$1 ,0,if(5358-$1 ,$1 ,5358))",
+            "if(0-$1 ,0,if(2679-$1 ,$1 ,2679))",
             "min(logwidth,logheight)",
             "?2 *?0 /100000",
             "?2 *?1 /100000",
@@ -8375,8 +5344,8 @@ class ShapeCgear6 : public CustomShapeProvider
             "?11 +0-?9 ",
             "if(?12 ,?9 ,?11 )",
             "(10800000*atan2(?7 ,?13 ))/pi",
-            "19800000+0-?14 ",
-            "19800000+?14 -0",
+            "18600000+0-?14 ",
+            "18600000+?14 -0",
             "?11 *cos(pi*(?15 )/10800000)",
             "?9 *sin(pi*(?15 )/10800000)",
             "(10800000*atan2(?18 ,?17 ))/pi",
@@ -8417,73 +5386,214 @@ class ShapeCgear6 : public CustomShapeProvider
             "?47 +0-?52 ",
             "?50 +?51 -0",
             "?49 +0-?52 ",
-            "16200000+?14 -0",
+            "21000000+0-?14 ",
+            "21000000+?14 -0",
             "?11 *cos(pi*(?57 )/10800000)",
             "?9 *sin(pi*(?57 )/10800000)",
-            "(10800000*atan2(?59 ,?58 ))/pi",
-            "?9 *cos(pi*(?60 )/10800000)",
-            "?11 *sin(pi*(?60 )/10800000)",
-            "sqrt(?61 *?61 +?62 *?62 +0*0)",
-            "?11 *?9 /?63 ",
-            "?64 *cos(pi*(?60 )/10800000)",
-            "?64 *sin(pi*(?60 )/10800000)",
-            "?26 +?65 -0",
-            "?28 +?66 -0",
-            "?26 +0-?65 ",
-            "?67 +0-?4 ",
-            "?69 +?4 -0",
-            "?68 +0-?3 ",
-            "?19 +0-?60 ",
+            "(10800000*atan2(?60 ,?59 ))/pi",
+            "?9 *cos(pi*(?61 )/10800000)",
+            "?11 *sin(pi*(?61 )/10800000)",
+            "sqrt(?62 *?62 +?63 *?63 +0*0)",
+            "?11 *?9 /?64 ",
+            "?65 *cos(pi*(?61 )/10800000)",
+            "?65 *sin(pi*(?61 )/10800000)",
+            "?26 +?66 -0",
+            "?28 +?67 -0",
+            "?11 *cos(pi*(?58 )/10800000)",
+            "?9 *sin(pi*(?58 )/10800000)",
+            "(10800000*atan2(?71 ,?70 ))/pi",
+            "?9 *cos(pi*(?72 )/10800000)",
+            "?11 *sin(pi*(?72 )/10800000)",
+            "sqrt(?73 *?73 +?74 *?74 +0*0)",
+            "?11 *?9 /?75 ",
+            "?76 *cos(pi*(?72 )/10800000)",
+            "?76 *sin(pi*(?72 )/10800000)",
+            "?26 +?77 -0",
+            "?28 +?78 -0",
+            "?68 +0-?79 ",
+            "?69 +0-?80 ",
+            "sqrt(?81 *?81 +?82 *?82 +0*0)",
+            "(10800000*atan2(?81 ,?82 ))/pi",
+            "?4 *sin(pi*(?84 )/10800000)",
+            "?4 *cos(pi*(?84 )/10800000)",
+            "?79 +?85 -0",
+            "?80 +?86 -0",
+            "?68 +0-?85 ",
+            "?69 +0-?86 ",
+            "?3 *sin(pi*(?84 )/10800000)",
+            "?3 *cos(pi*(?84 )/10800000)",
+            "?88 +?91 -0",
+            "?87 +0-?92 ",
+            "?90 +?91 -0",
+            "?89 +0-?92 ",
+            "?61 +0-?32 ",
             "1800000+0-?14 ",
             "1800000+?14 -0",
-            "?11 *cos(pi*(?74 )/10800000)",
-            "?9 *sin(pi*(?74 )/10800000)",
-            "(10800000*atan2(?77 ,?76 ))/pi",
-            "logheight+0-?40 ",
-            "?11 *cos(pi*(?75 )/10800000)",
-            "?9 *sin(pi*(?75 )/10800000)",
-            "(10800000*atan2(?81 ,?80 ))/pi",
-            "logheight+0-?29 ",
-            "logheight+0-?55 ",
-            "logheight+0-?53 ",
-            "?54 ",
-            "?78 +0-?32 ",
-            "5400000+?14 -0",
-            "?11 *cos(pi*(?88 )/10800000)",
-            "?9 *sin(pi*(?88 )/10800000)",
-            "(10800000*atan2(?90 ,?89 ))/pi",
-            "logheight+0-?68 ",
-            "logheight+0-?72 ",
+            "?11 *cos(pi*(?98 )/10800000)",
+            "?9 *sin(pi*(?98 )/10800000)",
+            "(10800000*atan2(?101 ,?100 ))/pi",
+            "?9 *cos(pi*(?102 )/10800000)",
+            "?11 *sin(pi*(?102 )/10800000)",
+            "sqrt(?103 *?103 +?104 *?104 +0*0)",
+            "?11 *?9 /?105 ",
+            "?106 *cos(pi*(?102 )/10800000)",
+            "?106 *sin(pi*(?102 )/10800000)",
+            "?26 +?107 -0",
+            "?28 +?108 -0",
+            "?11 *cos(pi*(?99 )/10800000)",
+            "?9 *sin(pi*(?99 )/10800000)",
+            "(10800000*atan2(?112 ,?111 ))/pi",
+            "?9 *cos(pi*(?113 )/10800000)",
+            "?11 *sin(pi*(?113 )/10800000)",
+            "sqrt(?114 *?114 +?115 *?115 +0*0)",
+            "?11 *?9 /?116 ",
+            "?117 *cos(pi*(?113 )/10800000)",
+            "?117 *sin(pi*(?113 )/10800000)",
+            "?26 +?118 -0",
+            "?28 +?119 -0",
+            "?109 +0-?120 ",
+            "?110 +0-?121 ",
+            "sqrt(?122 *?122 +?123 *?123 +0*0)",
+            "(10800000*atan2(?122 ,?123 ))/pi",
+            "?4 *sin(pi*(?125 )/10800000)",
+            "?4 *cos(pi*(?125 )/10800000)",
+            "?120 +?126 -0",
+            "?121 +?127 -0",
+            "?109 +0-?126 ",
+            "?110 +0-?127 ",
+            "?3 *sin(pi*(?125 )/10800000)",
+            "?3 *cos(pi*(?125 )/10800000)",
+            "?129 +?132 -0",
+            "?128 +0-?133 ",
+            "?131 +?132 -0",
+            "?130 +0-?133 ",
+            "?102 +0-?72 ",
+            "4200000+0-?14 ",
+            "4200000+?14 -0",
+            "?11 *cos(pi*(?139 )/10800000)",
+            "?9 *sin(pi*(?139 )/10800000)",
+            "(10800000*atan2(?142 ,?141 ))/pi",
+            "?9 *cos(pi*(?143 )/10800000)",
+            "?11 *sin(pi*(?143 )/10800000)",
+            "sqrt(?144 *?144 +?145 *?145 +0*0)",
+            "?11 *?9 /?146 ",
+            "?147 *cos(pi*(?143 )/10800000)",
+            "?147 *sin(pi*(?143 )/10800000)",
+            "?26 +?148 -0",
+            "?28 +?149 -0",
+            "?11 *cos(pi*(?140 )/10800000)",
+            "?9 *sin(pi*(?140 )/10800000)",
+            "(10800000*atan2(?153 ,?152 ))/pi",
+            "?9 *cos(pi*(?154 )/10800000)",
+            "?11 *sin(pi*(?154 )/10800000)",
+            "sqrt(?155 *?155 +?156 *?156 +0*0)",
+            "?11 *?9 /?157 ",
+            "?158 *cos(pi*(?154 )/10800000)",
+            "?158 *sin(pi*(?154 )/10800000)",
+            "?26 +?159 -0",
+            "?28 +?160 -0",
+            "?150 +0-?161 ",
+            "?151 +0-?162 ",
+            "sqrt(?163 *?163 +?164 *?164 +0*0)",
+            "(10800000*atan2(?163 ,?164 ))/pi",
+            "?4 *sin(pi*(?166 )/10800000)",
+            "?4 *cos(pi*(?166 )/10800000)",
+            "?161 +?167 -0",
+            "?162 +?168 -0",
+            "?150 +0-?167 ",
+            "?151 +0-?168 ",
+            "?3 *sin(pi*(?166 )/10800000)",
+            "?3 *cos(pi*(?166 )/10800000)",
+            "?170 +?173 -0",
+            "?169 +0-?174 ",
+            "?172 +?173 -0",
+            "?171 +0-?174 ",
+            "?143 +0-?113 ",
+            "6600000+0-?14 ",
+            "6600000+?14 -0",
+            "?11 *cos(pi*(?180 )/10800000)",
+            "?9 *sin(pi*(?180 )/10800000)",
+            "(10800000*atan2(?183 ,?182 ))/pi",
+            "?11 *cos(pi*(?181 )/10800000)",
+            "?9 *sin(pi*(?181 )/10800000)",
+            "(10800000*atan2(?186 ,?185 ))/pi",
+            "logwidth+0-?150 ",
+            "logwidth+0-?178 ",
+            "logwidth+0-?176 ",
+            "?184 +0-?154 ",
             "9000000+?14 -0",
-            "?11 *cos(pi*(?94 )/10800000)",
-            "?9 *sin(pi*(?94 )/10800000)",
-            "(10800000*atan2(?96 ,?95 ))/pi",
+            "?11 *cos(pi*(?192 )/10800000)",
+            "?9 *sin(pi*(?192 )/10800000)",
+            "(10800000*atan2(?194 ,?193 ))/pi",
+            "logwidth+0-?109 ",
+            "logwidth+0-?137 ",
+            "logwidth+0-?135 ",
+            "11400000+?14 -0",
+            "?11 *cos(pi*(?199 )/10800000)",
+            "?9 *sin(pi*(?199 )/10800000)",
+            "(10800000*atan2(?201 ,?200 ))/pi",
+            "logwidth+0-?68 ",
+            "logwidth+0-?96 ",
+            "logwidth+0-?94 ",
+            "13800000+?14 -0",
+            "?11 *cos(pi*(?206 )/10800000)",
+            "?9 *sin(pi*(?206 )/10800000)",
+            "(10800000*atan2(?208 ,?207 ))/pi",
             "logwidth+0-?39 ",
-            "logwidth+0-?54 ",
-            "logwidth+0-?56 ",
-            "12600000+?14 -0",
-            "?11 *cos(pi*(?101 )/10800000)",
-            "?9 *sin(pi*(?101 )/10800000)",
-            "(10800000*atan2(?103 ,?102 ))/pi",
             "logwidth+0-?27 ",
             "logwidth+0-?56 ",
             "logwidth+0-?54 ",
+            "16200000+0-?14 ",
+            "16200000+?14 -0",
+            "?11 *cos(pi*(?215 )/10800000)",
+            "?9 *sin(pi*(?215 )/10800000)",
+            "(10800000*atan2(?217 ,?216 ))/pi",
+            "?9 *cos(pi*(?218 )/10800000)",
+            "?11 *sin(pi*(?218 )/10800000)",
+            "sqrt(?219 *?219 +?220 *?220 +0*0)",
+            "?11 *?9 /?221 ",
+            "?222 *cos(pi*(?218 )/10800000)",
+            "?222 *sin(pi*(?218 )/10800000)",
+            "?26 +?223 -0",
+            "?28 +?224 -0",
+            "?11 *cos(pi*(?214 )/10800000)",
+            "?9 *sin(pi*(?214 )/10800000)",
+            "(10800000*atan2(?228 ,?227 ))/pi",
+            "?26 +0-?223 ",
+            "?225 +0-?4 ",
+            "?230 +?4 -0",
+            "?226 +0-?3 ",
+            "?229 +0-?209 ",
             "(?56 +?54 )/2",
             "(?55 +?53 )/2",
-            "logheight+0-?109 ",
-            "(logwidth+0)/?108 ",
+            "(?96 +?94 )/2",
+            "(?95 +?93 )/2",
+            "(?137 +?135 )/2",
+            "(?136 +?134 )/2",
+            "(?178 +?176 )/2",
+            "(?177 +?175 )/2",
+            "(logwidth+0)/?241 ",
+            "(logwidth+0)/?239 ",
+            "(logwidth+0)/?237 ",
+            "(logwidth+0)/?235 ",
             "(?32 )/60000.0",
-            "(?87 )/60000.0",
-            "(?82 )/60000.0",
-            "(?73 )/60000.0",
-            "(?91 )/60000.0",
-            "(?73 )/60000.0",
             "(?97 )/60000.0",
-            "(?87 )/60000.0",
-            "(?104 )/60000.0",
-            "(?73 )/60000.0",
-            "(?60 )/60000.0",
-            "(?73 )/60000.0"
+            "(?72 )/60000.0",
+            "(?138 )/60000.0",
+            "(?113 )/60000.0",
+            "(?179 )/60000.0",
+            "(?154 )/60000.0",
+            "(?191 )/60000.0",
+            "(?187 )/60000.0",
+            "(?179 )/60000.0",
+            "(?195 )/60000.0",
+            "(?138 )/60000.0",
+            "(?202 )/60000.0",
+            "(?97 )/60000.0",
+            "(?209 )/60000.0",
+            "(?234 )/60000.0",
+            "(?218 )/60000.0",
+            "(?234 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -8497,7 +5607,7 @@ class ShapeCgear6 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    67, 68
+                    225, 226
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -8532,14 +5642,14 @@ class ShapeCgear6 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    69, 68
+                    230, 226
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 5358);
+                Any aAny ((sal_Int32) 2679);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -8600,22 +5710,22 @@ class ShapeCgear6 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    112, 113
+                    247, 248
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    54, 85
+                    96, 95
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    56, 84
+                    94, 93
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 83
+                    79, 80
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -8625,22 +5735,22 @@ class ShapeCgear6 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    114, 115
+                    249, 250
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    70, 93
+                    137, 136
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    71, 93
+                    135, 134
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    69, 92
+                    120, 121
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -8650,22 +5760,22 @@ class ShapeCgear6 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    116, 117
+                    251, 252
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    100, 84
+                    178, 177
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    99, 85
+                    176, 175
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    98, 79
+                    161, 162
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -8675,22 +5785,22 @@ class ShapeCgear6 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    118, 119
+                    253, 254
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    107, 53
+                    190, 175
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    106, 55
+                    189, 177
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    105, 29
+                    188, 151
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -8700,22 +5810,22 @@ class ShapeCgear6 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    120, 121
+                    255, 256
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    71, 72
+                    198, 134
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    70, 72
+                    197, 136
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    67, 68
+                    196, 110
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -8725,7 +5835,82 @@ class ShapeCgear6 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    122, 123
+                    257, 258
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    205, 93
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    204, 95
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    203, 69
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    259, 260
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    213, 53
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    212, 55
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    211, 29
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    261, 262
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    232, 233
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    231, 233
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    225, 226
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    263, 264
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8747,6 +5932,12 @@ class ShapeCgear6 : public CustomShapeProvider
                 17,1,
                 2,3,
                 17,1,
+                2,3,
+                17,1,
+                2,3,
+                17,1,
+                2,3,
+                17,1,
                 4,0,
                 5,0
             };
@@ -8762,7 +5953,7 @@ class ShapeCgear6 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        105, 29
+                        210, 40
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8771,7 +5962,7 @@ class ShapeCgear6 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        27, 83
+                        39, 121
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -8789,7 +5980,7 @@ class ShapeCgear6 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-gear6"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-gear9"));
 
     return aPropertyMap;
   }
@@ -9017,7 +6208,143 @@ class ShapeChalfFrame : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCsnip2SameRect : public CustomShapeProvider
+class ShapeCheart : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+    }
+    {
+        static const char *aStrings[] = {
+            "logwidth*49/48",
+            "logwidth*10/48",
+            "logwidth/2",
+            "?2 +0-?0 ",
+            "?2 +0-?1 ",
+            "?2 +?1 -0",
+            "?2 +?0 -0",
+            "logheight/3",
+            "0+0-?7 ",
+            "logwidth*1/6",
+            "logwidth*5/6",
+            "logheight*2/3",
+            "logheight/4",
+            "logheight"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 12
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 12
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 13
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 12
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 12
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                3,2,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        9, 12
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        10, 11
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-heart"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCheptagon : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -9026,42 +6353,204 @@ class ShapeCsnip2SameRect : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 16667);
+            Any aAny ((sal_Int32) 102572);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
+            aAdjSequence [0].Name = "hf";
         }
         {
-            Any aAny ((sal_Int32) 0);
+            Any aAny ((sal_Int32) 105210);
             aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
+            aAdjSequence [1].Name = "vf";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "logwidth/2",
+            "?0 *$0 /100000",
+            "logheight/2",
+            "?2 *$1 /100000",
+            "logheight/2",
+            "?4 *$1 /100000",
+            "?1 *97493/100000",
+            "?1 *78183/100000",
+            "?1 *43388/100000",
+            "?3 *62349/100000",
+            "?3 *22252/100000",
+            "?3 *90097/100000",
+            "logwidth/2",
+            "?12 +0-?6 ",
+            "?12 +0-?7 ",
+            "?12 +0-?8 ",
+            "?12 +?8 -0",
+            "?12 +?7 -0",
+            "?12 +?6 -0",
+            "?5 +0-?9 ",
+            "?5 +?10 -0",
+            "?5 +?11 -0",
+            "logheight+0-?19 "
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    12, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    16, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 21
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,6,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        14, 19
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        17, 22
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-heptagon"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeChexagon : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        {
+            Any aAny ((sal_Int32) 115470);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "vf";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
             "min(logwidth,logheight)",
-            "?2 *?0 /100000",
-            "logwidth+0-?3 ",
-            "?2 *?1 /100000",
+            "50000*logwidth/?0 ",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "logheight/2",
+            "?3 *$1 /100000",
+            "?0 *?2 /100000",
             "logwidth+0-?5 ",
-            "logheight+0-?5 ",
-            "?3 +0-?5 ",
-            "if(?8 ,?3 ,?5 )",
-            "?9 *1/2",
-            "logwidth+0-?10 ",
-            "?3 *1/2",
-            "(?7 +logheight)/2",
-            "logheight",
-            "logwidth",
+            "?4 *sin(pi*(3600000)/10800000)",
             "logheight/2",
-            "logwidth/2"
+            "?8 +0-?7 ",
+            "?8 +?7 -0",
+            "?1 *-1/2",
+            "?2 +?11 -0",
+            "if(?12 ,4,2)",
+            "if(?12 ,3,2)",
+            "if(?12 ,?11 ,0)",
+            "(?2 +?15 )/?11 ",
+            "?16 *?14 /-1",
+            "?13 +?17 -0",
+            "logwidth*?18 /24",
+            "logheight*?18 /24",
+            "logwidth+0-?19 ",
+            "logheight+0-?20 ",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -9070,16 +6559,16 @@ class ShapeCsnip2SameRect : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    5, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -9097,6 +6586,140 @@ class ShapeCsnip2SameRect : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 10
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,5,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        19, 20
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        21, 22
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-hexagon"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeChomePlate : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "min(logwidth,logheight)",
+            "100000*logwidth/?0 ",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "?0 *?2 /100000",
+            "logwidth+0-?3 ",
+            "(?4 +logwidth)/2",
+            "?4 *1/2",
+            "logheight/2",
+            "logheight",
+            "logwidth"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -9104,17 +6727,17 @@ class ShapeCsnip2SameRect : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 14
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -9127,10 +6750,10 @@ class ShapeCsnip2SameRect : public CustomShapeProvider
             }
             {
                 aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [1] = aPropSequence;
+            aPropSequenceSequence [0] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -9146,9 +6769,9 @@ class ShapeCsnip2SameRect : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -9158,32 +6781,17 @@ class ShapeCsnip2SameRect : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    15, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 14
+                    9, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 14
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
+                    4, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    0, 8
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -9193,7 +6801,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,7,
+                2,4,
                 4,0,
                 5,0
             };
@@ -9207,9 +6815,9 @@ class ShapeCsnip2SameRect : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        10, 12
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -9218,7 +6826,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        11, 13
+                        5, 8
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -9236,7 +6844,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-snip2SameRect"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-homePlate"));
 
     return aPropertyMap;
   }
@@ -9247,41 +6855,41 @@ class ShapeCsnip2SameRect : public CustomShapeProvider
 } // anonymous namespace
 void CustomShapeProperties::initializePresetsMap3()
 {
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star6" ) ] = new ShapeCstar6();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "round2SameRect" ) ] = new ShapeCround2SameRect();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "nonIsoscelesTrapezoid" ) ] = new ShapeCnonIsoscelesTrapezoid();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "diamond" ) ] = new ShapeCdiamond();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "callout2" ) ] = new ShapeCcallout2();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "ellipseRibbon" ) ] = new ShapeCellipseRibbon();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "pie" ) ] = new ShapeCpie();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star4" ) ] = new ShapeCstar4();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartPredefinedProcess" ) ] = new ShapeCflowChartPredefinedProcess();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartPunchedTape" ) ] = new ShapeCflowChartPunchedTape();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedConnector2" ) ] = new ShapeCcurvedConnector2();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentConnector3" ) ] = new ShapeCbentConnector3();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "cornerTabs" ) ] = new ShapeCcornerTabs();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "hexagon" ) ] = new ShapeChexagon();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartConnector" ) ] = new ShapeCflowChartConnector();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartMagneticDisk" ) ] = new ShapeCflowChartMagneticDisk();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "heart" ) ] = new ShapeCheart();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "ribbon2" ) ] = new ShapeCribbon2();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bracePair" ) ] = new ShapeCbracePair();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartDelay" ) ] = new ShapeCflowChartDelay();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartDisplay" ) ] = new ShapeCflowChartDisplay();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartDocument" ) ] = new ShapeCflowChartDocument();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartExtract" ) ] = new ShapeCflowChartExtract();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonHome" ) ] = new ShapeCactionButtonHome();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "accentBorderCallout3" ) ] = new ShapeCaccentBorderCallout3();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartInputOutput" ) ] = new ShapeCflowChartInputOutput();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartInternalStorage" ) ] = new ShapeCflowChartInternalStorage();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartMagneticDisk" ) ] = new ShapeCflowChartMagneticDisk();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartMagneticDrum" ) ] = new ShapeCflowChartMagneticDrum();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartMagneticTape" ) ] = new ShapeCflowChartMagneticTape();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartManualInput" ) ] = new ShapeCflowChartManualInput();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartManualOperation" ) ] = new ShapeCflowChartManualOperation();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartMerge" ) ] = new ShapeCflowChartMerge();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartMultidocument" ) ] = new ShapeCflowChartMultidocument();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartOfflineStorage" ) ] = new ShapeCflowChartOfflineStorage();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "irregularSeal1" ) ] = new ShapeCirregularSeal1();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "quadArrow" ) ] = new ShapeCquadArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftBrace" ) ] = new ShapeCleftBrace();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftBracket" ) ] = new ShapeCleftBracket();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "blockArc" ) ] = new ShapeCblockArc();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedConnector3" ) ] = new ShapeCcurvedConnector3();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "wedgeRoundRectCallout" ) ] = new ShapeCwedgeRoundRectCallout();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonMovie" ) ] = new ShapeCactionButtonMovie();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartOffpageConnector" ) ] = new ShapeCflowChartOffpageConnector();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartOnlineStorage" ) ] = new ShapeCflowChartOnlineStorage();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartOr" ) ] = new ShapeCflowChartOr();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartPredefinedProcess" ) ] = new ShapeCflowChartPredefinedProcess();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartPreparation" ) ] = new ShapeCflowChartPreparation();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartProcess" ) ] = new ShapeCflowChartProcess();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartPunchedCard" ) ] = new ShapeCflowChartPunchedCard();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartPunchedTape" ) ] = new ShapeCflowChartPunchedTape();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartSort" ) ] = new ShapeCflowChartSort();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartSummingJunction" ) ] = new ShapeCflowChartSummingJunction();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartTerminator" ) ] = new ShapeCflowChartTerminator();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "foldedCorner" ) ] = new ShapeCfoldedCorner();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "frame" ) ] = new ShapeCframe();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "funnel" ) ] = new ShapeCfunnel();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "gear6" ) ] = new ShapeCgear6();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "gear9" ) ] = new ShapeCgear9();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "halfFrame" ) ] = new ShapeChalfFrame();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "snip2SameRect" ) ] = new ShapeCsnip2SameRect();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "heart" ) ] = new ShapeCheart();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "heptagon" ) ] = new ShapeCheptagon();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "hexagon" ) ] = new ShapeChexagon();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "homePlate" ) ] = new ShapeChomePlate();
 }
 
 } } // oox // drawingml
diff --git a/oox/source/drawingml/customshapepresets4.cxx b/oox/source/drawingml/customshapepresets4.cxx
index 47b10977b1bc..14d10013e7c5 100644
--- a/oox/source/drawingml/customshapepresets4.cxx
+++ b/oox/source/drawingml/customshapepresets4.cxx
@@ -23,7 +23,7 @@ namespace oox { namespace drawingml {
 
 namespace
 {
-class ShapeCtriangle : public CustomShapeProvider
+class ShapeChorizontalScroll : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -32,7 +32,7 @@ class ShapeCtriangle : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 12500);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj";
         }
@@ -40,14 +40,59 @@ class ShapeCtriangle : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
-            "logwidth*?0 /200000",
-            "logwidth*?0 /100000",
+            "if(0-$0 ,0,if(25000-$0 ,$0 ,25000))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "?2 *1/2",
+            "?2 *1/4",
+            "?2 +?3 -0",
+            "?2 +?2 -0",
+            "logheight+0-?2 ",
+            "logheight+0-?3 ",
+            "?7 +0-?3 ",
+            "logwidth+0-?2 ",
+            "logwidth+0-?3 ",
             "logwidth/2",
-            "?1 +?3 -0",
             "logheight/2",
-            "logheight",
-            "logwidth"
+            "logwidth",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(-5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(-10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(-10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(-10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(-16200000)/60000.0",
+            "(10800000)/60000.0",
+            "(-10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(10800000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -68,7 +113,7 @@ class ShapeCtriangle : public CustomShapeProvider
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
+                Any aAny ((sal_Int32) 25000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -102,19 +147,314 @@ class ShapeCtriangle : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 20
+                },
+                {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 6
+                    0, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 7
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 7
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 24
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 6
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 26
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 6
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    29, 30
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    31, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    33, 34
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    35, 36
+                },
+                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    37, 38
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    39, 40
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    41, 42
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 7
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    43, 44
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    45, 46
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    47, 48
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 6
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    49, 50
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 6
+                    51, 52
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 7
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -124,8 +464,51 @@ class ShapeCtriangle : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
+                17,1,
+                2,1,
+                17,1,
+                2,2,
+                17,1,
+                2,1,
+                17,1,
+                2,2,
+                17,1,
+                4,0,
+                1,1,
+                17,2,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                17,2,
+                4,0,
+                1,1,
+                17,2,
+                4,0,
+                19,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                2,2,
+                17,1,
+                2,1,
+                17,1,
                 2,2,
+                17,1,
                 4,0,
+                1,1,
+                2,1,
+                17,1,
+                1,1,
+                2,1,
+                17,1,
+                1,1,
+                2,1,
+                17,2,
+                1,1,
+                2,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -140,7 +523,7 @@ class ShapeCtriangle : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        1, 5
+                        2, 2
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -149,7 +532,7 @@ class ShapeCtriangle : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 6
+                        11, 7
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -167,7 +550,7 @@ class ShapeCtriangle : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-triangle"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-horizontalScroll"));
 
     return aPropertyMap;
   }
@@ -175,94 +558,32 @@ class ShapeCtriangle : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCteardrop : public CustomShapeProvider
+class ShapeCirregularSeal1 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 100000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(200000-$0 ,$0 ,200000))",
-            "sqrt(2)",
-            "logwidth/2",
-            "?2 *?1 /1",
-            "logheight/2",
-            "?4 *?1 /1",
-            "?3 *?0 /100000",
-            "?5 *?0 /100000",
-            "?6 *cos(pi*(2700000)/10800000)",
-            "?7 *sin(pi*(2700000)/10800000)",
-            "logwidth/2",
-            "?10 +?8 -0",
-            "logheight/2",
-            "?12 +0-?9 ",
-            "(?10 +?11 )/2",
-            "(?12 +?13 )/2",
-            "?2 *cos(pi*(2700000)/10800000)",
-            "?4 *sin(pi*(2700000)/10800000)",
-            "?10 +0-?16 ",
-            "?10 +?16 -0",
-            "?12 +0-?17 ",
-            "?12 +?17 -0",
-            "logwidth",
+            "logwidth*4627/21600",
+            "logwidth*8485/21600",
+            "logwidth*16702/21600",
+            "logwidth*14522/21600",
+            "logheight*6320/21600",
+            "logheight*8615/21600",
+            "logheight*13937/21600",
+            "logheight*13290/21600",
             "logheight",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0"
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    11, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 200000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -271,64 +592,129 @@ class ShapeCteardrop : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (4);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 12
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10800, 5800
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    14522, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 25
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    14155, 5325
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    14, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18380, 4457
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 13
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    16702, 7315
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 15
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    21097, 8137
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 12
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    17607, 10475
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    21600, 13290
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 27
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    16837, 12942
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18145, 18095
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 29
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    14020, 14457
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    13247, 19737
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10532, 14935
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    8485, 21600
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    7715, 15627
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4762, 17617
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5667, 13937
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    135, 14587
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3722, 11775
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 8615
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4627, 7617
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    370, 2295
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    7312, 6320
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    8352, 2295
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -338,16 +724,25 @@ class ShapeCteardrop : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,1,
-                16,2,
-                17,2,
+                2,23,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "TextFrames";
+            aPropSequence [2].Name = "SubViewSize";
+            Sequence< awt::Size > aSizeSequence (1);
+            {
+                awt::Size aSize;
+                aSize.Width = 21600;
+                aSize.Height = 21600;
+                aSizeSequence [0] = aSize;
+            }
+            aPropSequence [2].Value = makeAny (aSizeSequence);
+        }
+        {
+            aPropSequence [3].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -356,7 +751,7 @@ class ShapeCteardrop : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        18, 20
+                        0, 4
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -365,13 +760,13 @@ class ShapeCteardrop : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        19, 21
+                        2, 6
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            aPropSequence [3].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -383,7 +778,7 @@ class ShapeCteardrop : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-teardrop"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-irregularSeal1"));
 
     return aPropertyMap;
   }
@@ -391,7 +786,7 @@ class ShapeCteardrop : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartDocument : public CustomShapeProvider
+class ShapeCirregularSeal2 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -402,10 +797,17 @@ class ShapeCflowChartDocument : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logheight*17322/21600",
-            "logheight*20172/21600",
-            "logwidth/2",
-            "logheight/2",
+            "logwidth*9722/21600",
+            "logwidth*5372/21600",
+            "logwidth*11612/21600",
+            "logwidth*14640/21600",
+            "logheight*1887/21600",
+            "logheight*6382/21600",
+            "logheight*12877/21600",
+            "logheight*19712/21600",
+            "logheight*18842/21600",
+            "logheight*15935/21600",
+            "logheight*6645/21600",
             "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
@@ -427,32 +829,142 @@ class ShapeCflowChartDocument : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    11462, 4342
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    14790, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    14525, 5777
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18007, 3172
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    16380, 6532
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    21600, 6645
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    16985, 9402
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18270, 11290
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    16380, 12310
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18877, 15632
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    14640, 14350
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    14942, 17370
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    12180, 15935
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    11612, 18842
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9872, 17370
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    8700, 19712
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    7527, 18125
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    21600, 0
+                    4917, 21600
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    21600, 17322
+                    4805, 18240
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    10800, 17322
+                    1285, 17825
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    10800, 23922
+                    3330, 15370
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 20172
+                    0, 12877
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3935, 11592
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1172, 8270
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5372, 7817
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4502, 3625
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    8550, 6382
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9722, 1887
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -462,8 +974,7 @@ class ShapeCflowChartDocument : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,2,
-                3,1,
+                2,27,
                 4,0,
                 5,0
             };
@@ -488,9 +999,9 @@ class ShapeCflowChartDocument : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        1, 5
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -499,7 +1010,7 @@ class ShapeCflowChartDocument : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 0
+                        3, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -517,7 +1028,7 @@ class ShapeCflowChartDocument : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartDocument"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-irregularSeal2"));
 
     return aPropertyMap;
   }
@@ -525,7 +1036,226 @@ class ShapeCflowChartDocument : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCrightArrowCallout : public CustomShapeProvider
+class ShapeCleftArrow : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "min(logwidth,logheight)",
+            "100000*logwidth/?0 ",
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "?0 *?3 /100000",
+            "0+?4 -0",
+            "logheight*?2 /200000",
+            "logheight/2",
+            "?7 +0-?6 ",
+            "?7 +?6 -0",
+            "logheight/2",
+            "?8 *?4 /?10 ",
+            "?5 +0-?11 ",
+            "logwidth",
+            "logheight"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 8
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 100000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 1);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 7
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 14
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,6,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        12, 8
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        13, 9
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftArrow"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCleftArrowCallout : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -575,11 +1305,11 @@ class ShapeCrightArrowCallout : public CustomShapeProvider
             "?12 +?11 -0",
             "?12 +?10 -0",
             "?0 *?6 /100000",
-            "logwidth+0-?17 ",
             "logwidth*?9 /100000",
-            "?19 *1/2",
-            "logwidth",
-            "logheight"
+            "logwidth+0-?18 ",
+            "(?19 +logwidth)/2",
+            "logheight",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -593,7 +1323,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 14
+                    17, 14
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -626,9 +1356,9 @@ class ShapeCrightArrowCallout : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 13
+                    0, 13
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -663,7 +1393,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    18, 0
+                    17, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -698,7 +1428,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 22
+                    19, 21
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -740,43 +1470,43 @@ class ShapeCrightArrowCallout : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    19, 0
+                    0, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 14
+                    17, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 14
+                    17, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 13
+                    19, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    19, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 12
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    22, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 16
+                    22, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 15
+                    19, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -786,12 +1516,12 @@ class ShapeCrightArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 22
+                    17, 15
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 22
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 16
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -815,9 +1545,9 @@ class ShapeCrightArrowCallout : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
+                        EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        19, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -826,7 +1556,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        19, 22
+                        22, 21
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -844,7 +1574,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-rightArrowCallout"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftArrowCallout"));
 
     return aPropertyMap;
   }
@@ -852,7 +1582,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCrightBrace : public CustomShapeProvider
+class ShapeCleftBrace : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -883,32 +1613,31 @@ class ShapeCrightBrace : public CustomShapeProvider
             "if(0-$0 ,0,if(?5 -$0 ,$0 ,?5 ))",
             "?4 *?6 /100000",
             "logheight*?0 /100000",
-            "?8 +0-?7 ",
-            "logheight+0-?7 ",
+            "?8 +?7 -0",
             "logwidth/2",
-            "?11 *cos(pi*(2700000)/10800000)",
+            "?10 *cos(pi*(2700000)/10800000)",
             "?7 *sin(pi*(2700000)/10800000)",
-            "0+?12 -0",
-            "?7 +0-?13 ",
-            "logheight+?13 -?7 ",
+            "logwidth+0-?11 ",
+            "?7 +0-?12 ",
+            "logheight+?12 -?7 ",
             "logwidth/2",
             "logwidth",
             "logheight",
-            "(16200000)/60000.0",
             "(5400000)/60000.0",
-            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
             "(-5400000)/60000.0",
-            "(16200000)/60000.0",
+            "(5400000)/60000.0",
             "(-5400000)/60000.0",
-            "(0)/60000.0",
+            "(10800000)/60000.0",
             "(5400000)/60000.0",
-            "(16200000)/60000.0",
             "(5400000)/60000.0",
-            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
             "(-5400000)/60000.0",
-            "(16200000)/60000.0",
+            "(5400000)/60000.0",
             "(-5400000)/60000.0",
-            "(0)/60000.0",
+            "(10800000)/60000.0",
             "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
@@ -923,7 +1652,7 @@ class ShapeCrightBrace : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 7
+                    16, 7
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -956,9 +1685,9 @@ class ShapeCrightBrace : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    18, 8
+                    0, 8
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -999,114 +1728,114 @@ class ShapeCrightBrace : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 7
+                    10, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 21
+                    19, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 9
+                    16, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 7
+                    10, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
+                    21, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 7
+                    10, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 25
+                    23, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 10
+                    16, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 7
+                    10, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 27
+                    25, 26
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 7
+                    10, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 29
+                    27, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 9
+                    16, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 7
+                    10, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 31
+                    29, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 7
+                    10, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 33
+                    31, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 10
+                    16, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 7
+                    10, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    34, 35
+                    33, 34
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1143,9 +1872,9 @@ class ShapeCrightBrace : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 15
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        13, 14
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1154,7 +1883,7 @@ class ShapeCrightBrace : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        14, 16
+                        17, 15
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -1172,7 +1901,7 @@ class ShapeCrightBrace : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-rightBrace"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftBrace"));
 
     return aPropertyMap;
   }
@@ -1180,20 +1909,86 @@ class ShapeCrightBrace : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCchartPlus : public CustomShapeProvider
+class ShapeCleftBracket : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 8333);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
-        aPropertyMap.setProperty(PROP_Equations, Sequence< OUString >(0));
+        static const char *aStrings[] = {
+            "min(logwidth,logheight)",
+            "50000*logheight/?0 ",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "?0 *?2 /100000",
+            "logheight+0-?3 ",
+            "logwidth*cos(pi*(2700000)/10800000)",
+            "?3 *sin(pi*(2700000)/10800000)",
+            "logwidth+0-?5 ",
+            "?3 +0-?6 ",
+            "logheight+?6 -?3 ",
+            "logwidth",
+            "logheight/2",
+            "logheight",
+            "logwidth",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 3
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 1);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -1207,154 +2002,64 @@ class ShapeCchartPlus : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 12
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 10
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 5
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 5
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 10
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    16, 17
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 10
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 12
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                6,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                7,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (2);
-            {
-                awt::Size aSize;
-                aSize.Width = 10;
-                aSize.Height = 10;
-                aSizeSequence [0] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 10;
-                aSize.Height = 10;
-                aSizeSequence [1] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 400000;
-        aRectangle.Height = 400000;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-chartPlus"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCflowChartManualInput : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "logwidth/2",
-            "logheight/10",
-            "logheight/2",
-            "logheight",
-            "logwidth",
-            "logheight/5"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (4);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 3
+                },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 5
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 5
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 21
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1364,34 +2069,32 @@ class ShapeCflowChartManualInput : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
+                17,1,
+                2,1,
+                17,1,
                 4,0,
+                7,0,
+                5,0,
+                1,1,
+                17,1,
+                2,1,
+                17,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 5;
-                aSize.Height = 5;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 5
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        7, 8
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1400,13 +2103,13 @@ class ShapeCflowChartManualInput : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 3
+                        10, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -1418,7 +2121,7 @@ class ShapeCflowChartManualInput : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartManualInput"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftBracket"));
 
     return aPropertyMap;
   }
@@ -1426,27 +2129,351 @@ class ShapeCflowChartManualInput : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartMerge : public CustomShapeProvider
+class ShapeCleftCircularArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (5);
+        {
+            Any aAny ((sal_Int32) 12500);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) -1142319);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 1142319);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) 10800000);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
+        {
+            Any aAny ((sal_Int32) 12500);
+            aAdjSequence [4].Value = aAny;
+            aAdjSequence [4].Name = "adj5";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logwidth*3/4",
+            "if(0-$4 ,0,if(25000-$4 ,$4 ,25000))",
+            "?0 *2/1",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "if(1-$2 ,1,if(21599999-$2 ,$2 ,21599999))",
+            "if(0-$3 ,0,if(21599999-$3 ,$3 ,21599999))",
+            "min(logwidth,logheight)",
+            "?5 *?2 /100000",
+            "?5 *?0 /100000",
+            "?6 *1/2",
             "logwidth/2",
-            "logwidth/4",
+            "?9 +?8 -?7 ",
             "logheight/2",
-            "logheight"
+            "?11 +?8 -?7 ",
+            "?10 +0-?6 ",
+            "?12 +0-?6 ",
+            "?13 +?8 -0",
+            "?14 +?8 -0",
+            "?15 *sin(pi*(?3 )/10800000)",
+            "?16 *cos(pi*(?3 )/10800000)",
+            "?15 *(cos(atan2(?17 ,?18 )))",
+            "?16 *(sin(atan2(?17 ,?18 )))",
+            "logwidth/2",
+            "?21 +?19 -0",
+            "logheight/2",
+            "?23 +?20 -0",
+            "min(?13 ,?14 )",
+            "?19 *?19 /1",
+            "?20 *?20 /1",
+            "?25 *?25 /1",
+            "?26 +0-?28 ",
+            "?27 +0-?28 ",
+            "?29 *?30 /?26 ",
+            "?31 *1/?27 ",
+            "1+0-?32 ",
+            "sqrt(?33 )",
+            "?29 *1/?19 ",
+            "?35 *1/?20 ",
+            "(1+?34 )/?36 ",
+            "(10800000*atan2(?37 ,1))/pi",
+            "?38 +21600000-0",
+            "if(?38 ,?38 ,?39 )",
+            "?40 +0-?3 ",
+            "?41 +21600000-0",
+            "if(?41 ,?41 ,?42 )",
+            "?43 +0-10800000",
+            "?43 +0-21600000",
+            "if(?44 ,?45 ,?43 )",
+            "abs(?46 )",
+            "?47 *-1/1",
+            "abs($1 )",
+            "?49 *-1/1",
+            "if(?48 -?50 ,?48 ,if(0-?50 ,?50 ,0))",
+            "?3 +?51 -0",
+            "?15 *sin(pi*(?52 )/10800000)",
+            "?16 *cos(pi*(?52 )/10800000)",
+            "?15 *(cos(atan2(?53 ,?54 )))",
+            "?16 *(sin(atan2(?53 ,?54 )))",
+            "?21 +?55 -0",
+            "?23 +?56 -0",
+            "?10 *sin(pi*(?4 )/10800000)",
+            "?12 *cos(pi*(?4 )/10800000)",
+            "?10 *(cos(atan2(?59 ,?60 )))",
+            "?12 *(sin(atan2(?59 ,?60 )))",
+            "?21 +?61 -0",
+            "?23 +?62 -0",
+            "?13 *sin(pi*(?4 )/10800000)",
+            "?14 *cos(pi*(?4 )/10800000)",
+            "?13 *(cos(atan2(?65 ,?66 )))",
+            "?14 *(sin(atan2(?65 ,?66 )))",
+            "?21 +?67 -0",
+            "?23 +?68 -0",
+            "?7 *cos(pi*(?52 )/10800000)",
+            "?7 *sin(pi*(?52 )/10800000)",
+            "?22 +?71 -0",
+            "?24 +?72 -0",
+            "?7 *cos(pi*(?52 )/10800000)",
+            "?7 *sin(pi*(?52 )/10800000)",
+            "?22 +0-?75 ",
+            "?24 +0-?76 ",
+            "?77 +0-?21 ",
+            "?78 +0-?23 ",
+            "?73 +0-?21 ",
+            "?74 +0-?23 ",
+            "min(?10 ,?12 )",
+            "?79 *?83 /?10 ",
+            "?80 *?83 /?12 ",
+            "?81 *?83 /?10 ",
+            "?82 *?83 /?12 ",
+            "?86 +0-?84 ",
+            "?87 +0-?85 ",
+            "sqrt(?88 *?88 +?89 *?89 +0*0)",
+            "?84 *?87 /1",
+            "?86 *?85 /1",
+            "?91 +0-?92 ",
+            "?83 *?83 /1",
+            "?90 *?90 /1",
+            "?94 *?95 /1",
+            "?93 *?93 /1",
+            "?96 +0-?97 ",
+            "max(?98 ,0)",
+            "sqrt(?99 )",
+            "?89 *-1/1",
+            "if(?101 ,-1,1)",
+            "?102 *?88 /1",
+            "?103 *?100 /1",
+            "?93 *?89 /1",
+            "(?105 +?104 )/?95 ",
+            "?105 +0-?104 ",
+            "?107 *1/?95 ",
+            "abs(?89 )",
+            "?109 *?100 /1",
+            "?93 *?88 /-1",
+            "(?111 +?110 )/?95 ",
+            "?111 +0-?110 ",
+            "?113 *1/?95 ",
+            "?86 +0-?106 ",
+            "?86 +0-?108 ",
+            "?87 +0-?112 ",
+            "?87 +0-?114 ",
+            "sqrt(?115 *?115 +?117 *?117 +0*0)",
+            "sqrt(?116 *?116 +?118 *?118 +0*0)",
+            "?120 +0-?119 ",
+            "if(?121 ,?106 ,?108 )",
+            "if(?121 ,?112 ,?114 )",
+            "?122 *?10 /?83 ",
+            "?123 *?12 /?83 ",
+            "?21 +?124 -0",
+            "?23 +?125 -0",
+            "?79 *?25 /?13 ",
+            "?80 *?25 /?14 ",
+            "?81 *?25 /?13 ",
+            "?82 *?25 /?14 ",
+            "?130 +0-?128 ",
+            "?131 +0-?129 ",
+            "sqrt(?132 *?132 +?133 *?133 +0*0)",
+            "?128 *?131 /1",
+            "?130 *?129 /1",
+            "?135 +0-?136 ",
+            "?25 *?25 /1",
+            "?134 *?134 /1",
+            "?138 *?139 /1",
+            "?137 *?137 /1",
+            "?140 +0-?141 ",
+            "max(?142 ,0)",
+            "sqrt(?143 )",
+            "?102 *?132 /1",
+            "?145 *?144 /1",
+            "?137 *?133 /1",
+            "(?147 +?146 )/?139 ",
+            "?147 +0-?146 ",
+            "?149 *1/?139 ",
+            "abs(?133 )",
+            "?151 *?144 /1",
+            "?137 *?132 /-1",
+            "(?153 +?152 )/?139 ",
+            "?153 +0-?152 ",
+            "?155 *1/?139 ",
+            "?128 +0-?148 ",
+            "?128 +0-?150 ",
+            "?129 +0-?154 ",
+            "?129 +0-?156 ",
+            "sqrt(?157 *?157 +?159 *?159 +0*0)",
+            "sqrt(?158 *?158 +?160 *?160 +0*0)",
+            "?162 +0-?161 ",
+            "if(?163 ,?148 ,?150 )",
+            "if(?163 ,?154 ,?156 )",
+            "?164 *?13 /?25 ",
+            "?165 *?14 /?25 ",
+            "?21 +?166 -0",
+            "?23 +?167 -0",
+            "(10800000*atan2(?167 ,?166 ))/pi",
+            "?170 +21600000-0",
+            "if(?170 ,?170 ,?171 )",
+            "?4 +0-?172 ",
+            "?173 +21600000-0",
+            "if(?173 ,?173 ,?174 )",
+            "?172 +?175 -0",
+            "0+0-?175 ",
+            "?126 +0-?168 ",
+            "?127 +0-?169 ",
+            "sqrt(?178 *?178 +?179 *?179 +0*0)",
+            "?180 *1/2",
+            "?181 +0-?7 ",
+            "if(?182 ,?126 ,?73 )",
+            "if(?182 ,?127 ,?74 )",
+            "if(?182 ,?168 ,?77 )",
+            "if(?182 ,?169 ,?78 )",
+            "(10800000*atan2(?125 ,?124 ))/pi",
+            "?187 +21600000-0",
+            "if(?187 ,?187 ,?188 )",
+            "?189 +0-?4 ",
+            "?190 +0-21600000",
+            "if(?190 ,?191 ,?190 )",
+            "?4 +?192 -0",
+            "0+0-?192 ",
+            "?15 *sin(pi*(?4 )/10800000)",
+            "?16 *cos(pi*(?4 )/10800000)",
+            "?15 *(cos(atan2(?195 ,?196 )))",
+            "?16 *(sin(atan2(?195 ,?196 )))",
+            "?21 +?197 -0",
+            "?23 +?198 -0",
+            "?4 +5400000-0",
+            "?52 +0-5400000",
+            "?52 +10800000-0",
+            "?10 *cos(pi*(2700000)/10800000)",
+            "?12 *sin(pi*(2700000)/10800000)",
+            "?21 +0-?204 ",
+            "?21 +?204 -0",
+            "?23 +0-?205 ",
+            "?23 +?205 -0",
+            "(?176 )/60000.0",
+            "(?177 )/60000.0",
+            "(?193 )/60000.0",
+            "(?194 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
+        {
+            Sequence< PropertyValue > aPropSequence (1);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    57, 58
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (1);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    63, 64
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (3);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    126, 127
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RadiusRangeMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 1);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RadiusRangeMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (3);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    77, 78
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RadiusRangeMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 25000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RadiusRangeMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            aPropSequenceSequence [3] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -1455,24 +2482,59 @@ class ShapeCflowChartMerge : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (3);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    63, 64
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    69, 70
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 14
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    210, 211
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    185, 186
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    57, 58
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    183, 184
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    126, 127
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 12
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    212, 213
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1482,25 +2544,17 @@ class ShapeCflowChartMerge : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,2,
+                2,1,
+                17,1,
+                2,4,
+                17,1,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 2;
-                aSize.Height = 2;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -1508,8 +2562,8 @@ class ShapeCflowChartMerge : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        2, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        206, 208
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1518,84 +2572,13 @@ class ShapeCflowChartMerge : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 3
+                        207, 209
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartMerge"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCline : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "logwidth",
-            "logheight"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (2);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 1
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,1,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -1607,7 +2590,7 @@ class ShapeCline : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-line"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftCircularArrow"));
 
     return aPropertyMap;
   }
@@ -1615,7 +2598,7 @@ class ShapeCline : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCdownArrow : public CustomShapeProvider
+class ShapeCleftRightArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -1638,20 +2621,21 @@ class ShapeCdownArrow : public CustomShapeProvider
     {
         static const char *aStrings[] = {
             "min(logwidth,logheight)",
-            "100000*logheight/?0 ",
+            "50000*logwidth/?0 ",
             "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
             "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
             "?0 *?3 /100000",
-            "logheight+0-?4 ",
-            "logwidth*?2 /200000",
-            "logwidth/2",
+            "logwidth+0-?4 ",
+            "logheight*?2 /200000",
+            "logheight/2",
             "?7 +0-?6 ",
             "?7 +?6 -0",
-            "logwidth/2",
+            "logheight/2",
             "?8 *?4 /?10 ",
+            "?4 +0-?11 ",
             "?5 +?11 -0",
-            "logheight",
-            "logwidth"
+            "logwidth",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -1664,13 +2648,13 @@ class ShapeCdownArrow : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 8
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 100000);
                 aParameter.Value = aAny;
@@ -1678,7 +2662,7 @@ class ShapeCdownArrow : public CustomShapeProvider
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -1686,7 +2670,7 @@ class ShapeCdownArrow : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -1698,14 +2682,14 @@ class ShapeCdownArrow : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 5
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
@@ -1713,7 +2697,7 @@ class ShapeCdownArrow : public CustomShapeProvider
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -1721,7 +2705,7 @@ class ShapeCdownArrow : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 1);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -1743,37 +2727,52 @@ class ShapeCdownArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 5
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 5
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    9, 0
+                    5, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 5
+                    14, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 5
+                    5, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 13
+                    5, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 15
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1783,7 +2782,7 @@ class ShapeCdownArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,6,
+                2,9,
                 4,0,
                 5,0
             };
@@ -1798,8 +2797,8 @@ class ShapeCdownArrow : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        8, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        12, 8
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1808,7 +2807,7 @@ class ShapeCdownArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        9, 12
+                        13, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -1826,7 +2825,7 @@ class ShapeCdownArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-downArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftRightArrow"));
 
     return aPropertyMap;
   }
@@ -1834,21 +2833,21 @@ class ShapeCdownArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcurvedDownArrow : public CustomShapeProvider
+class ShapeCleftRightArrowCallout : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
         {
             Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
@@ -1857,77 +2856,46 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
             aAdjSequence [2].Value = aAny;
             aAdjSequence [2].Name = "adj3";
         }
+        {
+            Any aAny ((sal_Int32) 48123);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
             "min(logwidth,logheight)",
-            "50000*logwidth/?0 ",
+            "50000*logheight/?0 ",
             "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
-            "?0 *?3 /100000",
+            "?2 *2/1",
+            "if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))",
+            "50000*logwidth/?0 ",
+            "if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))",
+            "logwidth/2",
+            "?6 *?0 /?7 ",
+            "100000+0-?8 ",
+            "if(0-$3 ,0,if(?9 -$3 ,$3 ,?9 ))",
             "?0 *?2 /100000",
-            "(?4 +?5 )/4",
+            "?0 *?4 /200000",
+            "logheight/2",
+            "?13 +0-?11 ",
+            "?13 +0-?12 ",
+            "?13 +?12 -0",
+            "?13 +?11 -0",
+            "?0 *?6 /100000",
+            "logwidth+0-?18 ",
+            "logwidth*?10 /200000",
             "logwidth/2",
-            "?7 +0-?6 ",
-            "?8 *2/1",
-            "?9 *?9 /1",
-            "?4 *?4 /1",
-            "?10 +0-?11 ",
-            "sqrt(?12 )",
-            "?13 *logheight/?9 ",
-            "100000*?14 /?0 ",
-            "if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))",
-            "?0 *$2 /100000",
-            "?8 +?4 -0",
-            "logheight*logheight/1",
-            "?17 *?17 /1",
-            "?19 +0-?20 ",
-            "sqrt(?21 )",
-            "?22 *?8 /logheight",
-            "?8 +?23 -0",
-            "?18 +?23 -0",
-            "?5 +0-?4 ",
-            "?26 *1/2",
-            "?24 +0-?27 ",
-            "?25 +?27 -0",
-            "?5 *1/2",
-            "logwidth+0-?30 ",
-            "logheight+0-?17 ",
-            "(10800000*atan2(?23 ,?17 ))/pi",
-            "0+0-?33 ",
-            "logheight+0-?14 ",
-            "(?8 +?18 )/2",
-            "?4 *1/2",
-            "(10800000*atan2(?37 ,?14 ))/pi",
-            "16200000+?33 -0",
-            "16200000+0-?38 ",
-            "?38 +0-5400000",
-            "5400000+?38 -0",
-            "logheight",
-            "logwidth",
+            "?21 +0-?20 ",
+            "?21 +?20 -0",
             "logheight",
-            "(?39 )/60000.0",
-            "(?34 )/60000.0",
-            "(16200000)/60000.0",
-            "(?33 )/60000.0",
-            "(?40 )/60000.0",
-            "(?41 )/60000.0",
-            "(10800000)/60000.0",
-            "(?42 )/60000.0",
-            "(?40 )/60000.0",
-            "(?41 )/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(?33 )/60000.0",
-            "(?39 )/60000.0",
-            "(?34 )/60000.0"
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -1936,20 +2904,20 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 32
+                    18, 15
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 3);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::ADJUSTMENT;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -1957,7 +2925,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -1969,14 +2937,14 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 43
+                    0, 14
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
@@ -1984,7 +2952,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -1992,7 +2960,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 1);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -2005,21 +2973,21 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    44, 32
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 15);
+                Any aAny ((sal_Int32) 5);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -2027,12 +2995,47 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 2);
                 aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [2] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 24
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 9);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [3] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -2047,154 +3050,94 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    31, 43
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 45
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    46, 47
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    18, 0
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 45
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    48, 49
+                    0, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 32
+                    18, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    36, 35
+                    18, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 45
+                    22, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    50, 51
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 43
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 45
+                    22, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    52, 53
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    36, 35
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    23, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 45
+                    23, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    54, 55
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 43
+                    19, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 45
+                    19, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    56, 57
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18, 0
+                    25, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 45
+                    19, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    58, 59
+                    19, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 32
+                    23, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 43
+                    23, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 32
+                    22, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 32
+                    22, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 45
+                    18, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    60, 61
+                    18, 17
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2204,31 +3147,8 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,2,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
+                2,17,
                 4,0,
-                7,0,
-                5,0,
-                1,1,
-                17,1,
-                2,1,
-                17,1,
-                4,0,
-                19,0,
-                7,0,
-                5,0,
-                1,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,4,
-                17,1,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -2241,9 +3161,9 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
+                        EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        22, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -2252,7 +3172,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        44, 43
+                        23, 24
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -2270,7 +3190,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedDownArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftRightArrowCallout"));
 
     return aPropertyMap;
   }
@@ -2278,407 +3198,447 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCactionButtonReturn : public CustomShapeProvider
+class ShapeCleftRightCircularArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (5);
+        {
+            Any aAny ((sal_Int32) 12500);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 1142319);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 20457681);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) 11942319);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
+        {
+            Any aAny ((sal_Int32) 12500);
+            aAdjSequence [4].Value = aAny;
+            aAdjSequence [4].Name = "adj5";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
+            "if(0-$4 ,0,if(25000-$4 ,$4 ,25000))",
+            "?0 *2/1",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "if(1-$2 ,1,if(21599999-$2 ,$2 ,21599999))",
+            "if(0-$3 ,0,if(21599999-$3 ,$3 ,21599999))",
             "min(logwidth,logheight)",
-            "?0 *3/8",
+            "?5 *?2 /100000",
+            "?5 *?0 /100000",
+            "?6 *1/2",
+            "logwidth/2",
+            "?9 +?8 -?7 ",
             "logheight/2",
-            "?2 +0-?1 ",
-            "?2 +?1 -0",
+            "?11 +?8 -?7 ",
+            "?10 +0-?6 ",
+            "?12 +0-?6 ",
+            "?13 +?8 -0",
+            "?14 +?8 -0",
+            "?15 *sin(pi*(?3 )/10800000)",
+            "?16 *cos(pi*(?3 )/10800000)",
+            "?15 *(cos(atan2(?17 ,?18 )))",
+            "?16 *(sin(atan2(?17 ,?18 )))",
             "logwidth/2",
-            "?5 +0-?1 ",
-            "?5 +?1 -0",
-            "?0 *3/4",
-            "?8 *7/8",
-            "?8 *3/4",
-            "?8 *5/8",
-            "?8 *3/8",
-            "?8 *1/4",
-            "?3 +?10 -0",
-            "?3 +?11 -0",
-            "?3 +?13 -0",
-            "?6 +?9 -0",
-            "?6 +?10 -0",
-            "?6 +?11 -0",
-            "?6 +?12 -0",
-            "?6 +?13 -0",
-            "?8 *1/8",
-            "logwidth",
-            "logheight",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(-5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(-5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(-5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0"
+            "?21 +?19 -0",
+            "logheight/2",
+            "?23 +?20 -0",
+            "min(?13 ,?14 )",
+            "?19 *?19 /1",
+            "?20 *?20 /1",
+            "?25 *?25 /1",
+            "?26 +0-?28 ",
+            "?27 +0-?28 ",
+            "?29 *?30 /?26 ",
+            "?31 *1/?27 ",
+            "1+0-?32 ",
+            "sqrt(?33 )",
+            "?29 *1/?19 ",
+            "?35 *1/?20 ",
+            "(1+?34 )/?36 ",
+            "(10800000*atan2(?37 ,1))/pi",
+            "?38 +21600000-0",
+            "if(?38 ,?38 ,?39 )",
+            "?40 +0-?3 ",
+            "?41 +21600000-0",
+            "if(?41 ,?41 ,?42 )",
+            "?43 +0-10800000",
+            "?43 +0-21600000",
+            "if(?44 ,?45 ,?43 )",
+            "abs(?46 )",
+            "if(0-$1 ,0,if(?47 -$1 ,$1 ,?47 ))",
+            "?3 +?48 -0",
+            "?15 *sin(pi*(?49 )/10800000)",
+            "?16 *cos(pi*(?49 )/10800000)",
+            "?15 *(cos(atan2(?50 ,?51 )))",
+            "?16 *(sin(atan2(?50 ,?51 )))",
+            "?21 +?52 -0",
+            "?23 +?53 -0",
+            "?7 *cos(pi*(?49 )/10800000)",
+            "?7 *sin(pi*(?49 )/10800000)",
+            "?22 +?56 -0",
+            "?24 +?57 -0",
+            "?7 *cos(pi*(?49 )/10800000)",
+            "?7 *sin(pi*(?49 )/10800000)",
+            "?22 +0-?60 ",
+            "?24 +0-?61 ",
+            "?62 +0-?21 ",
+            "?63 +0-?23 ",
+            "?58 +0-?21 ",
+            "?59 +0-?23 ",
+            "min(?10 ,?12 )",
+            "?64 *?68 /?10 ",
+            "?65 *?68 /?12 ",
+            "?66 *?68 /?10 ",
+            "?67 *?68 /?12 ",
+            "?71 +0-?69 ",
+            "?72 +0-?70 ",
+            "sqrt(?73 *?73 +?74 *?74 +0*0)",
+            "?69 *?72 /1",
+            "?71 *?70 /1",
+            "?76 +0-?77 ",
+            "?68 *?68 /1",
+            "?75 *?75 /1",
+            "?79 *?80 /1",
+            "?78 *?78 /1",
+            "?81 +0-?82 ",
+            "max(?83 ,0)",
+            "sqrt(?84 )",
+            "?74 *-1/1",
+            "if(?86 ,-1,1)",
+            "?87 *?73 /1",
+            "?88 *?85 /1",
+            "?78 *?74 /1",
+            "(?90 +?89 )/?80 ",
+            "?90 +0-?89 ",
+            "?92 *1/?80 ",
+            "abs(?74 )",
+            "?94 *?85 /1",
+            "?78 *?73 /-1",
+            "(?96 +?95 )/?80 ",
+            "?96 +0-?95 ",
+            "?98 *1/?80 ",
+            "?71 +0-?91 ",
+            "?71 +0-?93 ",
+            "?72 +0-?97 ",
+            "?72 +0-?99 ",
+            "sqrt(?100 *?100 +?102 *?102 +0*0)",
+            "sqrt(?101 *?101 +?103 *?103 +0*0)",
+            "?105 +0-?104 ",
+            "if(?106 ,?91 ,?93 )",
+            "if(?106 ,?97 ,?99 )",
+            "?107 *?10 /?68 ",
+            "?108 *?12 /?68 ",
+            "?21 +?109 -0",
+            "?23 +?110 -0",
+            "?64 *?25 /?13 ",
+            "?65 *?25 /?14 ",
+            "?66 *?25 /?13 ",
+            "?67 *?25 /?14 ",
+            "?115 +0-?113 ",
+            "?116 +0-?114 ",
+            "sqrt(?117 *?117 +?118 *?118 +0*0)",
+            "?113 *?116 /1",
+            "?115 *?114 /1",
+            "?120 +0-?121 ",
+            "?25 *?25 /1",
+            "?119 *?119 /1",
+            "?123 *?124 /1",
+            "?122 *?122 /1",
+            "?125 +0-?126 ",
+            "max(?127 ,0)",
+            "sqrt(?128 )",
+            "?87 *?117 /1",
+            "?130 *?129 /1",
+            "?122 *?118 /1",
+            "(?132 +?131 )/?124 ",
+            "?132 +0-?131 ",
+            "?134 *1/?124 ",
+            "abs(?118 )",
+            "?136 *?129 /1",
+            "?122 *?117 /-1",
+            "(?138 +?137 )/?124 ",
+            "?138 +0-?137 ",
+            "?140 *1/?124 ",
+            "?113 +0-?133 ",
+            "?113 +0-?135 ",
+            "?114 +0-?139 ",
+            "?114 +0-?141 ",
+            "sqrt(?142 *?142 +?144 *?144 +0*0)",
+            "sqrt(?143 *?143 +?145 *?145 +0*0)",
+            "?147 +0-?146 ",
+            "if(?148 ,?133 ,?135 )",
+            "if(?148 ,?139 ,?141 )",
+            "?149 *?13 /?25 ",
+            "?150 *?14 /?25 ",
+            "?21 +?151 -0",
+            "?23 +?152 -0",
+            "?15 *sin(pi*(?4 )/10800000)",
+            "?16 *cos(pi*(?4 )/10800000)",
+            "?15 *(cos(atan2(?155 ,?156 )))",
+            "?16 *(sin(atan2(?155 ,?156 )))",
+            "?21 +?157 -0",
+            "?23 +?158 -0",
+            "?4 +0-?48 ",
+            "?15 *sin(pi*(?161 )/10800000)",
+            "?16 *cos(pi*(?161 )/10800000)",
+            "?15 *(cos(atan2(?162 ,?163 )))",
+            "?16 *(sin(atan2(?162 ,?163 )))",
+            "?21 +?164 -0",
+            "?23 +?165 -0",
+            "?7 *cos(pi*(?161 )/10800000)",
+            "?7 *sin(pi*(?161 )/10800000)",
+            "?159 +?168 -0",
+            "?160 +?169 -0",
+            "?7 *cos(pi*(?161 )/10800000)",
+            "?7 *sin(pi*(?161 )/10800000)",
+            "?159 +0-?172 ",
+            "?160 +0-?173 ",
+            "?111 +0-?153 ",
+            "?112 +0-?154 ",
+            "sqrt(?176 *?176 +?177 *?177 +0*0)",
+            "?178 *1/2",
+            "?179 +0-?7 ",
+            "if(?180 ,?111 ,?58 )",
+            "if(?180 ,?112 ,?59 )",
+            "if(?180 ,?153 ,?62 )",
+            "if(?180 ,?154 ,?63 )",
+            "(10800000*atan2(?110 ,?109 ))/pi",
+            "?185 +21600000-0",
+            "if(?185 ,?185 ,?186 )",
+            "?187 +0-?3 ",
+            "?188 +21600000-0",
+            "if(?188 ,?188 ,?189 )",
+            "?4 +0-?190 ",
+            "?191 +21600000-0",
+            "if(?191 ,?191 ,?192 )",
+            "?187 +0-?193 ",
+            "?194 +21600000-0",
+            "if(?194 ,?194 ,?195 )",
+            "(10800000*atan2(?152 ,?151 ))/pi",
+            "?197 +21600000-0",
+            "if(?197 ,?197 ,?198 )",
+            "?199 +0-?3 ",
+            "?200 +0-21600000",
+            "if(?200 ,?201 ,?200 )",
+            "?4 +0-?202 ",
+            "?203 +0-21600000",
+            "if(?204 ,?204 ,?203 )",
+            "?205 +0-?199 ",
+            "?206 +0-21600000",
+            "if(?206 ,?207 ,?206 )",
+            "?10 *sin(pi*(?193 )/10800000)",
+            "?12 *cos(pi*(?193 )/10800000)",
+            "?10 *(cos(atan2(?209 ,?210 )))",
+            "?12 *(sin(atan2(?209 ,?210 )))",
+            "?21 +?211 -0",
+            "?23 +?212 -0",
+            "?13 *sin(pi*(?205 )/10800000)",
+            "?14 *cos(pi*(?205 )/10800000)",
+            "?13 *(cos(atan2(?215 ,?216 )))",
+            "?14 *(sin(atan2(?215 ,?216 )))",
+            "?21 +?217 -0",
+            "?23 +?218 -0",
+            "if(?180 ,?213 ,?170 )",
+            "if(?180 ,?214 ,?171 )",
+            "if(?180 ,?219 ,?174 )",
+            "if(?180 ,?220 ,?175 )",
+            "?161 +0-5400000",
+            "?49 +5400000-0",
+            "?49 +10800000-0",
+            "?161 +10800000-0",
+            "?10 *cos(pi*(2700000)/10800000)",
+            "?12 *sin(pi*(2700000)/10800000)",
+            "?21 +0-?229 ",
+            "?21 +?229 -0",
+            "?23 +0-?230 ",
+            "?23 +?230 -0",
+            "(?193 )/60000.0",
+            "(?196 )/60000.0",
+            "(?199 )/60000.0",
+            "(?208 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
         {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    23, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    18, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 14
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 12
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    29, 30
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 12
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    31, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    18, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    33, 34
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    20, 14
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    22, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    35, 36
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 12
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    37, 38
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 12
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    39, 40
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 12
-                },
+            Sequence< PropertyValue > aPropSequence (1);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    41, 42
-                },
+                    54, 55
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (1);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 4
-                },
+                    213, 214
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (3);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 12
-                },
+                    111, 112
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RadiusRangeMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 1);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RadiusRangeMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (3);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    43, 44
-                },
+                    62, 63
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RadiusRangeMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 25000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RadiusRangeMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            aPropSequenceSequence [3] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 16
+                    166, 167
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 16
+                    221, 222
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 15
+                    213, 214
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 22
+                    10, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    45, 46
+                    235, 236
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 14
+                    181, 182
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 22
+                    54, 55
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    47, 48
+                    183, 184
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 16
+                    153, 154
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 16
+                    13, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    237, 238
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    23, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 24
+                    223, 224
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2688,52 +3648,12 @@ class ShapeCactionButtonReturn : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
-                4,0,
-                1,1,
-                2,4,
-                17,1,
-                2,1,
-                17,1,
-                2,3,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,4,
-                17,1,
-                2,1,
-                17,1,
-                2,3,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                4,0,
-                18,0,
-                7,0,
-                5,0,
-                1,1,
                 2,2,
                 17,1,
-                2,1,
-                17,1,
-                2,3,
+                2,4,
                 17,1,
                 2,1,
-                17,1,
-                2,3,
-                4,0,
-                6,0,
-                5,0,
-                1,1,
-                2,3,
                 4,0,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -2746,9 +3666,9 @@ class ShapeCactionButtonReturn : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        231, 233
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -2757,7 +3677,7 @@ class ShapeCactionButtonReturn : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        23, 24
+                        232, 234
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -2775,7 +3695,7 @@ class ShapeCactionButtonReturn : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonReturn"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftRightCircularArrow"));
 
     return aPropertyMap;
   }
@@ -2783,201 +3703,102 @@ class ShapeCactionButtonReturn : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartInputOutput : public CustomShapeProvider
+class ShapeCleftRightRibbon : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "logwidth*2/5",
-            "logwidth*3/5",
-            "logwidth*4/5",
-            "logwidth*9/10",
-            "logwidth/2",
-            "logwidth/10",
-            "logheight/2",
-            "logheight",
-            "logwidth/5"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (4);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4, 5
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,3,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 5;
-                aSize.Height = 5;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
         }
         {
-            aPropSequence [3].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        8, 0
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        2, 7
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
         }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartInputOutput"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCbracketPair : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
             Any aAny ((sal_Int32) 16667);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "logwidth+0-?2 ",
-            "logheight+0-?2 ",
-            "?2 *29289/100000",
-            "logwidth+0-?5 ",
-            "logheight+0-?5 ",
+            "if(0-$2 ,0,if(33333-$2 ,$2 ,33333))",
+            "100000+0-?0 ",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
             "logwidth/2",
+            "logwidth/32",
+            "?3 +0-?4 ",
+            "min(logwidth,logheight)",
+            "100000*?5 /?6 ",
+            "if(0-$1 ,0,if(?7 -$1 ,$1 ,?7 ))",
+            "?6 *?8 /100000",
+            "logwidth+0-?9 ",
+            "logheight*?2 /200000",
+            "logheight*?0 /-200000",
             "logheight/2",
-            "logheight",
+            "?13 +?12 -?11 ",
+            "?13 +?11 -?12 ",
+            "?14 +?11 -0",
+            "logheight+0-?16 ",
+            "?16 *2/1",
+            "logheight+0-?18 ",
+            "?18 +0-?14 ",
+            "logheight+0-?20 ",
+            "?0 *?6 /400000",
+            "logwidth/2",
+            "?23 +0-?4 ",
+            "?23 +?4 -0",
+            "?14 +?22 -0",
+            "?21 +0-?22 ",
             "logwidth",
+            "logheight",
+            "(16200000)/60000.0",
             "(10800000)/60000.0",
-            "(5400000)/60000.0",
             "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
+            "(-10800000)/60000.0",
             "(5400000)/60000.0",
             "(5400000)/60000.0",
+            "(0)/60000.0",
             "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-10800000)/60000.0",
+            "(16200000)/60000.0",
             "(10800000)/60000.0",
-            "(5400000)/60000.0",
             "(16200000)/60000.0",
+            "(-10800000)/60000.0",
             "(5400000)/60000.0",
-            "(0)/60000.0",
             "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 21
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -2995,6 +3816,76 @@ class ShapeCbracketPair : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 7);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 21
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 33333);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -3011,504 +3902,242 @@ class ShapeCbracketPair : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    0, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
+                    23, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    30, 31
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
+                    4, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 4
+                    32, 33
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    10, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 17
+                    10, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 10
+                    28, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    10, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 19
+                    10, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 10
+                    23, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    4, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 21
+                    34, 35
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    9, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
+                    9, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 26
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    4, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 25
+                    36, 37
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 4
+                    4, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    38, 39
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 27
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                17,1,
-                2,1,
-                17,1,
-                1,1,
-                17,1,
-                2,1,
-                17,1,
-                6,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
+                    25, 21
+                },
                 {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        5, 5
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 16
+                },
                 {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        6, 7
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bracketPair"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCsmileyFace : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 4653);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
-    }
-    {
-        static const char *aStrings[] = {
-            "if(-4653-$0 ,-4653,if(4653-$0 ,$0 ,4653))",
-            "logwidth*4969/21699",
-            "logwidth*6215/21600",
-            "logwidth*13135/21600",
-            "logwidth*16640/21600",
-            "logheight*7570/21600",
-            "logheight*16515/21600",
-            "logheight*?0 /100000",
-            "?6 +0-?7 ",
-            "?6 +?7 -0",
-            "logheight*?0 /50000",
-            "?9 +?10 -0",
-            "logwidth/2",
-            "?12 *cos(pi*(2700000)/10800000)",
-            "logheight/2",
-            "?14 *sin(pi*(2700000)/10800000)",
-            "logwidth/2",
-            "?16 +0-?13 ",
-            "?16 +?13 -0",
-            "logheight/2",
-            "?19 +0-?15 ",
-            "?19 +?15 -0",
-            "logwidth*1125/21600",
-            "logheight*1125/21600",
-            "logheight",
-            "logwidth",
-            "(10800000)/60000.0",
-            "(21600000)/60000.0",
-            "(10800000)/60000.0",
-            "(21600000)/60000.0",
-            "(10800000)/60000.0",
-            "(21600000)/60000.0",
-            "(10800000)/60000.0",
-            "(21600000)/60000.0"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9, 0
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 9
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 4653);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -4653);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
+                    9, 14
+                },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 19
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 14
+                    4, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 27
+                    40, 41
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 5
+                    4, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
+                    42, 43
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 29
+                    10, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    10, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
+                    28, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 31
+                    10, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 8
+                    10, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 11
+                    23, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 8
+                    4, 22
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 19
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    44, 45
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 14
+                    24, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 33
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                17,1,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                17,1,
-                1,1,
-                17,1,
-                19,0,
-                5,0,
-                1,1,
-                16,1,
-                6,0,
-                5,0,
-                1,1,
-                17,1,
-                4,0,
-                6,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        17, 20
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
+                    9, 20
+                },
                 {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        18, 21
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-smileyFace"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCactionButtonBlank : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "logwidth",
-            "logheight/2",
-            "logwidth/2",
-            "logheight"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 18
+                },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 26
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    24, 27
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 20
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3519,7 +4148,32 @@ class ShapeCactionButtonBlank : public CustomShapeProvider
             // Command, Count
                 1,1,
                 2,3,
+                17,2,
+                2,6,
+                17,1,
+                2,3,
+                4,0,
+                7,0,
+                5,0,
+                1,1,
+                17,2,
+                2,1,
                 4,0,
+                19,0,
+                7,0,
+                5,0,
+                1,1,
+                2,3,
+                17,2,
+                2,6,
+                17,1,
+                2,3,
+                4,0,
+                1,1,
+                2,1,
+                1,1,
+                2,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -3532,9 +4186,9 @@ class ShapeCactionButtonBlank : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        9, 14
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3543,7 +4197,7 @@ class ShapeCactionButtonBlank : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 3
+                        10, 15
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -3561,7 +4215,7 @@ class ShapeCactionButtonBlank : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonBlank"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftRightRibbon"));
 
     return aPropertyMap;
   }
@@ -3569,88 +4223,85 @@ class ShapeCactionButtonBlank : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCwave : public CustomShapeProvider
+class ShapeCleftRightUpArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
         {
-            Any aAny ((sal_Int32) 12500);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 0);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(20000-$0 ,$0 ,20000))",
-            "if(-10000-$1 ,-10000,if(10000-$1 ,$1 ,10000))",
-            "logheight*?0 /100000",
-            "?2 *10/3",
-            "?2 +0-?3 ",
-            "?2 +?3 -0",
-            "logheight+0-?2 ",
-            "?6 +0-?3 ",
-            "?6 +?3 -0",
-            "logwidth*?1 /100000",
-            "logwidth*?1 /50000",
-            "abs(?9 )",
-            "if(?10 ,0,?10 )",
-            "0+0-?12 ",
-            "if(?10 ,?10 ,0)",
-            "logwidth+0-?14 ",
-            "(?12 +?15 )/3",
-            "?13 +?16 -0",
-            "(?17 +?15 )/2",
-            "0+?14 -0",
-            "logwidth+?12 -0",
-            "?19 +?16 -0",
-            "(?21 +?20 )/2",
-            "logwidth+0-?11 ",
+            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
+            "?0 *2/1",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "100000+0-?1 ",
+            "?3 *1/2",
+            "if(0-$2 ,0,if(?4 -$2 ,$2 ,?4 ))",
+            "min(logwidth,logheight)",
+            "?6 *?5 /100000",
+            "?6 *?0 /100000",
             "logwidth/2",
-            "?24 +?9 -0",
-            "?24 +0-?9 ",
-            "max(?13 ,?19 )",
-            "min(?15 ,?20 )",
-            "logheight*?0 /50000",
-            "logheight+0-?29 ",
-            "logheight",
-            "logheight/2"
+            "?9 +0-?8 ",
+            "?9 +?8 -0",
+            "?6 *?2 /200000",
+            "?9 +0-?12 ",
+            "?9 +?12 -0",
+            "logwidth+0-?7 ",
+            "?6 *?0 /50000",
+            "logheight+0-?16 ",
+            "logheight+0-?8 ",
+            "?18 +0-?12 ",
+            "?18 +?12 -0",
+            "?12 *?7 /?8 ",
+            "logwidth+0-?21 ",
+            "logwidth",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 7
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 20000);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -3658,7 +4309,7 @@ class ShapeCwave : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -3671,15 +4322,15 @@ class ShapeCwave : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 31
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 10000);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -3687,7 +4338,7 @@ class ShapeCwave : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -10000);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
@@ -3699,6 +4350,41 @@ class ShapeCwave : public CustomShapeProvider
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 7
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 4);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -3713,44 +4399,89 @@ class ShapeCwave : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    0, 18
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 7
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 7
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 4
+                    14, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 5
+                    14, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 2
+                    15, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 6
+                    23, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 8
+                    15, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 7
+                    15, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 6
+                    7, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 24
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3760,9 +4491,7 @@ class ShapeCwave : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                3,1,
-                2,1,
-                3,1,
+                2,16,
                 4,0,
                 5,0
             };
@@ -3778,7 +4507,7 @@ class ShapeCwave : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        27, 29
+                        21, 19
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3787,7 +4516,7 @@ class ShapeCwave : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        28, 30
+                        22, 20
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -3805,7 +4534,7 @@ class ShapeCwave : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-wave"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftRightUpArrow"));
 
     return aPropertyMap;
   }
@@ -3813,65 +4542,61 @@ class ShapeCwave : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCswooshArrow : public CustomShapeProvider
+class ShapeCleftUpArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
         {
             Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 16667);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(1-$0 ,1,if(75000-$0 ,$0 ,75000))",
+            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
+            "?0 *2/1",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "100000+0-?1 ",
+            "if(0-$2 ,0,if(?3 -$2 ,$2 ,?3 ))",
             "min(logwidth,logheight)",
-            "70000*logwidth/?1 ",
-            "if(0-$1 ,0,if(?2 -$1 ,$1 ,?2 ))",
-            "logheight*?0 /100000",
-            "?1 *?3 /100000",
-            "logwidth+0-?5 ",
-            "min(logwidth,logheight)/8",
-            "0+?7 -0",
-            "5400000*1/14",
-            "?7 *tan(pi*(?9 )/10800000)",
-            "?6 +0-?10 ",
-            "?4 *tan(pi*(?9 )/10800000)",
-            "?8 +?4 -0",
-            "?6 +?12 -0",
-            "?14 +?10 -0",
-            "?13 +?7 -0",
-            "?16 +0-0",
-            "?17 *1/2",
-            "logheight*1/20",
-            "0+?18 -?19 ",
-            "logheight/6",
-            "?21 *1/1",
-            "?21 +?22 -0",
-            "logwidth/6",
-            "?24 ",
-            "?21 *1/2",
-            "?13 +?26 -0",
-            "logwidth/4",
-            "?28 ",
+            "?5 *?4 /100000",
+            "?5 *?0 /50000",
+            "logwidth+0-?7 ",
+            "logheight+0-?7 ",
+            "?5 *?0 /100000",
+            "logwidth+0-?10 ",
+            "logheight+0-?10 ",
+            "?5 *?2 /200000",
+            "?11 +0-?13 ",
+            "?11 +?13 -0",
+            "?12 +0-?13 ",
+            "?12 +?13 -0",
+            "?13 *?6 /?10 ",
+            "(?6 +?15 )/2",
+            "(?6 +?17 )/2",
             "logheight",
             "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -3880,22 +4605,22 @@ class ShapeCswooshArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 13
+                    14, 16
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 75000);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
@@ -3914,17 +4639,17 @@ class ShapeCswooshArrow : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 8
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    8, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -3942,169 +4667,42 @@ class ShapeCswooshArrow : public CustomShapeProvider
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
         {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 30
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    11, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    31, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    15, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 13
-                },
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 27
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 30
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                16,1,
-                2,4,
-                16,1,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+                    14, 6
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
             {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        31, 30
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 3);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
             }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
         }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-swooshArrow"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCflowChartSummingJunction : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "logwidth/2",
-            "?0 *cos(pi*(2700000)/10800000)",
-            "logheight/2",
-            "?2 *sin(pi*(2700000)/10800000)",
-            "logwidth/2",
-            "?4 +0-?1 ",
-            "?4 +?1 -0",
-            "logheight/2",
-            "?7 +0-?3 ",
-            "?7 +?3 -0",
-            "logheight",
-            "logwidth",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -4120,52 +4718,7 @@ class ShapeCflowChartSummingJunction : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    18, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 8
+                    0, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -4175,57 +4728,52 @@ class ShapeCflowChartSummingJunction : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 8
+                    6, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
+                    14, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    14, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 21
+                    8, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    11, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
+                    22, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    15, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 25
+                    15, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    6, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 27
+                    6, 21
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4235,20 +4783,8 @@ class ShapeCflowChartSummingJunction : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,4,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                6,0,
-                5,0,
-                1,1,
-                17,4,
+                2,11,
                 4,0,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -4263,7 +4799,7 @@ class ShapeCflowChartSummingJunction : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        5, 8
+                        18, 16
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4272,7 +4808,7 @@ class ShapeCflowChartSummingJunction : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 9
+                        11, 17
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4290,7 +4826,7 @@ class ShapeCflowChartSummingJunction : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartSummingJunction"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftUpArrow"));
 
     return aPropertyMap;
   }
@@ -4467,7 +5003,7 @@ class ShapeClightningBolt : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartDisplay : public CustomShapeProvider
+class ShapeCline : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -4478,14 +5014,8 @@ class ShapeCflowChartDisplay : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth*5/6",
-            "logwidth/2",
-            "logheight/2",
-            "logheight",
             "logwidth",
-            "logwidth/6",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0"
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -4499,39 +5029,19 @@ class ShapeCflowChartDisplay : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (2);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 3
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 6
+                    0, 1
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4541,52 +5051,11 @@ class ShapeCflowChartDisplay : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,2,
-                17,1,
                 2,1,
-                4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
-        {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 6;
-                aSize.Height = 6;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        5, 0
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        0, 3
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
-        }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
     {
@@ -4597,7 +5066,7 @@ class ShapeCflowChartDisplay : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartDisplay"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-line"));
 
     return aPropertyMap;
   }
@@ -4605,7 +5074,7 @@ class ShapeCflowChartDisplay : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCactionButtonBackPrevious : public CustomShapeProvider
+class ShapeClineInv : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -4616,16 +5085,8 @@ class ShapeCactionButtonBackPrevious : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "?0 *3/8",
-            "logheight/2",
-            "?2 +0-?1 ",
-            "?2 +?1 -0",
-            "logwidth/2",
-            "?5 +0-?1 ",
-            "?5 +?1 -0",
-            "logwidth",
-            "logheight"
+            "logheight",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -4639,94 +5100,279 @@ class ShapeCactionButtonBackPrevious : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (3);
+        Sequence< PropertyValue > aPropSequence (2);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
                     0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 9
-                },
+                    1, 0
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,1,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-lineInv"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCmathDivide : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        {
+            Any aAny ((sal_Int32) 23520);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 5880);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 11760);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "if(1000-$0 ,1000,if(36745-$0 ,$0 ,36745))",
+            "0+0-?0 ",
+            "(73490+?1 )/4",
+            "36745*logwidth/logheight",
+            "min(?2 ,?3 )",
+            "if(1000-$2 ,1000,if(?4 -$2 ,$2 ,?4 ))",
+            "-4*?5 /1",
+            "73490+?6 -?0 ",
+            "if(0-$1 ,0,if(?7 -$1 ,$1 ,?7 ))",
+            "logheight*?0 /200000",
+            "logheight*?8 /100000",
+            "logheight*?5 /100000",
+            "logwidth*73490/200000",
+            "logheight/2",
+            "?13 +0-?9 ",
+            "?13 +?9 -0",
+            "?10 +?11 -0",
+            "?14 +0-?16 ",
+            "?17 +0-?11 ",
+            "logheight+0-?18 ",
+            "logwidth/2",
+            "?20 +0-?12 ",
+            "?20 +?12 -0",
+            "?20 +0-?11 ",
+            "logwidth",
+            "(16200000)/60000.0",
+            "(21600000)/60000.0",
+            "(5400000)/60000.0",
+            "(21600000)/60000.0"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
-                },
+                    0, 14
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 36745);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 1000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 2
-                },
+                    24, 17
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 7);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 3
-                },
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    23, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 4);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 1000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 4
+                    20, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 2
+                    11, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 3
+                    25, 26
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 4
+                    20, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 2
+                    11, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 3
+                    27, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    21, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 9
+                    22, 15
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 15
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4736,28 +5382,14 @@ class ShapeCactionButtonBackPrevious : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
-                4,0,
-                1,1,
-                2,2,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,2,
+                17,1,
                 4,0,
-                18,0,
-                7,0,
-                5,0,
                 1,1,
-                2,2,
+                17,1,
                 4,0,
-                6,0,
-                5,0,
                 1,1,
                 2,3,
                 4,0,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -4770,9 +5402,9 @@ class ShapeCactionButtonBackPrevious : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        21, 14
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4781,7 +5413,7 @@ class ShapeCactionButtonBackPrevious : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        8, 9
+                        22, 15
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4799,7 +5431,7 @@ class ShapeCactionButtonBackPrevious : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonBackPrevious"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-mathDivide"));
 
     return aPropertyMap;
   }
@@ -4807,59 +5439,73 @@ class ShapeCactionButtonBackPrevious : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCframe : public CustomShapeProvider
+class ShapeCmathEqual : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 12500);
+            Any aAny ((sal_Int32) 23520);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
+        {
+            Any aAny ((sal_Int32) 11760);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "logwidth+0-?2 ",
-            "logheight+0-?2 ",
-            "logwidth/2",
+            "if(0-$0 ,0,if(36745-$0 ,$0 ,36745))",
+            "?0 *2/1",
+            "100000+0-2",
+            "if(0-$1 ,0,if(?2 -$1 ,$1 ,?2 ))",
+            "logheight*?0 /100000",
+            "logheight*?3 /200000",
+            "logwidth*73490/200000",
             "logheight/2",
-            "logheight",
+            "?7 +0-?5 ",
+            "?7 +?5 -0",
+            "?8 +0-?4 ",
+            "?9 +?4 -0",
+            "logwidth/2",
+            "?12 +0-?6 ",
+            "?12 +?6 -0",
+            "(?10 +?8 )/2",
+            "(?9 +?11 )/2",
             "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 10
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 36745);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -4867,12 +5513,47 @@ class ShapeCframe : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 8
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -4887,44 +5568,44 @@ class ShapeCframe : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 7
+                    14, 8
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    13, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 4
+                    14, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 4
+                    14, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    13, 11
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4953,7 +5634,7 @@ class ShapeCframe : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        2, 2
+                        13, 10
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4962,7 +5643,7 @@ class ShapeCframe : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        3, 4
+                        14, 11
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4980,7 +5661,7 @@ class ShapeCframe : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-frame"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-mathEqual"));
 
     return aPropertyMap;
   }
@@ -4988,30 +5669,73 @@ class ShapeCframe : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCrtTriangle : public CustomShapeProvider
+class ShapeCmathMinus : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 23520);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logheight*7/12",
-            "logwidth*7/12",
-            "logheight*11/12",
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "logheight*?0 /200000",
+            "logwidth*73490/200000",
             "logheight/2",
-            "logheight",
+            "?3 +0-?1 ",
+            "?3 +?1 -0",
             "logwidth/2",
-            "logwidth",
-            "logwidth/12"
+            "?6 +0-?2 ",
+            "?6 +?2 -0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 4
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 100000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -5025,19 +5749,24 @@ class ShapeCrtTriangle : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 4
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 4
+                    8, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 5
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5047,7 +5776,7 @@ class ShapeCrtTriangle : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,2,
+                2,3,
                 4,0,
                 5,0
             };
@@ -5063,7 +5792,7 @@ class ShapeCrtTriangle : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        7, 0
+                        7, 4
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -5072,7 +5801,7 @@ class ShapeCrtTriangle : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        1, 2
+                        8, 5
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -5090,7 +5819,7 @@ class ShapeCrtTriangle : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-rtTriangle"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-mathMinus"));
 
     return aPropertyMap;
   }
@@ -5098,43 +5827,98 @@ class ShapeCrtTriangle : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartMagneticTape : public CustomShapeProvider
+class ShapeCmathMultiply : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 23520);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
+            "if(0-$0 ,0,if(51965-$0 ,$0 ,51965))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "(10800000*atan2(logheight,logwidth))/pi",
+            "1*sin(pi*(?3 )/10800000)",
+            "1*cos(pi*(?3 )/10800000)",
+            "1*tan(pi*(?3 )/10800000)",
+            "sqrt(logwidth*logwidth+logheight*logheight+0*0)",
+            "?7 *51965/100000",
+            "?7 +0-?8 ",
+            "?5 *?9 /2",
+            "?4 *?9 /2",
+            "?4 *?2 /2",
+            "?5 *?2 /2",
+            "?10 +0-?12 ",
+            "?11 +?13 -0",
+            "?10 +?12 -0",
+            "?11 +0-?13 ",
             "logwidth/2",
-            "?0 *cos(pi*(2700000)/10800000)",
-            "logheight/2",
-            "?2 *sin(pi*(2700000)/10800000)",
-            "logwidth/2",
-            "?4 +0-?1 ",
-            "?4 +?1 -0",
+            "?18 +0-?16 ",
+            "?19 *?6 /1",
+            "?20 +?17 -0",
+            "logwidth+0-?16 ",
+            "logwidth+0-?14 ",
             "logheight/2",
-            "?7 +0-?3 ",
-            "?7 +?3 -0",
-            "(10800000*atan2(logheight,logwidth))/pi",
-            "logheight",
-            "logwidth",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(?10 )/60000.0"
+            "?24 +0-?15 ",
+            "?25 *1/?6 ",
+            "?23 +0-?26 ",
+            "?14 +?26 -0",
+            "logheight+0-?15 ",
+            "logheight+0-?17 ",
+            "logheight+0-?21 ",
+            "logwidth+0-?10 ",
+            "logheight+0-?11 "
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 2
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 51965);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -5150,57 +5934,62 @@ class ShapeCflowChartMagneticTape : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 11
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    16, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 14
+                    18, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    22, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 16
+                    23, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    27, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 18
+                    23, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    22, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 20
+                    18, 31
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 9
+                    16, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 11
+                    14, 29
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 24
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5210,8 +5999,7 @@ class ShapeCflowChartMagneticTape : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,4,
-                2,2,
+                2,11,
                 4,0,
                 5,0
             };
@@ -5227,7 +6015,7 @@ class ShapeCflowChartMagneticTape : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        5, 8
+                        14, 17
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -5236,7 +6024,7 @@ class ShapeCflowChartMagneticTape : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 9
+                        23, 30
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -5254,7 +6042,7 @@ class ShapeCflowChartMagneticTape : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartMagneticTape"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-mathMultiply"));
 
     return aPropertyMap;
   }
@@ -5262,7 +6050,7 @@ class ShapeCflowChartMagneticTape : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcurvedRightArrow : public CustomShapeProvider
+class ShapeCmathNotEqual : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -5271,17 +6059,17 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 23520);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 6600000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 11760);
             aAdjSequence [2].Value = aAny;
             aAdjSequence [2].Name = "adj3";
         }
@@ -5289,68 +6077,65 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "50000*logheight/?0 ",
-            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "if(0-$0 ,0,if(?2 -$0 ,$0 ,?2 ))",
-            "?0 *?3 /100000",
-            "?0 *?2 /100000",
-            "(?4 +?5 )/4",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "if(4200000-$1 ,4200000,if(6600000-$1 ,$1 ,6600000))",
+            "?0 *2/1",
+            "100000+0-2",
+            "if(0-$2 ,0,if(?3 -$2 ,$2 ,?3 ))",
+            "logheight*?0 /100000",
+            "logheight*?4 /200000",
+            "logwidth*73490/200000",
+            "logwidth/2",
+            "?8 +0-?7 ",
+            "?8 +?7 -0",
             "logheight/2",
-            "?7 +0-?6 ",
-            "?8 *2/1",
-            "?9 *?9 /1",
-            "?4 *?4 /1",
-            "?10 +0-?11 ",
-            "sqrt(?12 )",
-            "?13 *logwidth/?9 ",
-            "100000*?14 /?0 ",
-            "if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))",
-            "?0 *?16 /100000",
-            "?8 +?4 -0",
-            "logwidth*logwidth/1",
-            "?17 *?17 /1",
-            "?19 +0-?20 ",
-            "sqrt(?21 )",
-            "?22 *?8 /logwidth",
-            "?8 +?23 -0",
-            "?18 +?23 -0",
-            "?5 +0-?4 ",
-            "?26 *1/2",
-            "?24 +0-?27 ",
-            "?25 +?27 -0",
-            "?5 *1/2",
-            "logheight+0-?30 ",
-            "logwidth+0-?17 ",
-            "(10800000*atan2(?23 ,?17 ))/pi",
-            "10800000+0-?33 ",
-            "0+0-?33 ",
-            "logwidth+0-?14 ",
-            "(?8 +?18 )/2",
-            "?4 *1/2",
-            "(10800000*atan2(?38 ,?14 ))/pi",
-            "?39 +0-5400000",
-            "5400000+?39 -0",
-            "10800000+0-?39 ",
-            "logwidth",
-            "logheight",
-            "logwidth",
-            "(10800000)/60000.0",
-            "(?35 )/60000.0",
-            "(?34 )/60000.0",
-            "(?33 )/60000.0",
-            "(16200000)/60000.0",
-            "(?40 )/60000.0",
-            "(?42 )/60000.0",
-            "(?41 )/60000.0",
-            "(10800000)/60000.0",
-            "(?35 )/60000.0",
-            "(?34 )/60000.0",
-            "(?33 )/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(?40 )/60000.0"
+            "?11 +0-?6 ",
+            "?11 +?6 -0",
+            "?12 +0-?5 ",
+            "?13 +?5 -0",
+            "?1 +0-5400000",
+            "logheight/2",
+            "?17 *tan(pi*(?16 )/10800000)",
+            "sqrt(?18 *?18 +?17 *?17 +0*0)",
+            "?19 *?5 /?17 ",
+            "?20 *1/2",
+            "?8 +?18 -?21 ",
+            "?18 *?14 /?17 ",
+            "?22 +0-?23 ",
+            "?18 *?12 /?17 ",
+            "?22 +0-?25 ",
+            "?18 *?13 /?17 ",
+            "?22 +0-?27 ",
+            "?18 *?15 /?17 ",
+            "?22 +0-?29 ",
+            "?18 *2/1",
+            "?22 +0-?31 ",
+            "?22 +?20 -0",
+            "?24 +?20 -0",
+            "?26 +?20 -0",
+            "?28 +?20 -0",
+            "?30 +?20 -0",
+            "?32 +?20 -0",
+            "?5 *?17 /?19 ",
+            "?22 +?39 -0",
+            "?33 +0-?39 ",
+            "if(?16 ,?40 ,?33 )",
+            "if(?16 ,?22 ,?41 )",
+            "?5 *?18 /?19 ",
+            "0+0-?44 ",
+            "if(?16 ,?44 ,0)",
+            "if(?16 ,0,?45 )",
+            "logwidth+0-?42 ",
+            "logwidth+0-?43 ",
+            "logheight+0-?46 ",
+            "logheight+0-?47 ",
+            "(?42 +?43 )/2",
+            "(?49 +?48 )/2",
+            "(?46 +?47 )/2",
+            "(?14 +?12 )/2",
+            "(?13 +?15 )/2",
+            "(?51 +?50 )/2",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -5362,18 +6147,18 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    32, 24
+                    0, 14
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -5392,38 +6177,17 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider
             aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (1);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    43, 28
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    43, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
             aPropSequenceSequence [1] = aPropSequence;
         }
         {
@@ -5434,20 +6198,20 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 44
+                    58, 12
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 15);
+                Any aAny ((sal_Int32) 3);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -5455,7 +6219,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 2);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -5475,149 +6239,104 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    45, 8
+                    9, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    46, 47
+                    24, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 28
+                    43, 47
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    43, 31
+                    42, 46
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 29
+                    34, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 25
+                    10, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    45, 8
+                    10, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    48, 49
+                    35, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    43, 4
+                    36, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    45, 8
+                    10, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    50, 51
+                    10, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    45, 8
+                    37, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    52, 53
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    45, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    54, 55
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    32, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    43, 31
+                    49, 51
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 29
+                    48, 50
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 25
+                    30, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    45, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    56, 57
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    45, 8
+                    9, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    58, 59
+                    9, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    43, 4
+                    28, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    45, 8
+                    26, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    60, 61
+                    9, 12
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5627,27 +6346,8 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,1,
-                2,4,
-                17,1,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                17,2,
+                2,19,
                 4,0,
-                19,0,
-                7,0,
-                5,0,
-                1,1,
-                17,1,
-                2,4,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -5660,9 +6360,9 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        9, 14
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -5671,7 +6371,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        43, 44
+                        10, 15
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -5689,7 +6389,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedRightArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-mathNotEqual"));
 
     return aPropertyMap;
   }
@@ -5697,79 +6397,61 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCleftUpArrow : public CustomShapeProvider
+class ShapeCmathPlus : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 23520);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
-            "?0 *2/1",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "100000+0-?1 ",
-            "if(0-$2 ,0,if(?3 -$2 ,$2 ,?3 ))",
+            "if(0-$0 ,0,if(73490-$0 ,$0 ,73490))",
+            "logwidth*73490/200000",
+            "logheight*73490/200000",
             "min(logwidth,logheight)",
-            "?5 *?4 /100000",
-            "?5 *?0 /50000",
-            "logwidth+0-?7 ",
-            "logheight+0-?7 ",
-            "?5 *?0 /100000",
-            "logwidth+0-?10 ",
-            "logheight+0-?10 ",
-            "?5 *?2 /200000",
-            "?11 +0-?13 ",
-            "?11 +?13 -0",
-            "?12 +0-?13 ",
-            "?12 +?13 -0",
-            "?13 *?6 /?10 ",
-            "(?6 +?15 )/2",
-            "(?6 +?17 )/2",
-            "logheight",
-            "logwidth"
+            "?3 *?0 /200000",
+            "logwidth/2",
+            "?5 +0-?1 ",
+            "?5 +0-?4 ",
+            "?5 +?4 -0",
+            "?5 +?1 -0",
+            "logheight/2",
+            "?10 +0-?2 ",
+            "?10 +0-?4 ",
+            "?10 +?4 -0",
+            "?10 +?2 -0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 16
+                    0, 12
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 73490);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -5787,76 +6469,6 @@ class ShapeCleftUpArrow : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 6
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 3);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -5871,64 +6483,64 @@ class ShapeCleftUpArrow : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 12
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 9
+                    7, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 16
+                    7, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 16
+                    8, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 6
+                    8, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 6
+                    9, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    11, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 6
+                    8, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 6
+                    8, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 17
+                    7, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 17
+                    7, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 21
+                    6, 13
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5954,7 +6566,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        18, 16
+                        6, 12
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -5963,7 +6575,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        11, 17
+                        9, 13
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -5981,7 +6593,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftUpArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-mathPlus"));
 
     return aPropertyMap;
   }
@@ -5989,85 +6601,88 @@ class ShapeCleftUpArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCwedgeEllipseCallout : public CustomShapeProvider
+class ShapeCmoon : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) -20833);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 62500);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logwidth*$0 /100000",
-            "logheight*$1 /100000",
-            "logwidth/2",
-            "?2 +?0 -0",
+            "if(0-$0 ,0,if(87500-$0 ,$0 ,87500))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "?2 *logwidth/?1 ",
+            "?1 +0-?2 ",
+            "?2 *?2 /?4 ",
+            "?1 *?1 /?4 ",
+            "?6 *2/1",
+            "?7 +0-?5 ",
+            "?8 +0-?2 ",
+            "?9 *logwidth/?1 ",
+            "?8 *1/2",
+            "?11 +0-?2 ",
             "logheight/2",
-            "?4 +?1 -0",
-            "?0 *logheight/1",
-            "?1 *logwidth/1",
-            "(10800000*atan2(?7 ,?6 ))/pi",
-            "?8 +660000-0",
-            "?8 +0-660000",
-            "logwidth/2",
-            "?11 *cos(pi*(?9 )/10800000)",
+            "?12 *?13 /?1 ",
             "logheight/2",
-            "?13 *sin(pi*(?9 )/10800000)",
-            "?2 +?12 -0",
-            "?4 +?14 -0",
-            "?11 *cos(pi*(?10 )/10800000)",
-            "?13 *sin(pi*(?10 )/10800000)",
-            "?2 +?17 -0",
-            "?4 +?18 -0",
-            "(10800000*atan2(?14 ,?12 ))/pi",
-            "(10800000*atan2(?18 ,?17 ))/pi",
-            "?22 +0-?21 ",
-            "?23 +21600000-0",
-            "if(?23 ,?23 ,?24 )",
-            "?11 *cos(pi*(2700000)/10800000)",
-            "?13 *sin(pi*(2700000)/10800000)",
-            "?2 +0-?26 ",
-            "?2 +?26 -0",
-            "?4 +0-?27 ",
-            "?4 +?27 -0",
+            "?15 +0-?14 ",
+            "?15 +?14 -0",
+            "?2 *9598/32768",
+            "?18 *logwidth/?1 ",
+            "?1 +0-?18 ",
+            "?1 *?1 /1",
+            "?20 *?20 /1",
+            "?21 +0-?22 ",
+            "sqrt(?23 )",
+            "?24 *?13 /?1 ",
+            "?15 +0-?25 ",
+            "?15 +?25 -0",
+            "?10 +0-?3 ",
+            "?28 *1/2",
+            "?3 +?29 -logwidth",
+            "?30 *-1/1",
+            "?13 *-1/1",
+            "(10800000*atan2(?32 ,?31 ))/pi",
+            "(10800000*atan2(?13 ,?31 ))/pi",
+            "?34 +0-21600000",
+            "?35 +0-?33 ",
+            "logwidth",
             "logheight",
             "logwidth",
-            "(?21 )/60000.0",
-            "(?25 )/60000.0"
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(?33 )/60000.0",
+            "(?36 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
         Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    3, 15
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 87500);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -6075,36 +6690,15 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
@@ -6124,22 +6718,27 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    37, 38
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 16
+                    39, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 13
+                    40, 41
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    34, 35
+                    29, 14
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    42, 43
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6149,8 +6748,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,1,
-                17,1,
+                17,2,
                 4,0,
                 5,0
             };
@@ -6166,7 +6764,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        28, 30
+                        19, 26
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6175,7 +6773,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        29, 31
+                        3, 27
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6193,7 +6791,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-wedgeEllipseCallout"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-moon"));
 
     return aPropertyMap;
   }
@@ -6201,142 +6799,109 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCdoubleWave : public CustomShapeProvider
+class ShapeCnoSmoking : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 6250);
+            Any aAny ((sal_Int32) 18750);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 0);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(12500-$0 ,$0 ,12500))",
-            "if(-10000-$1 ,-10000,if(10000-$1 ,$1 ,10000))",
-            "logheight*?0 /100000",
-            "?2 *10/3",
-            "?2 +0-?3 ",
-            "?2 +?3 -0",
-            "logheight+0-?2 ",
-            "?6 +0-?3 ",
-            "?6 +?3 -0",
-            "logwidth*?1 /100000",
-            "logwidth*?1 /50000",
-            "abs(?9 )",
-            "if(?10 ,0,?10 )",
-            "0+0-?12 ",
-            "if(?10 ,?10 ,0)",
-            "logwidth+0-?14 ",
-            "(?12 +?15 )/6",
-            "?13 +?16 -0",
-            "(?12 +?15 )/3",
-            "?13 +?18 -0",
-            "(?13 +?15 )/2",
-            "?20 +?16 -0",
-            "(?21 +?15 )/2",
-            "0+?14 -0",
-            "logwidth+?12 -0",
-            "?23 +?16 -0",
-            "?23 +?18 -0",
-            "(?23 +?24 )/2",
-            "?27 +?16 -0",
-            "(?28 +?24 )/2",
-            "logwidth+0-?11 ",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "logwidth/2",
+            "?3 +0-?2 ",
+            "logheight/2",
+            "?5 +0-?2 ",
+            "(10800000*atan2(logheight,logwidth))/pi",
+            "?6 *cos(pi*(?7 )/10800000)",
+            "?4 *sin(pi*(?7 )/10800000)",
+            "sqrt(?8 *?8 +?9 *?9 +0*0)",
+            "?4 *?6 /?10 ",
+            "?2 *1/2",
+            "(10800000*atan2(?12 ,?11 ))/pi",
+            "?13 *2/1",
+            "-10800000+2-0",
+            "(10800000*atan2(logheight,logwidth))/pi",
+            "?16 +0-?13 ",
+            "?17 +0-10800000",
+            "?6 *cos(pi*(?17 )/10800000)",
+            "?4 *sin(pi*(?17 )/10800000)",
+            "sqrt(?19 *?19 +?20 *?20 +0*0)",
+            "?4 *?6 /?21 ",
+            "?22 *cos(pi*(?17 )/10800000)",
+            "?22 *sin(pi*(?17 )/10800000)",
             "logwidth/2",
-            "?31 +?9 -0",
-            "max(?13 ,?23 )",
-            "min(?15 ,?24 )",
-            "logheight*?0 /50000",
-            "logheight+0-?35 ",
+            "?25 +?23 -0",
+            "logheight/2",
+            "?27 +?24 -0",
+            "?25 +0-?23 ",
+            "?27 +0-?24 ",
+            "?3 *cos(pi*(2700000)/10800000)",
+            "?5 *sin(pi*(2700000)/10800000)",
+            "?25 +0-?31 ",
+            "?25 +?31 -0",
+            "?27 +0-?32 ",
+            "?27 +?32 -0",
             "logheight",
-            "logheight/2"
+            "logwidth",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(?17 )/60000.0",
+            "(?15 )/60000.0",
+            "(?18 )/60000.0",
+            "(?15 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (3);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 27
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RadiusRangeMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 12500);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RadiusRangeMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
             aPropSequenceSequence [0] = aPropSequence;
         }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    32, 37
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 10000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -10000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -6351,74 +6916,79 @@ class ShapeCdoubleWave : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    0, 27
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 4
+                    39, 40
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 5
+                    3, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 2
+                    41, 42
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 4
+                    3, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 5
+                    43, 44
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 2
+                    3, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 6
+                    45, 46
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 8
+                    26, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 7
+                    4, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 6
+                    47, 48
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 8
+                    29, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 7
+                    4, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 6
+                    49, 50
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6428,9 +6998,13 @@ class ShapeCdoubleWave : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                3,2,
-                2,1,
-                3,2,
+                17,4,
+                4,0,
+                1,1,
+                17,1,
+                4,0,
+                1,1,
+                17,1,
                 4,0,
                 5,0
             };
@@ -6473,7 +7047,7 @@ class ShapeCdoubleWave : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-doubleWave"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-noSmoking"));
 
     return aPropertyMap;
   }
@@ -6481,14 +7055,14 @@ class ShapeCdoubleWave : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCbentArrow : public CustomShapeProvider
+class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
             Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
@@ -6499,55 +7073,35 @@ class ShapeCbentArrow : public CustomShapeProvider
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) 43750);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
-            "?0 *2/1",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "if(0-$2 ,0,if(50000-$2 ,$2 ,50000))",
             "min(logwidth,logheight)",
-            "?4 *?2 /100000",
-            "?4 *?0 /100000",
-            "?5 *1/2",
-            "?6 +0-?7 ",
-            "?4 *?3 /100000",
-            "logwidth+0-?9 ",
-            "logheight+0-?8 ",
-            "min(?10 ,?11 )",
-            "100000*?12 /?4 ",
-            "if(0-$3 ,0,if(?13 -$3 ,$3 ,?13 ))",
-            "?4 *?14 /100000",
-            "?15 +0-?5 ",
-            "max(?16 ,0)",
-            "?5 +?17 -0",
-            "logwidth+0-?9 ",
-            "?8 +?5 -0",
-            "?20 +?8 -0",
-            "?8 +?15 -0",
-            "?20 +?17 -0",
+            "50000*logwidth/?0 ",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "?0 *?2 /200000",
+            "?0 *?2 /100000",
+            "?0 *?3 /100000",
+            "logwidth+0-?6 ",
+            "(logwidth+?7 )/2",
+            "logwidth/3",
+            "?9 *?2 /?1 ",
+            "max(?2 ,?3 )",
+            "logheight/3",
+            "?12 *?11 /?1 ",
+            "?9 *?3 /?1 ",
+            "logwidth+0-?14 ",
+            "logheight/2",
+            "logwidth/2",
             "logheight",
-            "logwidth",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(-5400000)/60000.0"
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -6555,8 +7109,8 @@ class ShapeCbentArrow : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 24
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -6590,21 +7144,21 @@ class ShapeCbentArrow : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 21
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    7, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -6612,12 +7166,146 @@ class ShapeCbentArrow : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 1);
                 aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 18
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    7, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 18
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,3,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        10, 13
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        15, 18
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-nonIsoscelesTrapezoid"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCnotchedRightArrow : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "min(logwidth,logheight)",
+            "100000*logwidth/?0 ",
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "?0 *?3 /100000",
+            "logwidth+0-?4 ",
+            "logheight*?2 /200000",
+            "logheight/2",
+            "?7 +0-?6 ",
+            "?7 +?6 -0",
+            "logheight/2",
+            "?6 *?4 /?10 ",
+            "logwidth+0-?11 ",
+            "logwidth",
+            "logheight"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -6625,21 +7313,21 @@ class ShapeCbentArrow : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    19, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 8
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 100000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -6647,11 +7335,11 @@ class ShapeCbentArrow : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [2] = aPropSequence;
+            aPropSequenceSequence [0] = aPropSequence;
         }
         {
             Sequence< PropertyValue > aPropSequence (4);
@@ -6661,14 +7349,14 @@ class ShapeCbentArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    15, 0
+                    5, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 13);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -6683,10 +7371,10 @@ class ShapeCbentArrow : public CustomShapeProvider
             }
             {
                 aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
+                Any aAny ((sal_Int32) 1);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [3] = aPropSequence;
+            aPropSequenceSequence [1] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -6704,67 +7392,42 @@ class ShapeCbentArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    15, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 27
+                    0, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 8
+                    5, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    19, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 6
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 21
+                    5, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 20
+                    13, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 20
+                    5, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 17
+                    5, 9
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 29
+                    0, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 24
+                    11, 7
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6774,11 +7437,7 @@ class ShapeCbentArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,1,
-                17,1,
-                2,6,
-                17,1,
-                2,1,
+                2,7,
                 4,0,
                 5,0
             };
@@ -6792,9 +7451,9 @@ class ShapeCbentArrow : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        11, 8
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6803,7 +7462,7 @@ class ShapeCbentArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        25, 24
+                        12, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6821,7 +7480,7 @@ class ShapeCbentArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bentArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-notchedRightArrow"));
 
     return aPropertyMap;
   }
@@ -6829,63 +7488,32 @@ class ShapeCbentArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCstar10 : public CustomShapeProvider
+class ShapeCoctagon : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 42533);
+            Any aAny ((sal_Int32) 29289);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj";
         }
-        {
-            Any aAny ((sal_Int32) 105146);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "hf";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
             "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "logwidth/2",
-            "?1 *$1 /100000",
-            "?2 *95106/100000",
-            "?2 *58779/100000",
-            "logwidth/2",
-            "?5 +0-?3 ",
-            "?5 +0-?4 ",
-            "?5 +?4 -0",
-            "?5 +?3 -0",
-            "logheight/2",
-            "?10 *80902/100000",
-            "?10 *30902/100000",
-            "logheight/2",
-            "?13 +0-?11 ",
-            "?13 +0-?12 ",
-            "?13 +?12 -0",
-            "?13 +?11 -0",
-            "?2 *?0 /50000",
-            "?10 *?0 /50000",
-            "?18 *80902/100000",
-            "?18 *30902/100000",
-            "?19 *95106/100000",
-            "?19 *58779/100000",
-            "?5 +0-?18 ",
-            "?5 +0-?20 ",
-            "?5 +0-?21 ",
-            "?5 +?21 -0",
-            "?5 +?20 -0",
-            "?5 +?18 -0",
-            "?13 +0-?22 ",
-            "?13 +0-?23 ",
-            "?13 +?23 -0",
-            "?13 +?22 -0",
-            "?13 +0-?19 ",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "logwidth+0-?2 ",
+            "logheight+0-?2 ",
+            "?2 *1/2",
+            "logwidth+0-?5 ",
+            "logheight+0-?5 ",
+            "logwidth",
             "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
@@ -6899,13 +7527,13 @@ class ShapeCstar10 : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 34
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
@@ -6913,7 +7541,7 @@ class ShapeCstar10 : public CustomShapeProvider
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -6921,7 +7549,7 @@ class ShapeCstar10 : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -6941,104 +7569,44 @@ class ShapeCstar10 : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 31
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 14
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 30
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 30
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 14
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 31
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    29, 13
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 17
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 33
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 35
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 33
+                    8, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 17
+                    8, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 32
+                    3, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 16
+                    2, 9
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 13
+                    0, 4
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7048,7 +7616,7 @@ class ShapeCstar10 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,19,
+                2,7,
                 4,0,
                 5,0
             };
@@ -7064,7 +7632,7 @@ class ShapeCstar10 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        25, 31
+                        5, 5
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7073,7 +7641,7 @@ class ShapeCstar10 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        28, 32
+                        6, 7
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7091,7 +7659,7 @@ class ShapeCstar10 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star10"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-octagon"));
 
     return aPropertyMap;
   }
@@ -7099,23 +7667,18 @@ class ShapeCstar10 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCleftArrow : public CustomShapeProvider
+class ShapeCparallelogram : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
@@ -7123,59 +7686,33 @@ class ShapeCleftArrow : public CustomShapeProvider
         static const char *aStrings[] = {
             "min(logwidth,logheight)",
             "100000*logwidth/?0 ",
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
-            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "?0 *?3 /100000",
-            "0+?4 -0",
-            "logheight*?2 /200000",
-            "logheight/2",
-            "?7 +0-?6 ",
-            "?7 +?6 -0",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "?0 *?2 /200000",
+            "?0 *?2 /100000",
+            "logwidth+0-?3 ",
+            "logwidth+0-?4 ",
+            "?6 *1/2",
+            "logwidth+0-?7 ",
+            "logwidth/2",
+            "?9 *?2 /?1 ",
+            "5*?2 /?1 ",
+            "(1+?11 )/12",
+            "?12 *logwidth/1",
+            "?12 *logheight/1",
+            "logwidth+0-?13 ",
+            "logheight+0-?14 ",
+            "logwidth/2",
+            "logheight*?17 /?4 ",
+            "if(0-?18 ,0,if(logheight-?18 ,?18 ,logheight))",
+            "logheight+0-?19 ",
             "logheight/2",
-            "?8 *?4 /?10 ",
-            "?5 +0-?11 ",
-            "logwidth",
-            "logheight"
+            "logheight",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 8
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -7184,7 +7721,7 @@ class ShapeCleftArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    4, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -7206,10 +7743,10 @@ class ShapeCleftArrow : public CustomShapeProvider
             }
             {
                 aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [1] = aPropSequence;
+            aPropSequenceSequence [0] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -7227,37 +7764,164 @@ class ShapeCleftArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
+                    0, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 8
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    23, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 8
+                    6, 22
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,3,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        13, 14
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        15, 16
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-parallelogram"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCpentagon : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        {
+            Any aAny ((sal_Int32) 105146);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "hf";
+        }
+        {
+            Any aAny ((sal_Int32) 110557);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "vf";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "logwidth/2",
+            "?0 *$0 /100000",
+            "logheight/2",
+            "?2 *$1 /100000",
+            "logheight/2",
+            "?4 *$1 /100000",
+            "?1 *cos(pi*(1080000)/10800000)",
+            "?1 *cos(pi*(18360000)/10800000)",
+            "?3 *sin(pi*(1080000)/10800000)",
+            "?3 *sin(pi*(18360000)/10800000)",
+            "logwidth/2",
+            "?10 +0-?6 ",
+            "?10 +0-?7 ",
+            "?10 +?7 -0",
+            "?10 +?6 -0",
+            "?5 +0-?8 ",
+            "?5 +0-?9 ",
+            "?15 *?7 /?6 ",
+            "logheight"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    10, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 9
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 9
+                    13, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 14
+                    12, 16
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7267,7 +7931,7 @@ class ShapeCleftArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,6,
+                2,4,
                 4,0,
                 5,0
             };
@@ -7283,7 +7947,7 @@ class ShapeCleftArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        12, 8
+                        12, 17
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7292,7 +7956,7 @@ class ShapeCleftArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        13, 9
+                        13, 16
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7310,7 +7974,7 @@ class ShapeCleftArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-pentagon"));
 
     return aPropertyMap;
   }
@@ -7318,205 +7982,91 @@ class ShapeCleftArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcurvedUpArrow : public CustomShapeProvider
+class ShapeCpie : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 0);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 16200000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "50000*logwidth/?0 ",
-            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
-            "?0 *?3 /100000",
-            "?0 *?2 /100000",
-            "(?4 +?5 )/4",
+            "if(0-$0 ,0,if(21599999-$0 ,$0 ,21599999))",
+            "if(0-$1 ,0,if(21599999-$1 ,$1 ,21599999))",
+            "?1 +0-?0 ",
+            "?2 +21600000-0",
+            "if(?2 ,?2 ,?3 )",
             "logwidth/2",
-            "?7 +0-?6 ",
-            "?8 *2/1",
-            "?9 *?9 /1",
-            "?4 *?4 /1",
-            "?10 +0-?11 ",
-            "sqrt(?12 )",
-            "?13 *logheight/?9 ",
-            "100000*?14 /?0 ",
-            "if(0-$2 ,0,if(?15 -$2 ,$2 ,?15 ))",
-            "?0 *$2 /100000",
-            "?8 +?4 -0",
-            "logheight*logheight/1",
-            "?17 *?17 /1",
-            "?19 +0-?20 ",
-            "sqrt(?21 )",
-            "?22 *?8 /logheight",
-            "?8 +?23 -0",
-            "?18 +?23 -0",
-            "?5 +0-?4 ",
-            "?26 *1/2",
-            "?24 +0-?27 ",
-            "?25 +?27 -0",
-            "?5 *1/2",
-            "logwidth+0-?30 ",
-            "0+?17 -0",
-            "(10800000*atan2(?23 ,?17 ))/pi",
-            "0+0-?33 ",
-            "0+?14 -0",
-            "(?8 +?18 )/2",
-            "?4 *1/2",
-            "(10800000*atan2(?37 ,?14 ))/pi",
-            "?38 +0-?33 ",
-            "0+0-?39 ",
-            "5400000+0-?33 ",
-            "?33 +?38 -0",
-            "5400000+0-?38 ",
+            "?5 *sin(pi*(?0 )/10800000)",
+            "logheight/2",
+            "?7 *cos(pi*(?0 )/10800000)",
+            "?5 *(cos(atan2(?6 ,?8 )))",
+            "?7 *(sin(atan2(?6 ,?8 )))",
+            "logwidth/2",
+            "?11 +?9 -0",
+            "logheight/2",
+            "?13 +?10 -0",
+            "?5 *sin(pi*(?1 )/10800000)",
+            "?7 *cos(pi*(?1 )/10800000)",
+            "?5 *(cos(atan2(?15 ,?16 )))",
+            "?7 *(sin(atan2(?15 ,?16 )))",
+            "?11 +?17 -0",
+            "?13 +?18 -0",
+            "?5 *cos(pi*(2700000)/10800000)",
+            "?7 *sin(pi*(2700000)/10800000)",
+            "?11 +0-?21 ",
+            "?11 +?21 -0",
+            "?13 +0-?22 ",
+            "?13 +?22 -0",
             "logwidth",
             "logheight",
-            "logheight",
-            "(?41 )/60000.0",
-            "(?42 )/60000.0",
-            "(?43 )/60000.0",
-            "(?39 )/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(-5400000)/60000.0",
-            "(?43 )/60000.0",
-            "(?39 )/60000.0",
-            "(?41 )/60000.0",
-            "(?33 )/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(-5400000)/60000.0"
+            "(?0 )/60000.0",
+            "(?4 )/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (1);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 32
+                    12, 14
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
             aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    28, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (1);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    44, 32
+                    19, 20
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 15);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
+            aPropSequenceSequence [1] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -7533,148 +8083,23 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    31, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    29, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 46
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    47, 48
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 46
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    49, 50
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 45
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 46
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    51, 52
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 46
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    53, 54
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    36, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 46
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    55, 56
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    28, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    31, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    29, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 32
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 46
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    57, 58
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 45
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 46
+                    12, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    59, 60
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    5, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 46
+                    29, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    61, 62
+                    11, 13
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7684,29 +8109,9 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,2,
-                17,2,
-                2,1,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
                 17,1,
                 2,1,
-                17,1,
                 4,0,
-                19,0,
-                7,0,
-                5,0,
-                1,1,
-                17,1,
-                2,4,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -7719,9 +8124,9 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        23, 24
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7730,7 +8135,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        44, 45
+                        25, 26
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7748,7 +8153,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedUpArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-pie"));
 
     return aPropertyMap;
   }
@@ -7756,74 +8161,34 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCsnip1Rect : public CustomShapeProvider
+class ShapeCpieWedge : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 16667);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "logwidth+0-?2 ",
-            "?2 *1/2",
-            "(?3 +logwidth)/2",
+            "logwidth*cos(pi*(13500000)/10800000)",
+            "logheight*sin(pi*(13500000)/10800000)",
+            "logwidth+?0 -0",
+            "logheight+?1 -0",
             "logwidth",
             "logheight/2",
             "logwidth/2",
-            "logheight"
+            "logheight",
+            "logwidth",
+            "logheight",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -7838,28 +8203,23 @@ class ShapeCsnip1Rect : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 2
+                    8, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 9
+                    10, 11
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 7
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7869,7 +8229,8 @@ class ShapeCsnip1Rect : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,4,
+                17,1,
+                2,1,
                 4,0,
                 5,0
             };
@@ -7883,9 +8244,9 @@ class ShapeCsnip1Rect : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 4
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        2, 3
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7894,7 +8255,7 @@ class ShapeCsnip1Rect : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        5, 9
+                        4, 7
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7912,7 +8273,7 @@ class ShapeCsnip1Rect : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-snip1Rect"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-pieWedge"));
 
     return aPropertyMap;
   }
@@ -7920,130 +8281,48 @@ class ShapeCsnip1Rect : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCellipseRibbon2 : public CustomShapeProvider
+class ShapeCplaque : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 16667);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 12500);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
-            "if(25000-$1 ,25000,if(75000-$1 ,$1 ,75000))",
-            "100000+0-?0 ",
-            "?2 *1/2",
-            "?0 +0-?3 ",
-            "max(0,?4 )",
-            "if(?5 -$2 ,?5 ,if(?0 -$2 ,$2 ,?0 ))",
-            "logwidth*?1 /200000",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "logwidth+0-?2 ",
+            "logheight+0-?2 ",
+            "?2 *70711/100000",
+            "logwidth+0-?5 ",
+            "logheight+0-?5 ",
             "logwidth/2",
-            "?8 +0-?7 ",
-            "logwidth/8",
-            "?9 +?10 -0",
-            "logwidth+0-?11 ",
-            "logwidth+0-?9 ",
-            "logwidth+0-?10 ",
-            "logheight*?6 /100000",
-            "4*?15 /logwidth",
-            "?11 *?11 /logwidth",
-            "?11 +0-?17 ",
-            "?16 *?18 /1",
-            "logheight+0-?19 ",
-            "?11 *1/2",
-            "?16 *?21 /1",
-            "logheight+0-?22 ",
-            "logwidth+0-?21 ",
-            "logheight*?0 /100000",
-            "?25 +0-?15 ",
-            "?9 *?9 /logwidth",
-            "?9 +0-?27 ",
-            "?16 *?28 /1",
-            "?29 +?26 -0",
-            "logheight+0-?30 ",
-            "?15 +?26 -?30 ",
-            "?32 +?15 -0",
-            "?33 +?26 -0",
-            "logheight+0-?34 ",
-            "logheight+0-?25 ",
-            "?15 *14/16",
-            "(?37 +?36 )/2",
-            "logheight+0-?38 ",
-            "?29 +?36 -0",
-            "logheight+0-?40 ",
-            "?30 +?36 -0",
-            "logheight+0-?42 ",
-            "?9 *1/2",
-            "?16 *?44 /1",
-            "?45 +?36 -0",
-            "logheight+0-?46 ",
-            "logwidth+0-?44 ",
-            "?34 +?36 -0",
-            "logheight+0-?49 ",
-            "?19 +?26 -0",
-            "logheight+0-?51 ",
-            "?25 +?25 -?51 ",
-            "logheight+0-?53 ",
+            "logheight/2",
             "logheight",
-            "logwidth"
+            "logwidth",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(-5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(-5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 36
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -8052,14 +8331,14 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    9, 0
+                    2, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -8067,52 +8346,17 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 25000);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 15
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 5);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [2] = aPropSequence;
+            aPropSequenceSequence [0] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -8130,292 +8374,468 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 55
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 23
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 31
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 35
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 31
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 20
+                    12, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 23
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    56, 55
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 39
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    56, 25
+                    11, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    48, 47
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 41
+                    16, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 43
+                    2, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 50
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 43
-                },
+                    18, 19
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 41
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        5, 5
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    44, 47
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        6, 7
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-plaque"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCplaqueTabs : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+    }
+    {
+        static const char *aStrings[] = {
+            "sqrt(logwidth*logwidth+logheight*logheight+0*0)",
+            "1*?0 /20",
+            "0+logheight-?1 ",
+            "0+logwidth-?1 ",
+            "logheight",
+            "logwidth",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 25
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 39
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 52
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 20
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 31
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 35
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 31
+                    1, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 20
+                    6, 7
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 52
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 54
+                    1, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 52
+                    8, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 55
+                    0, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 39
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 25
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    44, 47
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 41
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 43
+                    5, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 50
+                    5, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 43
+                    1, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 41
+                    10, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    48, 47
+                    3, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    56, 25
+                    1, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 39
+                    12, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    56, 55
-                },
+                    5, 4
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,1,
+                17,1,
+                4,0,
+                5,0,
+                1,1,
+                17,1,
+                2,1,
+                4,0,
+                5,0,
+                1,1,
+                2,1,
+                17,1,
+                4,0,
+                5,0,
+                1,1,
+                17,1,
+                2,1,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 23
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        1, 1
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 20
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        3, 2
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-plaqueTabs"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCplus : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "logwidth+0-?2 ",
+            "logheight+0-?2 ",
+            "logwidth+0-logheight",
+            "if(?5 ,0,?2 )",
+            "if(?5 ,logwidth,?3 )",
+            "if(?5 ,?2 ,0)",
+            "if(?5 ,?4 ,logheight)",
+            "logwidth/2",
+            "logheight/2",
+            "logheight",
+            "logwidth"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 31
-                },
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 50000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 35
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 31
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 20
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    2, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 23
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 55
+                    3, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 31
+                    3, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 41
+                    13, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 41
+                    13, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 31
+                    3, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 52
+                    3, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 20
+                    2, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 20
+                    2, 4
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 52
+                    0, 4
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8425,53 +8845,8 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                16,1,
-                2,1,
-                16,1,
-                2,1,
-                16,1,
-                2,2,
-                16,1,
-                2,1,
-                16,1,
-                2,1,
-                16,1,
-                2,1,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,2,
-                16,1,
-                2,2,
-                16,1,
-                4,0,
-                19,0,
-                7,0,
-                5,0,
-                1,1,
-                2,2,
-                16,1,
-                2,1,
-                16,1,
-                2,1,
-                16,1,
-                2,2,
-                16,1,
-                2,1,
-                16,1,
-                2,1,
-                16,1,
+                2,11,
                 4,0,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -8486,7 +8861,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        9, 43
+                        6, 8
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8495,7 +8870,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        13, 36
+                        7, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -8513,7 +8888,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-ellipseRibbon2"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-plus"));
 
     return aPropertyMap;
   }
@@ -8524,41 +8899,41 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider
 } // anonymous namespace
 void CustomShapeProperties::initializePresetsMap4()
 {
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "triangle" ) ] = new ShapeCtriangle();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "teardrop" ) ] = new ShapeCteardrop();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartDocument" ) ] = new ShapeCflowChartDocument();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "rightArrowCallout" ) ] = new ShapeCrightArrowCallout();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "rightBrace" ) ] = new ShapeCrightBrace();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "chartPlus" ) ] = new ShapeCchartPlus();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartManualInput" ) ] = new ShapeCflowChartManualInput();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartMerge" ) ] = new ShapeCflowChartMerge();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "line" ) ] = new ShapeCline();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "downArrow" ) ] = new ShapeCdownArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedDownArrow" ) ] = new ShapeCcurvedDownArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonReturn" ) ] = new ShapeCactionButtonReturn();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartInputOutput" ) ] = new ShapeCflowChartInputOutput();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bracketPair" ) ] = new ShapeCbracketPair();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "smileyFace" ) ] = new ShapeCsmileyFace();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonBlank" ) ] = new ShapeCactionButtonBlank();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "wave" ) ] = new ShapeCwave();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "swooshArrow" ) ] = new ShapeCswooshArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartSummingJunction" ) ] = new ShapeCflowChartSummingJunction();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "lightningBolt" ) ] = new ShapeClightningBolt();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartDisplay" ) ] = new ShapeCflowChartDisplay();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonBackPrevious" ) ] = new ShapeCactionButtonBackPrevious();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "frame" ) ] = new ShapeCframe();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "rtTriangle" ) ] = new ShapeCrtTriangle();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartMagneticTape" ) ] = new ShapeCflowChartMagneticTape();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedRightArrow" ) ] = new ShapeCcurvedRightArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftUpArrow" ) ] = new ShapeCleftUpArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "wedgeEllipseCallout" ) ] = new ShapeCwedgeEllipseCallout();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "doubleWave" ) ] = new ShapeCdoubleWave();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentArrow" ) ] = new ShapeCbentArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star10" ) ] = new ShapeCstar10();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "horizontalScroll" ) ] = new ShapeChorizontalScroll();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "irregularSeal1" ) ] = new ShapeCirregularSeal1();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "irregularSeal2" ) ] = new ShapeCirregularSeal2();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftArrow" ) ] = new ShapeCleftArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedUpArrow" ) ] = new ShapeCcurvedUpArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "snip1Rect" ) ] = new ShapeCsnip1Rect();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "ellipseRibbon2" ) ] = new ShapeCellipseRibbon2();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftArrowCallout" ) ] = new ShapeCleftArrowCallout();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftBrace" ) ] = new ShapeCleftBrace();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftBracket" ) ] = new ShapeCleftBracket();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftCircularArrow" ) ] = new ShapeCleftCircularArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftRightArrow" ) ] = new ShapeCleftRightArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftRightArrowCallout" ) ] = new ShapeCleftRightArrowCallout();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftRightCircularArrow" ) ] = new ShapeCleftRightCircularArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftRightRibbon" ) ] = new ShapeCleftRightRibbon();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftRightUpArrow" ) ] = new ShapeCleftRightUpArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftUpArrow" ) ] = new ShapeCleftUpArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "lightningBolt" ) ] = new ShapeClightningBolt();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "line" ) ] = new ShapeCline();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "lineInv" ) ] = new ShapeClineInv();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "mathDivide" ) ] = new ShapeCmathDivide();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "mathEqual" ) ] = new ShapeCmathEqual();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "mathMinus" ) ] = new ShapeCmathMinus();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "mathMultiply" ) ] = new ShapeCmathMultiply();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "mathNotEqual" ) ] = new ShapeCmathNotEqual();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "mathPlus" ) ] = new ShapeCmathPlus();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "moon" ) ] = new ShapeCmoon();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "noSmoking" ) ] = new ShapeCnoSmoking();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "nonIsoscelesTrapezoid" ) ] = new ShapeCnonIsoscelesTrapezoid();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "notchedRightArrow" ) ] = new ShapeCnotchedRightArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "octagon" ) ] = new ShapeCoctagon();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "parallelogram" ) ] = new ShapeCparallelogram();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "pentagon" ) ] = new ShapeCpentagon();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "pie" ) ] = new ShapeCpie();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "pieWedge" ) ] = new ShapeCpieWedge();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "plaque" ) ] = new ShapeCplaque();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "plaqueTabs" ) ] = new ShapeCplaqueTabs();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "plus" ) ] = new ShapeCplus();
 }
 
 } } // oox // drawingml
diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx
index 9b663ce84c4a..71f841f16d5f 100644
--- a/oox/source/drawingml/customshapepresets5.cxx
+++ b/oox/source/drawingml/customshapepresets5.cxx
@@ -23,42 +23,99 @@ namespace oox { namespace drawingml {
 
 namespace
 {
-class ShapeCplus : public CustomShapeProvider
+class ShapeCquadArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 22500);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 22500);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 22500);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
+            "?0 *2/1",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "100000+0-?1 ",
+            "?3 *1/2",
+            "if(0-$2 ,0,if(?4 -$2 ,$2 ,?4 ))",
             "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "logwidth+0-?2 ",
-            "logheight+0-?2 ",
-            "logwidth+0-logheight",
-            "if(?5 ,0,?2 )",
-            "if(?5 ,logwidth,?3 )",
-            "if(?5 ,?2 ,0)",
-            "if(?5 ,?4 ,logheight)",
+            "?6 *?5 /100000",
+            "?6 *?0 /100000",
             "logwidth/2",
+            "?9 +0-?8 ",
+            "?9 +?8 -0",
+            "?6 *?2 /200000",
+            "?9 +0-?12 ",
+            "?9 +?12 -0",
+            "logwidth+0-?7 ",
             "logheight/2",
-            "logheight",
-            "logwidth"
+            "?16 +0-?8 ",
+            "?16 +?8 -0",
+            "?16 +0-?12 ",
+            "?16 +?12 -0",
+            "logheight+0-?7 ",
+            "?12 *?7 /?8 ",
+            "logwidth+0-?22 ",
+            "logwidth",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 7
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 1);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -67,7 +124,7 @@ class ShapeCplus : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    10, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -89,10 +146,45 @@ class ShapeCplus : public CustomShapeProvider
             }
             {
                 aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 7
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 4);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [0] = aPropSequence;
+            aPropSequenceSequence [2] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -110,62 +202,122 @@ class ShapeCplus : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    0, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 2
+                    7, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 7
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    9, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    11, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 2
+                    14, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 4
+                    14, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 4
+                    15, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 12
+                    15, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 12
+                    24, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 4
+                    15, 18
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 4
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 25
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 18
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -175,7 +327,7 @@ class ShapeCplus : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,11,
+                2,23,
                 4,0,
                 5,0
             };
@@ -191,7 +343,7 @@ class ShapeCplus : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 8
+                        22, 19
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -200,7 +352,7 @@ class ShapeCplus : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        7, 9
+                        23, 20
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -218,7 +370,7 @@ class ShapeCplus : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-plus"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-quadArrow"));
 
     return aPropertyMap;
   }
@@ -226,69 +378,69 @@ class ShapeCplus : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCaccentCallout3 : public CustomShapeProvider
+class ShapeCquadArrowCallout : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (8);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
         {
-            Any aAny ((sal_Int32) 18750);
+            Any aAny ((sal_Int32) 18515);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) -8333);
+            Any aAny ((sal_Int32) 18515);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
         {
-            Any aAny ((sal_Int32) 18750);
+            Any aAny ((sal_Int32) 18515);
             aAdjSequence [2].Value = aAny;
             aAdjSequence [2].Name = "adj3";
         }
         {
-            Any aAny ((sal_Int32) -16667);
+            Any aAny ((sal_Int32) 48123);
             aAdjSequence [3].Value = aAny;
             aAdjSequence [3].Name = "adj4";
         }
-        {
-            Any aAny ((sal_Int32) 100000);
-            aAdjSequence [4].Value = aAny;
-            aAdjSequence [4].Name = "adj5";
-        }
-        {
-            Any aAny ((sal_Int32) -16667);
-            aAdjSequence [5].Value = aAny;
-            aAdjSequence [5].Name = "adj6";
-        }
-        {
-            Any aAny ((sal_Int32) 112963);
-            aAdjSequence [6].Value = aAny;
-            aAdjSequence [6].Name = "adj7";
-        }
-        {
-            Any aAny ((sal_Int32) -8333);
-            aAdjSequence [7].Value = aAny;
-            aAdjSequence [7].Name = "adj8";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logheight*$0 /100000",
-            "logwidth*$1 /100000",
-            "logheight*$2 /100000",
-            "logwidth*$3 /100000",
-            "logheight*$4 /100000",
-            "logwidth*$5 /100000",
-            "logheight*$6 /100000",
-            "logwidth*$7 /100000",
-            "logwidth",
-            "logheight/2",
+            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
+            "?0 *2/1",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "50000+0-?0 ",
+            "if(0-$2 ,0,if(?3 -$2 ,$2 ,?3 ))",
+            "?4 *2/1",
+            "100000+0-?5 ",
+            "if(?2 -$3 ,?2 ,if(?6 -$3 ,$3 ,?6 ))",
+            "min(logwidth,logheight)",
+            "?8 *?0 /100000",
+            "?8 *?2 /200000",
+            "?8 *?4 /100000",
+            "logwidth*?7 /200000",
+            "logheight*?7 /200000",
+            "logwidth+0-?11 ",
             "logwidth/2",
+            "?15 +0-?12 ",
+            "?15 +?12 -0",
+            "?15 +0-?9 ",
+            "?15 +?9 -0",
+            "?15 +0-?10 ",
+            "?15 +?10 -0",
+            "logheight+0-?11 ",
+            "logheight/2",
+            "?23 +0-?13 ",
+            "?23 +?13 -0",
+            "?23 +0-?9 ",
+            "?23 +?9 -0",
+            "?23 +0-?10 ",
+            "?23 +?10 -0",
+            "logwidth",
             "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
@@ -296,77 +448,56 @@ class ShapeCaccentCallout3 : public CustomShapeProvider
     {
         Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    20, 11
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    18, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -374,148 +505,85 @@ class ShapeCaccentCallout3 : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
+                    30, 11
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 3);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 5);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 4);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [2] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 6
+                    0, 24
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 6);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 2);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 7);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 6);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [3] = aPropSequence;
         }
@@ -534,750 +602,163 @@ class ShapeCaccentCallout3 : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 26
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 11
+                    11, 28
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 11
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    16, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    16, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 11
+                    20, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    20, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    18, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    15, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 6
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,3,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,1,
-                6,0,
-                5,0,
-                1,1,
-                2,3,
-                6,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        8, 11
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentCallout3"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCleftCircularArrow : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (5);
-        {
-            Any aAny ((sal_Int32) 12500);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) -1142319);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 1142319);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) 10800000);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
-        {
-            Any aAny ((sal_Int32) 12500);
-            aAdjSequence [4].Value = aAny;
-            aAdjSequence [4].Name = "adj5";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
-    }
-    {
-        static const char *aStrings[] = {
-            "if(0-$4 ,0,if(25000-$4 ,$4 ,25000))",
-            "?0 *2/1",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "if(1-$2 ,1,if(21599999-$2 ,$2 ,21599999))",
-            "if(0-$3 ,0,if(21599999-$3 ,$3 ,21599999))",
-            "min(logwidth,logheight)",
-            "?5 *?2 /100000",
-            "?5 *?0 /100000",
-            "?6 *1/2",
-            "logwidth/2",
-            "?9 +?8 -?7 ",
-            "logheight/2",
-            "?11 +?8 -?7 ",
-            "?10 +0-?6 ",
-            "?12 +0-?6 ",
-            "?13 +?8 -0",
-            "?14 +?8 -0",
-            "?15 *sin(pi*(?3 )/10800000)",
-            "?16 *cos(pi*(?3 )/10800000)",
-            "?15 *(cos(atan2(?17 ,?18 )))",
-            "?16 *(sin(atan2(?17 ,?18 )))",
-            "logwidth/2",
-            "?21 +?19 -0",
-            "logheight/2",
-            "?23 +?20 -0",
-            "min(?13 ,?14 )",
-            "?19 *?19 /1",
-            "?20 *?20 /1",
-            "?25 *?25 /1",
-            "?26 +0-?28 ",
-            "?27 +0-?28 ",
-            "?29 *?30 /?26 ",
-            "?31 *1/?27 ",
-            "1+0-?32 ",
-            "sqrt(?33 )",
-            "?29 *1/?19 ",
-            "?35 *1/?20 ",
-            "(1+?34 )/?36 ",
-            "(10800000*atan2(?37 ,1))/pi",
-            "?38 +21600000-0",
-            "if(?38 ,?38 ,?39 )",
-            "?40 +0-?3 ",
-            "?41 +21600000-0",
-            "if(?41 ,?41 ,?42 )",
-            "?43 +0-10800000",
-            "?43 +0-21600000",
-            "if(?44 ,?45 ,?43 )",
-            "abs(?46 )",
-            "?47 *-1/1",
-            "abs($1 )",
-            "?49 *-1/1",
-            "if(?48 -?50 ,?48 ,if(0-?50 ,?50 ,0))",
-            "?3 +?51 -0",
-            "?15 *sin(pi*(?52 )/10800000)",
-            "?16 *cos(pi*(?52 )/10800000)",
-            "?15 *(cos(atan2(?53 ,?54 )))",
-            "?16 *(sin(atan2(?53 ,?54 )))",
-            "?21 +?55 -0",
-            "?23 +?56 -0",
-            "?10 *sin(pi*(?4 )/10800000)",
-            "?12 *cos(pi*(?4 )/10800000)",
-            "?10 *(cos(atan2(?59 ,?60 )))",
-            "?12 *(sin(atan2(?59 ,?60 )))",
-            "?21 +?61 -0",
-            "?23 +?62 -0",
-            "?13 *sin(pi*(?4 )/10800000)",
-            "?14 *cos(pi*(?4 )/10800000)",
-            "?13 *(cos(atan2(?65 ,?66 )))",
-            "?14 *(sin(atan2(?65 ,?66 )))",
-            "?21 +?67 -0",
-            "?23 +?68 -0",
-            "?7 *cos(pi*(?52 )/10800000)",
-            "?7 *sin(pi*(?52 )/10800000)",
-            "?22 +?71 -0",
-            "?24 +?72 -0",
-            "?7 *cos(pi*(?52 )/10800000)",
-            "?7 *sin(pi*(?52 )/10800000)",
-            "?22 +0-?75 ",
-            "?24 +0-?76 ",
-            "?77 +0-?21 ",
-            "?78 +0-?23 ",
-            "?73 +0-?21 ",
-            "?74 +0-?23 ",
-            "min(?10 ,?12 )",
-            "?79 *?83 /?10 ",
-            "?80 *?83 /?12 ",
-            "?81 *?83 /?10 ",
-            "?82 *?83 /?12 ",
-            "?86 +0-?84 ",
-            "?87 +0-?85 ",
-            "sqrt(?88 *?88 +?89 *?89 +0*0)",
-            "?84 *?87 /1",
-            "?86 *?85 /1",
-            "?91 +0-?92 ",
-            "?83 *?83 /1",
-            "?90 *?90 /1",
-            "?94 *?95 /1",
-            "?93 *?93 /1",
-            "?96 +0-?97 ",
-            "max(?98 ,0)",
-            "sqrt(?99 )",
-            "?89 *-1/1",
-            "if(?101 ,-1,1)",
-            "?102 *?88 /1",
-            "?103 *?100 /1",
-            "?93 *?89 /1",
-            "(?105 +?104 )/?95 ",
-            "?105 +0-?104 ",
-            "?107 *1/?95 ",
-            "abs(?89 )",
-            "?109 *?100 /1",
-            "?93 *?88 /-1",
-            "(?111 +?110 )/?95 ",
-            "?111 +0-?110 ",
-            "?113 *1/?95 ",
-            "?86 +0-?106 ",
-            "?86 +0-?108 ",
-            "?87 +0-?112 ",
-            "?87 +0-?114 ",
-            "sqrt(?115 *?115 +?117 *?117 +0*0)",
-            "sqrt(?116 *?116 +?118 *?118 +0*0)",
-            "?120 +0-?119 ",
-            "if(?121 ,?106 ,?108 )",
-            "if(?121 ,?112 ,?114 )",
-            "?122 *?10 /?83 ",
-            "?123 *?12 /?83 ",
-            "?21 +?124 -0",
-            "?23 +?125 -0",
-            "?79 *?25 /?13 ",
-            "?80 *?25 /?14 ",
-            "?81 *?25 /?13 ",
-            "?82 *?25 /?14 ",
-            "?130 +0-?128 ",
-            "?131 +0-?129 ",
-            "sqrt(?132 *?132 +?133 *?133 +0*0)",
-            "?128 *?131 /1",
-            "?130 *?129 /1",
-            "?135 +0-?136 ",
-            "?25 *?25 /1",
-            "?134 *?134 /1",
-            "?138 *?139 /1",
-            "?137 *?137 /1",
-            "?140 +0-?141 ",
-            "max(?142 ,0)",
-            "sqrt(?143 )",
-            "?102 *?132 /1",
-            "?145 *?144 /1",
-            "?137 *?133 /1",
-            "(?147 +?146 )/?139 ",
-            "?147 +0-?146 ",
-            "?149 *1/?139 ",
-            "abs(?133 )",
-            "?151 *?144 /1",
-            "?137 *?132 /-1",
-            "(?153 +?152 )/?139 ",
-            "?153 +0-?152 ",
-            "?155 *1/?139 ",
-            "?128 +0-?148 ",
-            "?128 +0-?150 ",
-            "?129 +0-?154 ",
-            "?129 +0-?156 ",
-            "sqrt(?157 *?157 +?159 *?159 +0*0)",
-            "sqrt(?158 *?158 +?160 *?160 +0*0)",
-            "?162 +0-?161 ",
-            "if(?163 ,?148 ,?150 )",
-            "if(?163 ,?154 ,?156 )",
-            "?164 *?13 /?25 ",
-            "?165 *?14 /?25 ",
-            "?21 +?166 -0",
-            "?23 +?167 -0",
-            "(10800000*atan2(?167 ,?166 ))/pi",
-            "?170 +21600000-0",
-            "if(?170 ,?170 ,?171 )",
-            "?4 +0-?172 ",
-            "?173 +21600000-0",
-            "if(?173 ,?173 ,?174 )",
-            "?172 +?175 -0",
-            "0+0-?175 ",
-            "?126 +0-?168 ",
-            "?127 +0-?169 ",
-            "sqrt(?178 *?178 +?179 *?179 +0*0)",
-            "?180 *1/2",
-            "?181 +0-?7 ",
-            "if(?182 ,?126 ,?73 )",
-            "if(?182 ,?127 ,?74 )",
-            "if(?182 ,?168 ,?77 )",
-            "if(?182 ,?169 ,?78 )",
-            "(10800000*atan2(?125 ,?124 ))/pi",
-            "?187 +21600000-0",
-            "if(?187 ,?187 ,?188 )",
-            "?189 +0-?4 ",
-            "?190 +0-21600000",
-            "if(?190 ,?191 ,?190 )",
-            "?4 +?192 -0",
-            "0+0-?192 ",
-            "?15 *sin(pi*(?4 )/10800000)",
-            "?16 *cos(pi*(?4 )/10800000)",
-            "?15 *(cos(atan2(?195 ,?196 )))",
-            "?16 *(sin(atan2(?195 ,?196 )))",
-            "?21 +?197 -0",
-            "?23 +?198 -0",
-            "?4 +5400000-0",
-            "?52 +0-5400000",
-            "?52 +10800000-0",
-            "?10 *cos(pi*(2700000)/10800000)",
-            "?12 *sin(pi*(2700000)/10800000)",
-            "?21 +0-?204 ",
-            "?21 +?204 -0",
-            "?23 +0-?205 ",
-            "?23 +?205 -0",
-            "(?176 )/60000.0",
-            "(?177 )/60000.0",
-            "(?193 )/60000.0",
-            "(?194 )/60000.0"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
-        {
-            Sequence< PropertyValue > aPropSequence (1);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+                    19, 11
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    57, 58
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (1);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+                    21, 11
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    63, 64
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (3);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+                    21, 24
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    126, 127
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RadiusRangeMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RadiusRangeMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (3);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+                    17, 24
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    77, 78
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RadiusRangeMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 25000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RadiusRangeMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            aPropSequenceSequence [3] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
+                    17, 28
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    63, 64
+                    14, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    69, 70
+                    14, 26
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 14
+                    30, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    210, 211
+                    14, 27
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    185, 186
+                    14, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    57, 58
+                    17, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    183, 184
+                    17, 25
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    126, 127
+                    21, 25
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 12
+                    21, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    212, 213
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,1,
-                17,1,
-                2,4,
-                17,1,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        206, 208
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        207, 209
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftCircularArrow"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCrightArrow : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
-    }
-    {
-        static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "100000*logwidth/?0 ",
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
-            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "?0 *?3 /100000",
-            "logwidth+0-?4 ",
-            "logheight*?2 /200000",
-            "logheight/2",
-            "?7 +0-?6 ",
-            "?7 +?6 -0",
-            "logheight/2",
-            "?8 *?4 /?10 ",
-            "?5 +?11 -0",
-            "logheight",
-            "logwidth"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+                    19, 22
+                },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 100000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
+                    15, 31
+                },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 8
+                    20, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 25
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 7
+                    16, 25
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 13
+                    16, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 9
+                    11, 29
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 27
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1287,7 +768,7 @@ class ShapeCrightArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,6,
+                2,31,
                 4,0,
                 5,0
             };
@@ -1301,9 +782,9 @@ class ShapeCrightArrow : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 8
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        16, 24
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1312,7 +793,7 @@ class ShapeCrightArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        12, 9
+                        17, 25
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -1330,7 +811,7 @@ class ShapeCrightArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-rightArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-quadArrowCallout"));
 
     return aPropertyMap;
   }
@@ -1338,7 +819,7 @@ class ShapeCrightArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartPunchedCard : public CustomShapeProvider
+class ShapeCrect : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -1352,8 +833,7 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider
             "logwidth/2",
             "logheight/2",
             "logheight",
-            "logwidth",
-            "logheight/5"
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -1367,34 +847,29 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (3);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    0, 0
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    3, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 5
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 5
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 2
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1404,25 +879,14 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,4,
+                2,3,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 5;
-                aSize.Height = 5;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -1430,8 +894,8 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        0, 4
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1446,7 +910,7 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -1458,7 +922,7 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartPunchedCard"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-rect"));
 
     return aPropertyMap;
   }
@@ -1466,7 +930,7 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCsnip2DiagRect : public CustomShapeProvider
+class ShapeCribbon : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -1475,12 +939,12 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 0);
+            Any aAny ((sal_Int32) 16667);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 16667);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
@@ -1488,24 +952,62 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
-            "min(logwidth,logheight)",
-            "?2 *?0 /100000",
-            "logwidth+0-?3 ",
-            "logheight+0-?3 ",
-            "?2 *?1 /100000",
-            "logwidth+0-?6 ",
-            "logheight+0-?6 ",
-            "?3 +0-?6 ",
-            "if(?9 ,?3 ,?6 )",
-            "?10 *1/2",
-            "logwidth+0-?11 ",
-            "logheight+0-?11 ",
-            "logwidth",
-            "logheight/2",
+            "if(0-$0 ,0,if(33333-$0 ,$0 ,33333))",
+            "if(25000-$1 ,25000,if(75000-$1 ,$1 ,75000))",
+            "logwidth/8",
+            "logwidth+0-?2 ",
+            "logwidth*?1 /200000",
             "logwidth/2",
-            "logheight"
+            "?5 +0-?4 ",
+            "?5 +?4 -0",
+            "logwidth/32",
+            "?6 +?8 -0",
+            "?7 +0-?8 ",
+            "?6 +?2 -0",
+            "?7 +0-?2 ",
+            "?11 +0-?8 ",
+            "?12 +?8 -0",
+            "logheight*?0 /200000",
+            "logheight*?0 /100000",
+            "logheight+0-?16 ",
+            "?17 *1/2",
+            "logheight*?0 /400000",
+            "logheight+0-?19 ",
+            "?16 +0-?19 ",
+            "logheight",
+            "(16200000)/60000.0",
+            "(10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(-10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(-10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "logwidth",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(-5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(-10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(-10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -1518,21 +1020,21 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 16
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 33333);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -1540,7 +1042,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -1554,14 +1056,14 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    7, 0
+                    6, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 75000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -1569,7 +1071,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) 25000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
@@ -1595,536 +1097,374 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    7, 0
+                    13, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 6
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 5
+                    23, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 17
+                    9, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 17
+                    8, 19
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 26
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,7,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        11, 11
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        12, 13
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-snip2DiagRect"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCverticalScroll : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
-        {
-            Any aAny ((sal_Int32) 12500);
-            aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
-        }
-        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
-    }
-    {
-        static const char *aStrings[] = {
-            "if(0-$0 ,0,if(25000-$0 ,$0 ,25000))",
-            "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "?2 *1/2",
-            "?2 *1/4",
-            "?2 +?3 -0",
-            "?2 +?2 -0",
-            "logwidth+0-?2 ",
-            "logwidth+0-?3 ",
-            "?7 +0-?3 ",
-            "logheight+0-?2 ",
-            "logheight+0-?3 ",
-            "logwidth/2",
-            "logheight/2",
-            "logheight",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(-10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(16200000)/60000.0",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 25000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
+                    10, 16
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 14
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    27, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 16
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 11
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 4
+                    29, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 18
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    31, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 10
+                    3, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 3
+                    31, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    7, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 20
+                    7, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    32, 33
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 22
+                    9, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 2
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 11
+                    34, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    6, 17
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 24
+                    0, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 3
+                    2, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    11, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 4
+                    36, 37
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 28
+                    9, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 3
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    38, 39
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 30
+                    11, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 4
+                    12, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 32
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 11
+                    40, 41
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    10, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    33, 34
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 4
+                    42, 43
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    35, 36
+                    12, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    13, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 10
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 3
+                    44, 45
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    9, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    37, 38
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    46, 47
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    10, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    39, 40
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 2
+                    48, 49
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 11
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    41, 42
+                    50, 51
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    31, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 14
+                    3, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    31, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    43, 44
+                    7, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    45, 46
+                    52, 53
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 4
+                    9, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    47, 48
+                    8, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 3
+                    54, 55
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 2
+                    6, 17
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    0, 17
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 10
+                    11, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 4
+                    11, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    49, 50
+                    12, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 11
+                    12, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 14
+                    6, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    6, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    51, 52
+                    7, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 10
+                    7, 17
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2134,26 +1474,33 @@ class ShapeCverticalScroll : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
+                2,1,
                 17,1,
                 2,1,
                 17,1,
-                2,2,
+                2,1,
                 17,1,
                 2,1,
                 17,1,
-                2,2,
+                2,5,
                 17,1,
-                4,0,
-                1,1,
-                17,2,
+                2,1,
+                17,1,
+                2,3,
                 4,0,
                 7,0,
                 5,0,
                 1,1,
-                17,2,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
                 4,0,
                 1,1,
-                17,2,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
                 4,0,
                 19,0,
                 7,0,
@@ -2163,21 +1510,23 @@ class ShapeCverticalScroll : public CustomShapeProvider
                 17,1,
                 2,1,
                 17,1,
-                2,2,
+                2,1,
                 17,1,
                 2,1,
                 17,1,
+                2,5,
+                17,1,
+                2,1,
+                17,1,
+                2,3,
                 4,0,
                 1,1,
-                17,2,
                 2,1,
                 1,1,
                 2,1,
                 1,1,
-                17,1,
                 2,1,
                 1,1,
-                17,1,
                 2,1,
                 6,0,
                 5,0
@@ -2194,7 +1543,7 @@ class ShapeCverticalScroll : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        2, 2
+                        6, 16
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -2203,7 +1552,7 @@ class ShapeCverticalScroll : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        7, 11
+                        7, 22
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -2221,7 +1570,7 @@ class ShapeCverticalScroll : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-verticalScroll"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-ribbon"));
 
     return aPropertyMap;
   }
@@ -2229,80 +1578,91 @@ class ShapeCverticalScroll : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCstar7 : public CustomShapeProvider
+class ShapeCribbon2 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 34601);
+            Any aAny ((sal_Int32) 16667);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 102572);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "hf";
-        }
-        {
-            Any aAny ((sal_Int32) 105210);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "vf";
+            aAdjSequence [1].Name = "adj2";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "logwidth/2",
-            "?1 *$1 /100000",
-            "logheight/2",
-            "?3 *$2 /100000",
-            "logheight/2",
-            "?5 *$2 /100000",
-            "?2 *97493/100000",
-            "?2 *78183/100000",
-            "?2 *43388/100000",
-            "?4 *62349/100000",
-            "?4 *22252/100000",
-            "?4 *90097/100000",
+            "if(0-$0 ,0,if(33333-$0 ,$0 ,33333))",
+            "if(25000-$1 ,25000,if(75000-$1 ,$1 ,75000))",
+            "logwidth/8",
+            "logwidth+0-?2 ",
+            "logwidth*?1 /200000",
             "logwidth/2",
-            "?13 +0-?7 ",
-            "?13 +0-?8 ",
-            "?13 +0-?9 ",
-            "?13 +?9 -0",
-            "?13 +?8 -0",
-            "?13 +?7 -0",
-            "?6 +0-?10 ",
-            "?6 +?11 -0",
-            "?6 +?12 -0",
-            "?2 *?0 /50000",
-            "?4 *?0 /50000",
-            "?23 *97493/100000",
-            "?23 *78183/100000",
-            "?23 *43388/100000",
-            "?13 +0-?25 ",
-            "?13 +0-?26 ",
-            "?13 +0-?27 ",
-            "?13 +?27 -0",
-            "?13 +?26 -0",
-            "?13 +?25 -0",
-            "?24 *90097/100000",
-            "?24 *22252/100000",
-            "?24 *62349/100000",
-            "?6 +0-?34 ",
-            "?6 +0-?35 ",
-            "?6 +?36 -0",
-            "?6 +?24 -0",
-            "?6 +0-?24 "
+            "?5 +0-?4 ",
+            "?5 +?4 -0",
+            "logwidth/32",
+            "?6 +?8 -0",
+            "?7 +0-?8 ",
+            "?6 +?2 -0",
+            "?7 +0-?2 ",
+            "?11 +0-?8 ",
+            "?12 +?8 -0",
+            "logheight*?0 /200000",
+            "logheight+0-?15 ",
+            "logheight*?0 /100000",
+            "logheight+0-?17 ",
+            "0+?17 -0",
+            "(?19 +logheight)/2",
+            "logheight*?0 /400000",
+            "logheight+0-?21 ",
+            "?16 +0-?21 ",
+            "logheight",
+            "(5400000)/60000.0",
+            "(-10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(-10800000)/60000.0",
+            "logwidth",
+            "(0)/60000.0",
+            "(-5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(-5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(-10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(-10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(-10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(10800000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -2311,14 +1671,14 @@ class ShapeCstar7 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 41
+                    5, 18
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 33333);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -2338,6 +1698,41 @@ class ShapeCstar7 : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 24
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 75000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 25000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -2352,617 +1747,379 @@ class ShapeCstar7 : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 21
+                    0, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 38
+                    13, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 20
+                    8, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 37
+                    25, 26
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    13, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 37
+                    8, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 20
+                    27, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    33, 38
+                    10, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 21
+                    8, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 39
+                    29, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 22
+                    14, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 40
+                    8, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 22
+                    31, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 39
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,13,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        29, 37
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        32, 39
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [2].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star7"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCchartX : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Equations, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (3);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    33, 24
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 10
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 20
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 10
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    33, 19
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 19
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 21
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 10
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 21
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 10
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    34, 35
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                6,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                7,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (2);
-            {
-                awt::Size aSize;
-                aSize.Width = 10;
-                aSize.Height = 10;
-                aSizeSequence [0] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 10;
-                aSize.Height = 10;
-                aSizeSequence [1] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 400000;
-        aRectangle.Height = 400000;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-chartX"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCcloud : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "logwidth*2977/21600",
-            "logheight*3262/21600",
-            "logwidth*17087/21600",
-            "logheight*17337/21600",
-            "logwidth*67/21600",
-            "logheight*21577/21600",
-            "logwidth*21582/21600",
-            "logheight*1235/21600",
-            "logheight/2",
-            "logwidth/2",
-            "(-11429249)/60000.0",
-            "(7426832)/60000.0",
-            "(-8646143)/60000.0",
-            "(5396714)/60000.0",
-            "(-8748475)/60000.0",
-            "(5983381)/60000.0",
-            "(-7859164)/60000.0",
-            "(7034504)/60000.0",
-            "(-4722533)/60000.0",
-            "(6541615)/60000.0",
-            "(-2776035)/60000.0",
-            "(7816140)/60000.0",
-            "(37501)/60000.0",
-            "(6842000)/60000.0",
-            "(1347096)/60000.0",
-            "(6910353)/60000.0",
-            "(3974558)/60000.0",
-            "(4542661)/60000.0",
-            "(-16496525)/60000.0",
-            "(8804134)/60000.0",
-            "(-14809710)/60000.0",
-            "(9151131)/60000.0",
-            "(5204520)/60000.0",
-            "(1585770)/60000.0",
-            "(4416628)/60000.0",
-            "(686848)/60000.0",
-            "(8257449)/60000.0",
-            "(844866)/60000.0",
-            "(387196)/60000.0",
-            "(959901)/60000.0",
-            "(-4217541)/60000.0",
-            "(4255042)/60000.0",
-            "(1819082)/60000.0",
-            "(1665090)/60000.0",
-            "(-824660)/60000.0",
-            "(891534)/60000.0",
-            "(-8950887)/60000.0",
-            "(1091722)/60000.0",
-            "(-9809656)/60000.0",
-            "(1061181)/60000.0",
-            "(-4002417)/60000.0",
-            "(739161)/60000.0",
-            "(9459261)/60000.0",
-            "(711490)/60000.0"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (4);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
+                    9, 0
+                },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3900, 14370
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 21
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6753, 9190
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    36, 37
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 11
+                    6, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5333, 7267
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
+                    2, 20
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4365, 5945
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
+                    8, 21
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4857, 6595
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    38, 39
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 17
+                    9, 16
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5333, 7273
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 19
+                    40, 41
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6775, 9220
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 21
+                    12, 22
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5785, 7867
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
+                    42, 43
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6752, 9215
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 25
+                    8, 21
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    7720, 10543
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    44, 45
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 27
+                    12, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4360, 5918
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 29
+                    2, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4345, 5945
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 31
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4693, 26177
+                    6, 19
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4345, 5945
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 33
+                    8, 21
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6928, 34899
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    46, 47
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4360, 5918
+                    10, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    34, 35
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    16478, 39090
+                    8, 21
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6752, 9215
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    48, 49
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    36, 37
+                    7, 19
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    28827, 34751
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 19
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6752, 9215
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    33, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    38, 39
+                    3, 20
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    34129, 22954
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    33, 24
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5785, 7867
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 24
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    40, 41
+                    8, 21
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    41798, 15354
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    50, 51
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5333, 7273
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    42, 43
+                    8, 21
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    38324, 5426
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    52, 53
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4857, 6595
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    44, 45
+                    8, 21
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    29078, 3952
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    54, 55
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4857, 6595
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    46, 47
+                    8, 21
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    22141, 4720
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    56, 57
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4365, 5945
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    48, 49
+                    11, 22
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    14000, 5192
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 22
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6753, 9190
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    50, 51
+                    6, 23
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4127, 15789
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 19
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6753, 9190
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    52, 53
+                    7, 23
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2972,55 +2129,66 @@ class ShapeCcloud : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,11,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                2,5,
+                17,1,
+                2,1,
+                17,1,
+                2,3,
                 4,0,
+                7,0,
                 5,0,
                 1,1,
                 17,1,
-                1,1,
+                2,1,
                 17,1,
+                2,1,
+                4,0,
                 1,1,
                 17,1,
-                1,1,
+                2,1,
                 17,1,
+                2,1,
+                4,0,
+                19,0,
+                7,0,
+                5,0,
                 1,1,
+                2,4,
                 17,1,
-                1,1,
+                2,1,
                 17,1,
-                1,1,
+                2,6,
                 17,1,
-                1,1,
+                2,1,
                 17,1,
-                1,1,
+                2,1,
                 17,1,
-                1,1,
+                2,1,
                 17,1,
+                4,0,
                 1,1,
-                17,1,
+                2,1,
+                1,1,
+                2,1,
+                1,1,
+                2,1,
+                1,1,
+                2,1,
                 6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (2);
-            {
-                awt::Size aSize;
-                aSize.Width = 43200;
-                aSize.Height = 43200;
-                aSizeSequence [0] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 43200;
-                aSize.Height = 43200;
-                aSizeSequence [1] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -3028,8 +2196,8 @@ class ShapeCcloud : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        0, 1
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        6, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3038,13 +2206,13 @@ class ShapeCcloud : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        2, 3
+                        7, 18
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -3056,7 +2224,7 @@ class ShapeCcloud : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-cloud"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-ribbon2"));
 
     return aPropertyMap;
   }
@@ -3064,39 +2232,48 @@ class ShapeCcloud : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcube : public CustomShapeProvider
+class ShapeCrightArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
             "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "logheight+0-?2 ",
-            "?3 *1/2",
-            "(?2 +logheight)/2",
-            "logwidth+0-?2 ",
-            "?6 *1/2",
-            "(?2 +logwidth)/2",
+            "100000*logwidth/?0 ",
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "?0 *?3 /100000",
+            "logwidth+0-?4 ",
+            "logheight*?2 /200000",
+            "logheight/2",
+            "?7 +0-?6 ",
+            "?7 +?6 -0",
+            "logheight/2",
+            "?8 *?4 /?10 ",
+            "?5 +?11 -0",
             "logheight",
             "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -3105,7 +2282,7 @@ class ShapeCcube : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    0, 8
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -3132,6 +2309,41 @@ class ShapeCcube : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 1);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -3148,117 +2360,37 @@ class ShapeCcube : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 9
+                    0, 8
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
+                    5, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 2
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    5, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
+                    14, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
+                    5, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 9
+                    5, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
                     0, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    10, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 9
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3268,30 +2400,8 @@ class ShapeCcube : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                19,0,
-                7,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
-                21,0,
-                7,0,
-                5,0,
-                1,1,
-                2,5,
+                2,6,
                 4,0,
-                1,1,
-                2,2,
-                1,1,
-                2,1,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -3306,7 +2416,7 @@ class ShapeCcube : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 2
+                        0, 8
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3315,7 +2425,7 @@ class ShapeCcube : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 9
+                        12, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -3333,7 +2443,7 @@ class ShapeCcube : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-cube"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-rightArrow"));
 
     return aPropertyMap;
   }
@@ -3341,59 +2451,66 @@ class ShapeCcube : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCround2DiagRect : public CustomShapeProvider
+class ShapeCrightArrowCallout : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
         {
-            Any aAny ((sal_Int32) 16667);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 0);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) 64977);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
             "min(logwidth,logheight)",
-            "?2 *?0 /100000",
-            "logheight+0-?3 ",
-            "?2 *?1 /100000",
-            "logwidth+0-?5 ",
-            "logheight+0-?5 ",
-            "?3 *29289/100000",
-            "?5 *29289/100000",
-            "?8 +0-?9 ",
-            "if(?10 ,?8 ,?9 )",
-            "logwidth+0-?11 ",
-            "logheight+0-?11 ",
-            "logwidth",
+            "50000*logheight/?0 ",
+            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "?2 *2/1",
+            "if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))",
+            "100000*logwidth/?0 ",
+            "if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))",
+            "?6 *?0 /logwidth",
+            "100000+0-?7 ",
+            "if(0-$3 ,0,if(?8 -$3 ,$3 ,?8 ))",
+            "?0 *?2 /100000",
+            "?0 *?4 /200000",
             "logheight/2",
-            "logwidth/2",
-            "logheight",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0"
+            "?12 +0-?10 ",
+            "?12 +0-?11 ",
+            "?12 +?11 -0",
+            "?12 +?10 -0",
+            "?0 *?6 /100000",
+            "logwidth+0-?17 ",
+            "logwidth*?9 /100000",
+            "?19 *1/2",
+            "logwidth",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -3401,21 +2518,21 @@ class ShapeCround2DiagRect : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 14
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 3);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -3423,7 +2540,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -3436,17 +2553,87 @@ class ShapeCround2DiagRect : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 13
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 1);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    6, 0
+                    18, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 5);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 22
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 8);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -3459,10 +2646,10 @@ class ShapeCround2DiagRect : public CustomShapeProvider
             }
             {
                 aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 3);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [1] = aPropSequence;
+            aPropSequenceSequence [3] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -3478,69 +2665,59 @@ class ShapeCround2DiagRect : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    6, 0
+                    19, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 5
+                    19, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 19
+                    18, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 4
+                    18, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    21, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    20, 21
+                    18, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 17
+                    18, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 5
+                    19, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 23
+                    19, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    24, 25
+                    0, 22
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3550,14 +2727,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
+                2,10,
                 4,0,
                 5,0
             };
@@ -3571,9 +2741,9 @@ class ShapeCround2DiagRect : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        11, 11
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3582,7 +2752,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        12, 13
+                        19, 22
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -3600,7 +2770,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-round2DiagRect"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-rightArrowCallout"));
 
     return aPropertyMap;
   }
@@ -3608,29 +2778,140 @@ class ShapeCround2DiagRect : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartMultidocument : public CustomShapeProvider
+class ShapeCrightBrace : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        {
+            Any aAny ((sal_Int32) 8333);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logheight*3675/21600",
-            "logheight*20782/21600",
-            "logwidth*9298/21600",
-            "logwidth*12286/21600",
-            "logwidth*18595/21600",
-            "logheight/2",
-            "logwidth"
+            "if(0-$1 ,0,if(100000-$1 ,$1 ,100000))",
+            "100000+0-?0 ",
+            "min(?1 ,?0 )",
+            "?2 *1/2",
+            "min(logwidth,logheight)",
+            "?3 *logheight/?4 ",
+            "if(0-$0 ,0,if(?5 -$0 ,$0 ,?5 ))",
+            "?4 *?6 /100000",
+            "logheight*?0 /100000",
+            "?8 +0-?7 ",
+            "logheight+0-?7 ",
+            "logwidth/2",
+            "?11 *cos(pi*(2700000)/10800000)",
+            "?7 *sin(pi*(2700000)/10800000)",
+            "0+?12 -0",
+            "?7 +0-?13 ",
+            "logheight+?13 -?7 ",
+            "logwidth/2",
+            "logwidth",
+            "logheight",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(-5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(-5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 7
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 5);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 8
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 100000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -3639,309 +2920,119 @@ class ShapeCflowChartMultidocument : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (3);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 20782
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9298, 23542
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9298, 18022
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18595, 18022
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18595, 3675
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 3675
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1532, 3675
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1532, 1815
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20000, 1815
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20000, 16252
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    19298, 16252
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18595, 16352
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18595, 16352
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18595, 3675
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2972, 1815
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2972, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    21600, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    21600, 14392
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20800, 14392
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20000, 14467
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20000, 14467
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20000, 1815
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 3675
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18595, 3675
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18595, 18022
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9298, 18022
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9298, 23542
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 20782
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1532, 3675
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1532, 1815
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20000, 1815
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20000, 16252
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    19298, 16252
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18595, 16352
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18595, 16352
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2972, 1815
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2972, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    21600, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    21600, 14392
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20800, 14392
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 7
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20000, 14467
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 21
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20000, 14467
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 9
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 20782
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 7
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9298, 23542
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 23
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    9298, 18022
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 7
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18595, 18022
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 25
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18595, 16352
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 10
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18595, 16352
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 7
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    19298, 16252
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 27
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    20000, 16252
+                    0, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20000, 14467
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 7
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20000, 14467
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 29
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    20800, 14392
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 9
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    21600, 14392
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 7
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    21600, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    30, 31
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2972, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 7
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2972, 1815
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 33
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1532, 1815
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 10
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1532, 3675
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 7
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 3675
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    34, 35
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3951,72 +3042,27 @@ class ShapeCflowChartMultidocument : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                3,1,
-                2,2,
-                4,0,
-                1,1,
-                2,3,
-                3,1,
+                17,1,
                 2,1,
-                4,0,
-                1,1,
-                2,3,
-                3,1,
+                17,2,
                 2,1,
+                17,1,
                 4,0,
                 7,0,
                 5,0,
                 1,1,
-                2,2,
-                3,1,
-                4,0,
-                1,1,
-                2,3,
-                3,1,
-                1,1,
-                2,3,
-                3,1,
-                6,0,
-                5,0,
-                1,1,
-                3,1,
+                17,1,
                 2,1,
-                3,1,
+                17,2,
                 2,1,
-                3,1,
-                2,6,
-                4,0,
+                17,1,
                 6,0,
-                7,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (3);
-            {
-                awt::Size aSize;
-                aSize.Width = 21600;
-                aSize.Height = 21600;
-                aSizeSequence [0] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 21600;
-                aSize.Height = 21600;
-                aSizeSequence [1] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 21600;
-                aSize.Height = 21600;
-                aSizeSequence [2] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -4025,7 +3071,7 @@ class ShapeCflowChartMultidocument : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 0
+                        0, 15
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4034,13 +3080,13 @@ class ShapeCflowChartMultidocument : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 1
+                        14, 16
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -4052,7 +3098,7 @@ class ShapeCflowChartMultidocument : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartMultidocument"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-rightBrace"));
 
     return aPropertyMap;
   }
@@ -4060,36 +3106,86 @@ class ShapeCflowChartMultidocument : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCactionButtonDocument : public CustomShapeProvider
+class ShapeCrightBracket : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 8333);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
             "min(logwidth,logheight)",
-            "?0 *3/8",
+            "50000*logheight/?0 ",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "?0 *?2 /100000",
+            "logheight+0-?3 ",
+            "logwidth*cos(pi*(2700000)/10800000)",
+            "?3 *sin(pi*(2700000)/10800000)",
+            "0+?5 -0",
+            "?3 +0-?6 ",
+            "logheight+?6 -?3 ",
+            "logwidth",
+            "logheight",
             "logheight/2",
-            "?2 +0-?1 ",
-            "?2 +?1 -0",
-            "?0 *9/32",
-            "logwidth/2",
-            "?6 +0-?5 ",
-            "?6 +?5 -0",
-            "?0 *3/16",
-            "?8 +0-?9 ",
-            "?3 +?9 -0",
             "logwidth",
-            "logheight"
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 3
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 1);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -4109,148 +3205,58 @@ class ShapeCactionButtonDocument : public CustomShapeProvider
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    12, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 13
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 11
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 11
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 11
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
+                    13, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 11
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 11
+                    10, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 3
+                    13, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 11
+                    16, 17
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 4
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 4
+                    13, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 11
+                    18, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 11
+                    10, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    12, 0
+                    13, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 13
+                    20, 21
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4260,35 +3266,16 @@ class ShapeCactionButtonDocument : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
-                4,0,
-                1,1,
-                2,4,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,5,
-                4,0,
-                19,0,
-                7,0,
-                5,0,
-                1,1,
-                2,2,
+                17,1,
+                2,1,
+                17,1,
                 4,0,
-                18,0,
                 7,0,
                 5,0,
                 1,1,
-                2,4,
-                4,0,
-                1,1,
-                2,2,
-                6,0,
-                5,0,
-                1,1,
-                2,3,
-                4,0,
+                17,1,
+                2,1,
+                17,1,
                 6,0,
                 5,0
             };
@@ -4303,8 +3290,8 @@ class ShapeCactionButtonDocument : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        0, 8
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4313,7 +3300,7 @@ class ShapeCactionButtonDocument : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        12, 13
+                        7, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4331,7 +3318,7 @@ class ShapeCactionButtonDocument : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-actionButtonDocument"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-rightBracket"));
 
     return aPropertyMap;
   }
@@ -4339,34 +3326,76 @@ class ShapeCactionButtonDocument : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartTerminator : public CustomShapeProvider
+class ShapeCround1Rect : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 16667);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logwidth*1018/21600",
-            "logwidth*20582/21600",
-            "logheight*3163/21600",
-            "logheight*18437/21600",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "logwidth+0-?2 ",
+            "?2 *29289/100000",
+            "logwidth+0-?4 ",
             "logwidth/2",
             "logheight/2",
             "logheight",
             "logwidth",
             "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0"
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 50000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -4375,44 +3404,39 @@ class ShapeCflowChartTerminator : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (3);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3475, 0
+                    0, 0
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    18125, 0
+                    3, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3475, 10800
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 9
+                    10, 11
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3475, 21600
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3475, 10800
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 11
+                    0, 8
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4424,35 +3448,23 @@ class ShapeCflowChartTerminator : public CustomShapeProvider
                 1,1,
                 2,1,
                 17,1,
-                2,1,
-                17,1,
+                2,2,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 21600;
-                aSize.Height = 21600;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        0, 2
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4461,13 +3473,13 @@ class ShapeCflowChartTerminator : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        1, 3
+                        5, 8
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -4479,7 +3491,7 @@ class ShapeCflowChartTerminator : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartTerminator"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-round1Rect"));
 
     return aPropertyMap;
   }
@@ -4487,35 +3499,130 @@ class ShapeCflowChartTerminator : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartDelay : public CustomShapeProvider
+class ShapeCround2DiagRect : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        {
+            Any aAny ((sal_Int32) 16667);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 0);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logwidth/2",
-            "?0 *cos(pi*(2700000)/10800000)",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
+            "min(logwidth,logheight)",
+            "?2 *?0 /100000",
+            "logheight+0-?3 ",
+            "?2 *?1 /100000",
+            "logwidth+0-?5 ",
+            "logheight+0-?5 ",
+            "?3 *29289/100000",
+            "?5 *29289/100000",
+            "?8 +0-?9 ",
+            "if(?10 ,?8 ,?9 )",
+            "logwidth+0-?11 ",
+            "logheight+0-?11 ",
+            "logwidth",
             "logheight/2",
-            "?2 *sin(pi*(2700000)/10800000)",
             "logwidth/2",
-            "?4 +?1 -0",
-            "logheight/2",
-            "?6 +0-?3 ",
-            "?6 +?3 -0",
             "logheight",
-            "logwidth",
             "(16200000)/60000.0",
-            "(10800000)/60000.0"
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 50000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 50000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -4529,29 +3636,69 @@ class ShapeCflowChartDelay : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    3, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    6, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    5, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 12
+                    18, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
+                    0, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 25
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4564,6 +3711,11 @@ class ShapeCflowChartDelay : public CustomShapeProvider
                 2,1,
                 17,1,
                 2,1,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
                 4,0,
                 5,0
             };
@@ -4577,9 +3729,9 @@ class ShapeCflowChartDelay : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 7
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        11, 11
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4588,7 +3740,7 @@ class ShapeCflowChartDelay : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        5, 8
+                        12, 13
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4606,7 +3758,7 @@ class ShapeCflowChartDelay : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartDelay"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-round2DiagRect"));
 
     return aPropertyMap;
   }
@@ -4614,54 +3766,59 @@ class ShapeCflowChartDelay : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcurvedConnector5 : public CustomShapeProvider
+class ShapeCround2SameRect : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 16667);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 0);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logwidth*$0 /100000",
-            "logwidth*$2 /100000",
-            "(?0 +?1 )/2",
-            "(0+?0 )/2",
-            "(?0 +?2 )/2",
-            "(?1 +?2 )/2",
-            "(?1 +logwidth)/2",
-            "logheight*$1 /100000",
-            "(0+?7 )/2",
-            "(0+?8 )/2",
-            "(?8 +?7 )/2",
-            "(logheight+?7 )/2",
-            "(?11 +?7 )/2",
-            "(?11 +logheight)/2",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
+            "min(logwidth,logheight)",
+            "?2 *?0 /100000",
+            "logwidth+0-?3 ",
+            "?2 *?1 /100000",
+            "logwidth+0-?5 ",
+            "logheight+0-?5 ",
+            "?3 +0-?5 ",
+            "?3 *29289/100000",
+            "?5 *29289/100000",
+            "if(?8 ,?9 ,?10 )",
+            "logwidth+0-?11 ",
+            "logheight+0-?10 ",
+            "logheight",
             "logwidth",
-            "logheight"
+            "logheight/2",
+            "logwidth/2",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -4669,15 +3826,15 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -4685,7 +3842,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
@@ -4705,49 +3862,14 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 7
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 11
+                    5, 14
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -4755,17 +3877,17 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 2);
+                Any aAny ((sal_Int32) 1);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [2] = aPropSequence;
+            aPropSequenceSequence [1] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -4781,69 +3903,69 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    3, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
+                    4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
+                    3, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
+                    18, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 10
+                    15, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 7
+                    5, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 7
+                    20, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 7
+                    5, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 12
+                    5, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 11
+                    22, 23
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 13
+                    0, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 15
+                    3, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
+                    24, 25
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -4853,8 +3975,15 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                3,4,
-                6,0,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -4867,9 +3996,9 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        11, 9
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -4878,7 +4007,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        14, 15
+                        12, 13
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -4896,7 +4025,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-curvedConnector5"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-round2SameRect"));
 
     return aPropertyMap;
   }
@@ -4904,7 +4033,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeChorizontalScroll : public CustomShapeProvider
+class ShapeCroundRect : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -4913,7 +4042,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 12500);
+            Any aAny ((sal_Int32) 16667);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj";
         }
@@ -4921,59 +4050,26 @@ class ShapeChorizontalScroll : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(25000-$0 ,$0 ,25000))",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
             "min(logwidth,logheight)",
             "?1 *?0 /100000",
-            "?2 *1/2",
-            "?2 *1/4",
-            "?2 +?3 -0",
-            "?2 +?2 -0",
-            "logheight+0-?2 ",
-            "logheight+0-?3 ",
-            "?7 +0-?3 ",
             "logwidth+0-?2 ",
-            "logwidth+0-?3 ",
+            "logheight+0-?2 ",
+            "?2 *29289/100000",
+            "logwidth+0-?5 ",
+            "logheight+0-?5 ",
             "logwidth/2",
             "logheight/2",
+            "logheight",
             "logwidth",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(-5400000)/60000.0",
             "(10800000)/60000.0",
-            "(-10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(0)/60000.0",
-            "(-10800000)/60000.0",
             "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(0)/60000.0",
-            "(-10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(-16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(-10800000)/60000.0",
-            "(10800000)/60000.0",
+            "(16200000)/60000.0",
             "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
             "(0)/60000.0",
             "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(10800000)/60000.0",
             "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(0)/60000.0",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(10800000)/60000.0"
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -4994,7 +4090,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 25000);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -5028,314 +4124,418 @@ class ShapeChorizontalScroll : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    15, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    4, 4
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    17, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    19, 20
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 22
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 7
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 6
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 4
+                    12, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 28
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 6
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    14, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 30
+                    11, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 4
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 32
+                    16, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 2
+                    2, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    2, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    33, 34
-                },
+                    18, 19
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    4, 4
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        5, 5
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    35, 36
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        6, 7
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-roundRect"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCrtTriangle : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+    }
+    {
+        static const char *aStrings[] = {
+            "logheight*7/12",
+            "logwidth*7/12",
+            "logheight*11/12",
+            "logheight/2",
+            "logheight",
+            "logwidth/2",
+            "logwidth",
+            "logwidth/12"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 5
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    37, 38
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    39, 40
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    41, 42
+                    0, 4
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 7
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    0, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 8
-                },
+                    6, 4
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,2,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        7, 0
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    43, 44
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        1, 2
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-rtTriangle"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCsmileyFace : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 4653);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "if(-4653-$0 ,-4653,if(4653-$0 ,$0 ,4653))",
+            "logwidth*4969/21699",
+            "logwidth*6215/21600",
+            "logwidth*13135/21600",
+            "logwidth*16640/21600",
+            "logheight*7570/21600",
+            "logheight*16515/21600",
+            "logheight*?0 /100000",
+            "?6 +0-?7 ",
+            "?6 +?7 -0",
+            "logheight*?0 /50000",
+            "?9 +?10 -0",
+            "logwidth/2",
+            "?12 *cos(pi*(2700000)/10800000)",
+            "logheight/2",
+            "?14 *sin(pi*(2700000)/10800000)",
+            "logwidth/2",
+            "?16 +0-?13 ",
+            "?16 +?13 -0",
+            "logheight/2",
+            "?19 +0-?15 ",
+            "?19 +?15 -0",
+            "logwidth*1125/21600",
+            "logheight*1125/21600",
+            "logheight",
+            "logwidth",
+            "(10800000)/60000.0",
+            "(21600000)/60000.0",
+            "(10800000)/60000.0",
+            "(21600000)/60000.0",
+            "(10800000)/60000.0",
+            "(21600000)/60000.0",
+            "(10800000)/60000.0",
+            "(21600000)/60000.0"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 2
-                },
+                    16, 9
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 4653);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -4653);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 2
+                    0, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    12, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    45, 46
+                    26, 27
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 2
+                    2, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 3
+                    22, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 4
+                    28, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    47, 48
+                    3, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 6
+                    22, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    30, 31
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 4
+                    1, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    49, 50
+                    16, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 3
+                    4, 8
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    51, 52
+                    0, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 5
+                    12, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 7
+                    32, 33
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5346,49 +4546,22 @@ class ShapeChorizontalScroll : public CustomShapeProvider
             // Command, Count
                 1,1,
                 17,1,
-                2,1,
-                17,1,
-                2,2,
-                17,1,
-                2,1,
-                17,1,
-                2,2,
-                17,1,
-                4,0,
-                1,1,
-                17,2,
                 4,0,
                 7,0,
                 5,0,
                 1,1,
-                17,2,
-                4,0,
+                17,1,
                 1,1,
-                17,2,
-                4,0,
+                17,1,
                 19,0,
-                7,0,
                 5,0,
                 1,1,
-                17,1,
-                2,2,
-                17,1,
-                2,1,
-                17,1,
-                2,2,
-                17,1,
-                4,0,
-                1,1,
-                2,1,
-                17,1,
+                16,1,
+                6,0,
+                5,0,
                 1,1,
-                2,1,
                 17,1,
-                1,1,
-                2,1,
-                17,2,
-                1,1,
-                2,1,
+                4,0,
                 6,0,
                 5,0
             };
@@ -5404,7 +4577,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        2, 2
+                        17, 20
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -5413,7 +4586,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        11, 7
+                        18, 21
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -5431,7 +4604,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-horizontalScroll"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-smileyFace"));
 
     return aPropertyMap;
   }
@@ -5439,39 +4612,38 @@ class ShapeChorizontalScroll : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCbentConnector4 : public CustomShapeProvider
+class ShapeCsnip1Rect : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 16667);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 50000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logwidth*$0 /100000",
-            "(?0 +logwidth)/2",
-            "logheight*$1 /100000",
-            "(0+?2 )/2",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "logwidth+0-?2 ",
+            "?2 *1/2",
+            "(?3 +logwidth)/2",
             "logwidth",
+            "logheight/2",
+            "logwidth/2",
             "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -5479,15 +4651,15 @@ class ShapeCbentConnector4 : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 3
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -5495,7 +4667,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
@@ -5507,41 +4679,6 @@ class ShapeCbentConnector4 : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 2
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -5563,22 +4700,22 @@ class ShapeCbentConnector4 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    3, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    6, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 2
+                    6, 9
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    4, 5
+                    0, 9
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -5589,7 +4726,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider
             // Command, Count
                 1,1,
                 2,4,
-                6,0,
+                4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -5603,8 +4740,8 @@ class ShapeCbentConnector4 : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        0, 4
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -5613,7 +4750,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 5
+                        5, 9
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -5631,7 +4768,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bentConnector4"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-snip1Rect"));
 
     return aPropertyMap;
   }
@@ -5639,374 +4776,120 @@ class ShapeCbentConnector4 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCleftRightCircularArrow : public CustomShapeProvider
+class ShapeCsnip2DiagRect : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (5);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 12500);
+            Any aAny ((sal_Int32) 0);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 1142319);
+            Any aAny ((sal_Int32) 16667);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
-        {
-            Any aAny ((sal_Int32) 20457681);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) 11942319);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
-        {
-            Any aAny ((sal_Int32) 12500);
-            aAdjSequence [4].Value = aAny;
-            aAdjSequence [4].Name = "adj5";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$4 ,0,if(25000-$4 ,$4 ,25000))",
-            "?0 *2/1",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "if(1-$2 ,1,if(21599999-$2 ,$2 ,21599999))",
-            "if(0-$3 ,0,if(21599999-$3 ,$3 ,21599999))",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
             "min(logwidth,logheight)",
-            "?5 *?2 /100000",
-            "?5 *?0 /100000",
-            "?6 *1/2",
-            "logwidth/2",
-            "?9 +?8 -?7 ",
+            "?2 *?0 /100000",
+            "logwidth+0-?3 ",
+            "logheight+0-?3 ",
+            "?2 *?1 /100000",
+            "logwidth+0-?6 ",
+            "logheight+0-?6 ",
+            "?3 +0-?6 ",
+            "if(?9 ,?3 ,?6 )",
+            "?10 *1/2",
+            "logwidth+0-?11 ",
+            "logheight+0-?11 ",
+            "logwidth",
             "logheight/2",
-            "?11 +?8 -?7 ",
-            "?10 +0-?6 ",
-            "?12 +0-?6 ",
-            "?13 +?8 -0",
-            "?14 +?8 -0",
-            "?15 *sin(pi*(?3 )/10800000)",
-            "?16 *cos(pi*(?3 )/10800000)",
-            "?15 *(cos(atan2(?17 ,?18 )))",
-            "?16 *(sin(atan2(?17 ,?18 )))",
             "logwidth/2",
-            "?21 +?19 -0",
-            "logheight/2",
-            "?23 +?20 -0",
-            "min(?13 ,?14 )",
-            "?19 *?19 /1",
-            "?20 *?20 /1",
-            "?25 *?25 /1",
-            "?26 +0-?28 ",
-            "?27 +0-?28 ",
-            "?29 *?30 /?26 ",
-            "?31 *1/?27 ",
-            "1+0-?32 ",
-            "sqrt(?33 )",
-            "?29 *1/?19 ",
-            "?35 *1/?20 ",
-            "(1+?34 )/?36 ",
-            "(10800000*atan2(?37 ,1))/pi",
-            "?38 +21600000-0",
-            "if(?38 ,?38 ,?39 )",
-            "?40 +0-?3 ",
-            "?41 +21600000-0",
-            "if(?41 ,?41 ,?42 )",
-            "?43 +0-10800000",
-            "?43 +0-21600000",
-            "if(?44 ,?45 ,?43 )",
-            "abs(?46 )",
-            "if(0-$1 ,0,if(?47 -$1 ,$1 ,?47 ))",
-            "?3 +?48 -0",
-            "?15 *sin(pi*(?49 )/10800000)",
-            "?16 *cos(pi*(?49 )/10800000)",
-            "?15 *(cos(atan2(?50 ,?51 )))",
-            "?16 *(sin(atan2(?50 ,?51 )))",
-            "?21 +?52 -0",
-            "?23 +?53 -0",
-            "?7 *cos(pi*(?49 )/10800000)",
-            "?7 *sin(pi*(?49 )/10800000)",
-            "?22 +?56 -0",
-            "?24 +?57 -0",
-            "?7 *cos(pi*(?49 )/10800000)",
-            "?7 *sin(pi*(?49 )/10800000)",
-            "?22 +0-?60 ",
-            "?24 +0-?61 ",
-            "?62 +0-?21 ",
-            "?63 +0-?23 ",
-            "?58 +0-?21 ",
-            "?59 +0-?23 ",
-            "min(?10 ,?12 )",
-            "?64 *?68 /?10 ",
-            "?65 *?68 /?12 ",
-            "?66 *?68 /?10 ",
-            "?67 *?68 /?12 ",
-            "?71 +0-?69 ",
-            "?72 +0-?70 ",
-            "sqrt(?73 *?73 +?74 *?74 +0*0)",
-            "?69 *?72 /1",
-            "?71 *?70 /1",
-            "?76 +0-?77 ",
-            "?68 *?68 /1",
-            "?75 *?75 /1",
-            "?79 *?80 /1",
-            "?78 *?78 /1",
-            "?81 +0-?82 ",
-            "max(?83 ,0)",
-            "sqrt(?84 )",
-            "?74 *-1/1",
-            "if(?86 ,-1,1)",
-            "?87 *?73 /1",
-            "?88 *?85 /1",
-            "?78 *?74 /1",
-            "(?90 +?89 )/?80 ",
-            "?90 +0-?89 ",
-            "?92 *1/?80 ",
-            "abs(?74 )",
-            "?94 *?85 /1",
-            "?78 *?73 /-1",
-            "(?96 +?95 )/?80 ",
-            "?96 +0-?95 ",
-            "?98 *1/?80 ",
-            "?71 +0-?91 ",
-            "?71 +0-?93 ",
-            "?72 +0-?97 ",
-            "?72 +0-?99 ",
-            "sqrt(?100 *?100 +?102 *?102 +0*0)",
-            "sqrt(?101 *?101 +?103 *?103 +0*0)",
-            "?105 +0-?104 ",
-            "if(?106 ,?91 ,?93 )",
-            "if(?106 ,?97 ,?99 )",
-            "?107 *?10 /?68 ",
-            "?108 *?12 /?68 ",
-            "?21 +?109 -0",
-            "?23 +?110 -0",
-            "?64 *?25 /?13 ",
-            "?65 *?25 /?14 ",
-            "?66 *?25 /?13 ",
-            "?67 *?25 /?14 ",
-            "?115 +0-?113 ",
-            "?116 +0-?114 ",
-            "sqrt(?117 *?117 +?118 *?118 +0*0)",
-            "?113 *?116 /1",
-            "?115 *?114 /1",
-            "?120 +0-?121 ",
-            "?25 *?25 /1",
-            "?119 *?119 /1",
-            "?123 *?124 /1",
-            "?122 *?122 /1",
-            "?125 +0-?126 ",
-            "max(?127 ,0)",
-            "sqrt(?128 )",
-            "?87 *?117 /1",
-            "?130 *?129 /1",
-            "?122 *?118 /1",
-            "(?132 +?131 )/?124 ",
-            "?132 +0-?131 ",
-            "?134 *1/?124 ",
-            "abs(?118 )",
-            "?136 *?129 /1",
-            "?122 *?117 /-1",
-            "(?138 +?137 )/?124 ",
-            "?138 +0-?137 ",
-            "?140 *1/?124 ",
-            "?113 +0-?133 ",
-            "?113 +0-?135 ",
-            "?114 +0-?139 ",
-            "?114 +0-?141 ",
-            "sqrt(?142 *?142 +?144 *?144 +0*0)",
-            "sqrt(?143 *?143 +?145 *?145 +0*0)",
-            "?147 +0-?146 ",
-            "if(?148 ,?133 ,?135 )",
-            "if(?148 ,?139 ,?141 )",
-            "?149 *?13 /?25 ",
-            "?150 *?14 /?25 ",
-            "?21 +?151 -0",
-            "?23 +?152 -0",
-            "?15 *sin(pi*(?4 )/10800000)",
-            "?16 *cos(pi*(?4 )/10800000)",
-            "?15 *(cos(atan2(?155 ,?156 )))",
-            "?16 *(sin(atan2(?155 ,?156 )))",
-            "?21 +?157 -0",
-            "?23 +?158 -0",
-            "?4 +0-?48 ",
-            "?15 *sin(pi*(?161 )/10800000)",
-            "?16 *cos(pi*(?161 )/10800000)",
-            "?15 *(cos(atan2(?162 ,?163 )))",
-            "?16 *(sin(atan2(?162 ,?163 )))",
-            "?21 +?164 -0",
-            "?23 +?165 -0",
-            "?7 *cos(pi*(?161 )/10800000)",
-            "?7 *sin(pi*(?161 )/10800000)",
-            "?159 +?168 -0",
-            "?160 +?169 -0",
-            "?7 *cos(pi*(?161 )/10800000)",
-            "?7 *sin(pi*(?161 )/10800000)",
-            "?159 +0-?172 ",
-            "?160 +0-?173 ",
-            "?111 +0-?153 ",
-            "?112 +0-?154 ",
-            "sqrt(?176 *?176 +?177 *?177 +0*0)",
-            "?178 *1/2",
-            "?179 +0-?7 ",
-            "if(?180 ,?111 ,?58 )",
-            "if(?180 ,?112 ,?59 )",
-            "if(?180 ,?153 ,?62 )",
-            "if(?180 ,?154 ,?63 )",
-            "(10800000*atan2(?110 ,?109 ))/pi",
-            "?185 +21600000-0",
-            "if(?185 ,?185 ,?186 )",
-            "?187 +0-?3 ",
-            "?188 +21600000-0",
-            "if(?188 ,?188 ,?189 )",
-            "?4 +0-?190 ",
-            "?191 +21600000-0",
-            "if(?191 ,?191 ,?192 )",
-            "?187 +0-?193 ",
-            "?194 +21600000-0",
-            "if(?194 ,?194 ,?195 )",
-            "(10800000*atan2(?152 ,?151 ))/pi",
-            "?197 +21600000-0",
-            "if(?197 ,?197 ,?198 )",
-            "?199 +0-?3 ",
-            "?200 +0-21600000",
-            "if(?200 ,?201 ,?200 )",
-            "?4 +0-?202 ",
-            "?203 +0-21600000",
-            "if(?204 ,?204 ,?203 )",
-            "?205 +0-?199 ",
-            "?206 +0-21600000",
-            "if(?206 ,?207 ,?206 )",
-            "?10 *sin(pi*(?193 )/10800000)",
-            "?12 *cos(pi*(?193 )/10800000)",
-            "?10 *(cos(atan2(?209 ,?210 )))",
-            "?12 *(sin(atan2(?209 ,?210 )))",
-            "?21 +?211 -0",
-            "?23 +?212 -0",
-            "?13 *sin(pi*(?205 )/10800000)",
-            "?14 *cos(pi*(?205 )/10800000)",
-            "?13 *(cos(atan2(?215 ,?216 )))",
-            "?14 *(sin(atan2(?215 ,?216 )))",
-            "?21 +?217 -0",
-            "?23 +?218 -0",
-            "if(?180 ,?213 ,?170 )",
-            "if(?180 ,?214 ,?171 )",
-            "if(?180 ,?219 ,?174 )",
-            "if(?180 ,?220 ,?175 )",
-            "?161 +0-5400000",
-            "?49 +5400000-0",
-            "?49 +10800000-0",
-            "?161 +10800000-0",
-            "?10 *cos(pi*(2700000)/10800000)",
-            "?12 *sin(pi*(2700000)/10800000)",
-            "?21 +0-?229 ",
-            "?21 +?229 -0",
-            "?23 +0-?230 ",
-            "?23 +?230 -0",
-            "(?193 )/60000.0",
-            "(?196 )/60000.0",
-            "(?199 )/60000.0",
-            "(?208 )/60000.0"
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
-        {
-            Sequence< PropertyValue > aPropSequence (1);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    54, 55
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (1);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    213, 214
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
-            Sequence< PropertyValue > aPropSequence (3);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    111, 112
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RadiusRangeMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RadiusRangeMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
-            aPropSequenceSequence [2] = aPropSequence;
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (3);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    62, 63
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    7, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RadiusRangeMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 25000);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RadiusRangeMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
-            aPropSequenceSequence [3] = aPropSequence;
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -6023,63 +4906,43 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    166, 167
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    221, 222
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    213, 214
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 12
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    235, 236
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    181, 182
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    7, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    54, 55
+                    14, 6
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    183, 184
+                    14, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    153, 154
+                    4, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 14
+                    6, 17
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    237, 238
+                    0, 8
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    223, 224
+                    0, 3
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6089,11 +4952,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,2,
-                17,1,
-                2,4,
-                17,1,
-                2,1,
+                2,7,
                 4,0,
                 5,0
             };
@@ -6109,7 +4968,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        231, 233
+                        11, 11
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6118,7 +4977,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        232, 234
+                        12, 13
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6136,7 +4995,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-leftRightCircularArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-snip2DiagRect"));
 
     return aPropertyMap;
   }
@@ -6144,7 +5003,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCwedgeRectCallout : public CustomShapeProvider
+class ShapeCsnip2SameRect : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -6153,12 +5012,12 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) -20833);
+            Any aAny ((sal_Int32) 16667);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 62500);
+            Any aAny ((sal_Int32) 0);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
@@ -6166,65 +5025,45 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth*$0 /100000",
-            "logheight*$1 /100000",
-            "logwidth/2",
-            "?2 +?0 -0",
-            "logheight/2",
-            "?4 +?1 -0",
-            "?3 +0-?2 ",
-            "?5 +0-?4 ",
-            "?0 *logheight/logwidth",
-            "abs(?1 )",
-            "abs(?8 )",
-            "?9 +0-?10 ",
-            "if(?0 ,7,2)",
-            "if(?0 ,10,5)",
-            "logwidth*?12 /12",
-            "logwidth*?13 /12",
-            "if(?1 ,7,2)",
-            "if(?1 ,10,5)",
-            "logheight*?16 /12",
-            "logheight*?17 /12",
-            "if(?0 ,0,?3 )",
-            "if(?11 ,0,?20 )",
-            "if(?1 ,?14 ,?3 )",
-            "if(?11 ,?22 ,?14 )",
-            "if(?0 ,?3 ,logwidth)",
-            "if(?11 ,logwidth,?24 )",
-            "if(?1 ,?3 ,?14 )",
-            "if(?11 ,?26 ,?14 )",
-            "if(?0 ,?18 ,?5 )",
-            "if(?11 ,?18 ,?28 )",
-            "if(?1 ,0,?5 )",
-            "if(?11 ,?30 ,0)",
-            "if(?0 ,?5 ,?18 )",
-            "if(?11 ,?18 ,?32 )",
-            "if(?1 ,?5 ,logheight)",
-            "if(?11 ,?34 ,logheight)",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
+            "min(logwidth,logheight)",
+            "?2 *?0 /100000",
+            "logwidth+0-?3 ",
+            "?2 *?1 /100000",
+            "logwidth+0-?5 ",
+            "logheight+0-?5 ",
+            "?3 +0-?5 ",
+            "if(?8 ,?3 ,?5 )",
+            "?9 *1/2",
+            "logwidth+0-?10 ",
+            "?3 *1/2",
+            "(?7 +logheight)/2",
             "logheight",
-            "logwidth"
+            "logwidth",
+            "logheight/2",
+            "logwidth/2"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -6232,38 +5071,52 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
             }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
             {
-                aPropSequence [4].Name = "RangeYMinimum";
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 14
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
+                aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [5].Name = "RefX";
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [5].Value = makeAny (aAny);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [6].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 1);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [0] = aPropSequence;
+            aPropSequenceSequence [1] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -6279,84 +5132,44 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    14, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 31
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    15, 0
+                    3, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    37, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    37, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 33
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    37, 19
+                    4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    37, 36
+                    15, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 36
+                    15, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 35
+                    6, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 36
+                    5, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 36
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    21, 29
+                    0, 7
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 18
+                    0, 3
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6366,7 +5179,7 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,15,
+                2,7,
                 4,0,
                 5,0
             };
@@ -6380,9 +5193,9 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        10, 12
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6391,7 +5204,7 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        37, 36
+                        11, 13
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6409,7 +5222,7 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-wedgeRectCallout"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-snip2SameRect"));
 
     return aPropertyMap;
   }
@@ -6417,79 +5230,63 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCaccentCallout2 : public CustomShapeProvider
+class ShapeCsnipRoundRect : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (6);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 18750);
+            Any aAny ((sal_Int32) 16667);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) -8333);
+            Any aAny ((sal_Int32) 16667);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
-        {
-            Any aAny ((sal_Int32) 18750);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) -16667);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
-        {
-            Any aAny ((sal_Int32) 112500);
-            aAdjSequence [4].Value = aAny;
-            aAdjSequence [4].Name = "adj5";
-        }
-        {
-            Any aAny ((sal_Int32) -46667);
-            aAdjSequence [5].Value = aAny;
-            aAdjSequence [5].Name = "adj6";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logheight*$0 /100000",
-            "logwidth*$1 /100000",
-            "logheight*$2 /100000",
-            "logwidth*$3 /100000",
-            "logheight*$4 /100000",
-            "logwidth*$5 /100000",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
+            "min(logwidth,logheight)",
+            "?2 *?0 /100000",
+            "?2 *?1 /100000",
+            "logwidth+0-?4 ",
+            "?3 *29289/100000",
+            "(?5 +logwidth)/2",
             "logwidth",
             "logheight/2",
             "logwidth/2",
-            "logheight"
+            "logheight",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    3, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -6497,55 +5294,34 @@ class ShapeCaccentCallout2 : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -6553,95 +5329,18 @@ class ShapeCaccentCallout2 : public CustomShapeProvider
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
-        {
-            Sequence< PropertyValue > aPropSequence (7);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 5);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 4);
-                aPropSequence [6].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -6656,49 +5355,44 @@ class ShapeCaccentCallout2 : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    3, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    6, 0
+                    5, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 9
+                    8, 4
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    8, 11
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 9
+                    0, 11
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    0, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    3, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
+                    12, 13
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6708,17 +5402,9 @@ class ShapeCaccentCallout2 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
+                2,5,
+                17,1,
                 4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,1,
-                6,0,
-                5,0,
-                1,1,
-                2,2,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -6731,9 +5417,9 @@ class ShapeCaccentCallout2 : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        6, 6
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6742,7 +5428,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 9
+                        7, 11
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -6760,7 +5446,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentCallout2"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-snipRoundRect"));
 
     return aPropertyMap;
   }
@@ -6768,7 +5454,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartMagneticDrum : public CustomShapeProvider
+class ShapeCsquareTabs : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -6779,22 +5465,12 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth*2/3",
-            "logwidth/2",
-            "logheight/2",
+            "sqrt(logwidth*logwidth+logheight*logheight+0*0)",
+            "1*?0 /20",
+            "0+logheight-?1 ",
+            "0+logwidth-?1 ",
             "logheight",
-            "logwidth",
-            "logwidth/6",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0"
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -6808,94 +5484,89 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (3);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    0, 0
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 3
+                    1, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 7
+                    1, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 6
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 3
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 9
+                    1, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 6
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    1, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 3
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 11
+                    0, 4
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    3, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
                     5, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 3
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 1
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 13
+                    3, 1
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 6
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 3
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
+                    5, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 4
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -6905,53 +5576,26 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
+                2,3,
                 4,0,
-                7,0,
                 5,0,
                 1,1,
-                17,1,
-                6,0,
+                2,3,
+                4,0,
                 5,0,
                 1,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
+                2,3,
+                4,0,
+                5,0,
+                1,1,
+                2,3,
                 4,0,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (3);
-            {
-                awt::Size aSize;
-                aSize.Width = 6;
-                aSize.Height = 6;
-                aSizeSequence [0] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 6;
-                aSize.Height = 6;
-                aSizeSequence [1] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 6;
-                aSize.Height = 6;
-                aSizeSequence [2] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -6959,8 +5603,8 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        5, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        1, 1
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -6969,13 +5613,13 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 3
+                        3, 2
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -6987,7 +5631,7 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartMagneticDrum"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-squareTabs"));
 
     return aPropertyMap;
   }
@@ -6995,7 +5639,7 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcorner : public CustomShapeProvider
+class ShapeCstar10 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -7004,59 +5648,78 @@ class ShapeCcorner : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 42533);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
+            aAdjSequence [0].Name = "adj";
         }
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 105146);
             aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
+            aAdjSequence [1].Name = "hf";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "100000*logheight/?0 ",
-            "100000*logwidth/?0 ",
-            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "if(0-$1 ,0,if(?2 -$1 ,$1 ,?2 ))",
-            "?0 *?4 /100000",
-            "?0 *?3 /100000",
-            "logheight+0-?6 ",
-            "?5 *1/2",
-            "(?7 +logheight)/2",
-            "logwidth+0-logheight",
-            "if(?10 ,?7 ,0)",
-            "if(?10 ,logwidth,?5 )",
-            "logwidth",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
             "logwidth/2",
-            "logheight",
-            "logheight/2"
+            "?1 *$1 /100000",
+            "?2 *95106/100000",
+            "?2 *58779/100000",
+            "logwidth/2",
+            "?5 +0-?3 ",
+            "?5 +0-?4 ",
+            "?5 +?4 -0",
+            "?5 +?3 -0",
+            "logheight/2",
+            "?10 *80902/100000",
+            "?10 *30902/100000",
+            "logheight/2",
+            "?13 +0-?11 ",
+            "?13 +0-?12 ",
+            "?13 +?12 -0",
+            "?13 +?11 -0",
+            "?2 *?0 /50000",
+            "?10 *?0 /50000",
+            "?18 *80902/100000",
+            "?18 *30902/100000",
+            "?19 *95106/100000",
+            "?19 *58779/100000",
+            "?5 +0-?18 ",
+            "?5 +0-?20 ",
+            "?5 +0-?21 ",
+            "?5 +?21 -0",
+            "?5 +?20 -0",
+            "?5 +?18 -0",
+            "?13 +0-?22 ",
+            "?13 +0-?23 ",
+            "?13 +?23 -0",
+            "?13 +?22 -0",
+            "?13 +0-?19 ",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 34
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -7074,41 +5737,6 @@ class ShapeCcorner : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -7123,9 +5751,24 @@ class ShapeCcorner : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 14
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -7135,22 +5778,77 @@ class ShapeCcorner : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 7
+                    27, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 7
+                    8, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 15
+                    28, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    29, 13
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 33
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 15
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 33
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 13
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7160,7 +5858,7 @@ class ShapeCcorner : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,5,
+                2,19,
                 4,0,
                 5,0
             };
@@ -7174,9 +5872,9 @@ class ShapeCcorner : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 11
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        25, 31
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7185,7 +5883,7 @@ class ShapeCcorner : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        12, 15
+                        28, 32
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7203,7 +5901,7 @@ class ShapeCcorner : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-corner"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star10"));
 
     return aPropertyMap;
   }
@@ -7211,231 +5909,101 @@ class ShapeCcorner : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCborderCallout2 : public CustomShapeProvider
+class ShapeCstar12 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (6);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 18750);
+            Any aAny ((sal_Int32) 37500);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) -8333);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 18750);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) -16667);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
-        {
-            Any aAny ((sal_Int32) 112500);
-            aAdjSequence [4].Value = aAny;
-            aAdjSequence [4].Name = "adj5";
-        }
-        {
-            Any aAny ((sal_Int32) -46667);
-            aAdjSequence [5].Value = aAny;
-            aAdjSequence [5].Name = "adj6";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logheight*$0 /100000",
-            "logwidth*$1 /100000",
-            "logheight*$2 /100000",
-            "logwidth*$3 /100000",
-            "logheight*$4 /100000",
-            "logwidth*$5 /100000",
-            "logwidth",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "logwidth/2",
+            "?1 *cos(pi*(1800000)/10800000)",
             "logheight/2",
+            "?3 *sin(pi*(3600000)/10800000)",
             "logwidth/2",
-            "logheight"
+            "?5 +0-?2 ",
+            "logwidth*3/4",
+            "?5 +?2 -0",
+            "logheight/2",
+            "?9 +0-?4 ",
+            "logheight*3/4",
+            "?9 +?4 -0",
+            "?1 *?0 /50000",
+            "?3 *?0 /50000",
+            "?13 *cos(pi*(900000)/10800000)",
+            "?13 *cos(pi*(2700000)/10800000)",
+            "?13 *cos(pi*(4500000)/10800000)",
+            "?14 *sin(pi*(4500000)/10800000)",
+            "?14 *sin(pi*(2700000)/10800000)",
+            "?14 *sin(pi*(900000)/10800000)",
+            "?5 +0-?15 ",
+            "?5 +0-?16 ",
+            "?5 +0-?17 ",
+            "?5 +?17 -0",
+            "?5 +?16 -0",
+            "?5 +?15 -0",
+            "?9 +0-?18 ",
+            "?9 +0-?19 ",
+            "?9 +0-?20 ",
+            "?9 +?20 -0",
+            "?9 +?19 -0",
+            "?9 +?18 -0",
+            "?9 +0-?14 ",
+            "logheight/4",
+            "logwidth",
+            "logheight",
+            "logwidth/4"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    5, 33
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
-        {
-            Sequence< PropertyValue > aPropSequence (7);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [6].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [1] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (7);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 5);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 4);
-                aPropSequence [6].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -7451,38 +6019,123 @@ class ShapeCborderCallout2 : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 9
+                    6, 34
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    37, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 27
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 27
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    7, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    25, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
+                    8, 34
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 29
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    35, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 30
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 11
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 12
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 36
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    37, 12
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 11
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 30
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7492,12 +6145,8 @@ class ShapeCborderCallout2 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
+                2,23,
                 4,0,
-                5,0,
-                1,1,
-                2,2,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -7510,9 +6159,9 @@ class ShapeCborderCallout2 : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        22, 28
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7521,7 +6170,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 9
+                        25, 31
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7539,7 +6188,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-borderCallout2"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star12"));
 
     return aPropertyMap;
   }
@@ -7547,7 +6196,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCdonut : public CustomShapeProvider
+class ShapeCstar16 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -7556,7 +6205,7 @@ class ShapeCdonut : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 37500);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj";
         }
@@ -7565,57 +6214,82 @@ class ShapeCdonut : public CustomShapeProvider
     {
         static const char *aStrings[] = {
             "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "min(logwidth,logheight)",
-            "?1 *?0 /100000",
             "logwidth/2",
-            "?3 +0-?2 ",
+            "?1 *92388/100000",
+            "?1 *70711/100000",
+            "?1 *38268/100000",
             "logheight/2",
-            "?5 +0-?2 ",
-            "?3 *cos(pi*(2700000)/10800000)",
-            "?5 *sin(pi*(2700000)/10800000)",
+            "?5 *92388/100000",
+            "?5 *70711/100000",
+            "?5 *38268/100000",
             "logwidth/2",
-            "?9 +0-?7 ",
-            "?9 +?7 -0",
+            "?9 +0-?2 ",
+            "?9 +0-?3 ",
+            "?9 +0-?4 ",
+            "?9 +?4 -0",
+            "?9 +?3 -0",
+            "?9 +?2 -0",
             "logheight/2",
-            "?12 +0-?8 ",
-            "?12 +?8 -0",
-            "logheight",
+            "?16 +0-?6 ",
+            "?16 +0-?7 ",
+            "?16 +0-?8 ",
+            "?16 +?8 -0",
+            "?16 +?7 -0",
+            "?16 +?6 -0",
+            "?1 *?0 /50000",
+            "?5 *?0 /50000",
+            "?23 *98079/100000",
+            "?23 *83147/100000",
+            "?23 *55557/100000",
+            "?23 *19509/100000",
+            "?24 *98079/100000",
+            "?24 *83147/100000",
+            "?24 *55557/100000",
+            "?24 *19509/100000",
+            "?9 +0-?25 ",
+            "?9 +0-?26 ",
+            "?9 +0-?27 ",
+            "?9 +0-?28 ",
+            "?9 +?28 -0",
+            "?9 +?27 -0",
+            "?9 +?26 -0",
+            "?9 +?25 -0",
+            "?16 +0-?29 ",
+            "?16 +0-?30 ",
+            "?16 +0-?31 ",
+            "?16 +0-?32 ",
+            "?16 +?32 -0",
+            "?16 +?31 -0",
+            "?16 +?30 -0",
+            "?16 +?29 -0",
+            "?23 *cos(pi*(2700000)/10800000)",
+            "?24 *sin(pi*(2700000)/10800000)",
+            "?9 +0-?49 ",
+            "?16 +0-?50 ",
+            "?9 +?49 -0",
+            "?16 +?50 -0",
+            "?16 +0-?24 ",
             "logwidth",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(-5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(-5400000)/60000.0",
-            "(0)/60000.0",
-            "(-5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(-5400000)/60000.0"
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
         Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
-            Sequence< PropertyValue > aPropSequence (3);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 12
+                    9, 55
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RadiusRangeMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
@@ -7623,13 +6297,18 @@ class ShapeCdonut : public CustomShapeProvider
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RadiusRangeMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
             aPropSequenceSequence [0] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
@@ -7648,92 +6327,162 @@ class ShapeCdonut : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 12
+                    0, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    33, 44
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 18
+                    10, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    34, 43
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    19, 20
+                    11, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    35, 42
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 22
+                    12, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    36, 41
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    9, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 24
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    37, 41
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 12
+                    13, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 6
+                    38, 42
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
+                    14, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 6
+                    39, 43
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 28
+                    15, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 6
+                    40, 44
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 30
+                    56, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 6
+                    40, 45
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 32
+                    15, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    39, 46
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    38, 47
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    37, 48
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 57
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    36, 48
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    12, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    35, 47
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    34, 46
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    10, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    33, 45
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7743,10 +6492,7 @@ class ShapeCdonut : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,4,
-                4,0,
-                1,1,
-                17,4,
+                2,31,
                 4,0,
                 5,0
             };
@@ -7762,7 +6508,7 @@ class ShapeCdonut : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        10, 13
+                        51, 52
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7771,7 +6517,7 @@ class ShapeCdonut : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        11, 14
+                        53, 54
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -7789,7 +6535,7 @@ class ShapeCdonut : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-donut"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star16"));
 
     return aPropertyMap;
   }
@@ -7797,29 +6543,149 @@ class ShapeCdonut : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCflowChartCollate : public CustomShapeProvider
+class ShapeCstar24 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 37500);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logwidth*3/4",
-            "logheight*3/4",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "logwidth/2",
+            "?1 *cos(pi*(900000)/10800000)",
+            "?1 *cos(pi*(1800000)/10800000)",
+            "?1 *cos(pi*(2700000)/10800000)",
+            "logwidth/4",
+            "?5 ",
+            "?1 *cos(pi*(4500000)/10800000)",
+            "logheight/2",
+            "?8 *sin(pi*(4500000)/10800000)",
+            "?8 *sin(pi*(3600000)/10800000)",
+            "?8 *sin(pi*(2700000)/10800000)",
+            "logheight/4",
+            "?12 ",
+            "?8 *sin(pi*(900000)/10800000)",
             "logwidth/2",
+            "?15 +0-?2 ",
+            "?15 +0-?3 ",
+            "?15 +0-?4 ",
+            "?15 +0-?6 ",
+            "?15 +0-?7 ",
+            "?15 +?7 -0",
+            "?15 +?6 -0",
+            "?15 +?4 -0",
+            "?15 +?3 -0",
+            "?15 +?2 -0",
             "logheight/2",
+            "?26 +0-?9 ",
+            "?26 +0-?10 ",
+            "?26 +0-?11 ",
+            "?26 +0-?13 ",
+            "?26 +0-?14 ",
+            "?26 +?14 -0",
+            "?26 +?13 -0",
+            "?26 +?11 -0",
+            "?26 +?10 -0",
+            "?26 +?9 -0",
+            "?1 *?0 /50000",
+            "?8 *?0 /50000",
+            "?37 *99144/100000",
+            "?37 *92388/100000",
+            "?37 *79335/100000",
+            "?37 *60876/100000",
+            "?37 *38268/100000",
+            "?37 *13053/100000",
+            "?38 *99144/100000",
+            "?38 *92388/100000",
+            "?38 *79335/100000",
+            "?38 *60876/100000",
+            "?38 *38268/100000",
+            "?38 *13053/100000",
+            "?15 +0-?39 ",
+            "?15 +0-?40 ",
+            "?15 +0-?41 ",
+            "?15 +0-?42 ",
+            "?15 +0-?43 ",
+            "?15 +0-?44 ",
+            "?15 +?44 -0",
+            "?15 +?43 -0",
+            "?15 +?42 -0",
+            "?15 +?41 -0",
+            "?15 +?40 -0",
+            "?15 +?39 -0",
+            "?26 +0-?45 ",
+            "?26 +0-?46 ",
+            "?26 +0-?47 ",
+            "?26 +0-?48 ",
+            "?26 +0-?49 ",
+            "?26 +0-?50 ",
+            "?26 +?50 -0",
+            "?26 +?49 -0",
+            "?26 +?48 -0",
+            "?26 +?47 -0",
+            "?26 +?46 -0",
+            "?26 +?45 -0",
+            "?37 *cos(pi*(2700000)/10800000)",
+            "?38 *sin(pi*(2700000)/10800000)",
+            "?15 +0-?75 ",
+            "?26 +0-?76 ",
+            "?15 +?75 -0",
+            "?26 +?76 -0",
+            "?26 +0-?38 ",
+            "min(logwidth,logheight)/2",
             "logheight",
-            "logwidth/4",
-            "logheight/4"
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 81
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 82);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -7828,39 +6694,249 @@ class ShapeCflowChartCollate : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (3);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 26
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    51, 68
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 1
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    16, 31
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    2, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    52, 67
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 30
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    53, 66
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 29
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    54, 65
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    55, 64
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 27
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    56, 63
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 1
+                    15, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    57, 63
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 27
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    58, 64
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 28
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    59, 65
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 29
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    60, 66
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 30
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    61, 67
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 31
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    62, 68
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    84, 26
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    62, 69
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    61, 70
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 33
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    60, 71
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 34
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    59, 72
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    58, 73
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 36
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    57, 74
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 83
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    56, 74
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 36
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    55, 73
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    54, 72
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 34
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    53, 71
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 33
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    52, 70
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    16, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    51, 69
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -7870,25 +6946,14 @@ class ShapeCflowChartCollate : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,5,
+                2,47,
                 4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 2;
-                aSize.Height = 2;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -7897,7 +6962,7 @@ class ShapeCflowChartCollate : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        5, 6
+                        77, 78
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -7906,13 +6971,13 @@ class ShapeCflowChartCollate : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 1
+                        79, 80
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -7924,7 +6989,7 @@ class ShapeCflowChartCollate : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartCollate"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star24"));
 
     return aPropertyMap;
   }
@@ -7932,115 +6997,153 @@ class ShapeCflowChartCollate : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCmathNotEqual : public CustomShapeProvider
+class ShapeCstar32 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 23520);
+            Any aAny ((sal_Int32) 37500);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 6600000);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
-        }
-        {
-            Any aAny ((sal_Int32) 11760);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
             "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "if(4200000-$1 ,4200000,if(6600000-$1 ,$1 ,6600000))",
-            "?0 *2/1",
-            "100000+0-2",
-            "if(0-$2 ,0,if(?3 -$2 ,$2 ,?3 ))",
-            "logheight*?0 /100000",
-            "logheight*?4 /200000",
-            "logwidth*73490/200000",
             "logwidth/2",
-            "?8 +0-?7 ",
-            "?8 +?7 -0",
+            "?1 *98079/100000",
+            "?1 *92388/100000",
+            "?1 *83147/100000",
+            "?1 *cos(pi*(2700000)/10800000)",
+            "?1 *55557/100000",
+            "?1 *38268/100000",
+            "?1 *19509/100000",
             "logheight/2",
-            "?11 +0-?6 ",
-            "?11 +?6 -0",
-            "?12 +0-?5 ",
-            "?13 +?5 -0",
-            "?1 +0-5400000",
+            "?9 *98079/100000",
+            "?9 *92388/100000",
+            "?9 *83147/100000",
+            "?9 *sin(pi*(2700000)/10800000)",
+            "?9 *55557/100000",
+            "?9 *38268/100000",
+            "?9 *19509/100000",
+            "logwidth/2",
+            "?17 +0-?2 ",
+            "?17 +0-?3 ",
+            "?17 +0-?4 ",
+            "?17 +0-?5 ",
+            "?17 +0-?6 ",
+            "?17 +0-?7 ",
+            "?17 +0-?8 ",
+            "?17 +?8 -0",
+            "?17 +?7 -0",
+            "?17 +?6 -0",
+            "?17 +?5 -0",
+            "?17 +?4 -0",
+            "?17 +?3 -0",
+            "?17 +?2 -0",
             "logheight/2",
-            "?17 *tan(pi*(?16 )/10800000)",
-            "sqrt(?18 *?18 +?17 *?17 +0*0)",
-            "?19 *?5 /?17 ",
-            "?20 *1/2",
-            "?8 +?18 -?21 ",
-            "?18 *?14 /?17 ",
-            "?22 +0-?23 ",
-            "?18 *?12 /?17 ",
-            "?22 +0-?25 ",
-            "?18 *?13 /?17 ",
-            "?22 +0-?27 ",
-            "?18 *?15 /?17 ",
-            "?22 +0-?29 ",
-            "?18 *2/1",
-            "?22 +0-?31 ",
-            "?22 +?20 -0",
-            "?24 +?20 -0",
-            "?26 +?20 -0",
-            "?28 +?20 -0",
-            "?30 +?20 -0",
-            "?32 +?20 -0",
-            "?5 *?17 /?19 ",
-            "?22 +?39 -0",
-            "?33 +0-?39 ",
-            "if(?16 ,?40 ,?33 )",
-            "if(?16 ,?22 ,?41 )",
-            "?5 *?18 /?19 ",
-            "0+0-?44 ",
-            "if(?16 ,?44 ,0)",
-            "if(?16 ,0,?45 )",
-            "logwidth+0-?42 ",
-            "logwidth+0-?43 ",
-            "logheight+0-?46 ",
-            "logheight+0-?47 ",
-            "(?42 +?43 )/2",
-            "(?49 +?48 )/2",
-            "(?46 +?47 )/2",
-            "(?14 +?12 )/2",
-            "(?13 +?15 )/2",
-            "(?51 +?50 )/2",
+            "?32 +0-?10 ",
+            "?32 +0-?11 ",
+            "?32 +0-?12 ",
+            "?32 +0-?13 ",
+            "?32 +0-?14 ",
+            "?32 +0-?15 ",
+            "?32 +0-?16 ",
+            "?32 +?16 -0",
+            "?32 +?15 -0",
+            "?32 +?14 -0",
+            "?32 +?13 -0",
+            "?32 +?12 -0",
+            "?32 +?11 -0",
+            "?32 +?10 -0",
+            "?1 *?0 /50000",
+            "?9 *?0 /50000",
+            "?47 *99518/100000",
+            "?47 *95694/100000",
+            "?47 *88192/100000",
+            "?47 *77301/100000",
+            "?47 *63439/100000",
+            "?47 *47140/100000",
+            "?47 *29028/100000",
+            "?47 *9802/100000",
+            "?48 *99518/100000",
+            "?48 *95694/100000",
+            "?48 *88192/100000",
+            "?48 *77301/100000",
+            "?48 *63439/100000",
+            "?48 *47140/100000",
+            "?48 *29028/100000",
+            "?48 *9802/100000",
+            "?17 +0-?49 ",
+            "?17 +0-?50 ",
+            "?17 +0-?51 ",
+            "?17 +0-?52 ",
+            "?17 +0-?53 ",
+            "?17 +0-?54 ",
+            "?17 +0-?55 ",
+            "?17 +0-?56 ",
+            "?17 +?56 -0",
+            "?17 +?55 -0",
+            "?17 +?54 -0",
+            "?17 +?53 -0",
+            "?17 +?52 -0",
+            "?17 +?51 -0",
+            "?17 +?50 -0",
+            "?17 +?49 -0",
+            "?32 +0-?57 ",
+            "?32 +0-?58 ",
+            "?32 +0-?59 ",
+            "?32 +0-?60 ",
+            "?32 +0-?61 ",
+            "?32 +0-?62 ",
+            "?32 +0-?63 ",
+            "?32 +0-?64 ",
+            "?32 +?64 -0",
+            "?32 +?63 -0",
+            "?32 +?62 -0",
+            "?32 +?61 -0",
+            "?32 +?60 -0",
+            "?32 +?59 -0",
+            "?32 +?58 -0",
+            "?32 +?57 -0",
+            "?47 *cos(pi*(2700000)/10800000)",
+            "?48 *sin(pi*(2700000)/10800000)",
+            "?17 +0-?97 ",
+            "?32 +0-?98 ",
+            "?17 +?97 -0",
+            "?32 +?98 -0",
+            "?32 +0-?48 ",
+            "min(logwidth,logheight)/2",
+            "logheight",
             "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 14
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 103
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 104);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -8058,20 +7161,436 @@ class ShapeCmathNotEqual : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
         {
-            Sequence< PropertyValue > aPropSequence (1);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    65, 88
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 39
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    66, 87
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 38
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    67, 86
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 37
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    68, 85
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 36
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    69, 84
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    70, 83
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 34
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    71, 82
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 33
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    72, 81
+                },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    43, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+                    17, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    73, 81
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 33
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    74, 82
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 34
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    75, 83
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 35
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    76, 84
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 36
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    77, 85
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    29, 37
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    78, 86
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    30, 38
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    79, 87
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    31, 39
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    80, 88
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    106, 32
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    80, 89
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    31, 40
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    79, 90
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    30, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    78, 91
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    29, 42
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    77, 92
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 43
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    76, 93
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 44
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    75, 94
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 45
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    74, 95
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 46
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    73, 96
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 105
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    72, 96
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 46
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    71, 95
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 45
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    70, 94
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 44
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    69, 93
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 43
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    68, 92
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 42
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    67, 91
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    66, 90
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 40
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    65, 89
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,63,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        99, 100
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        101, 102
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequenceSequence [1] = aPropSequence;
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star32"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCstar4 : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 12500);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
         }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "logwidth/2",
+            "?1 *?0 /50000",
+            "logheight/2",
+            "?3 *?0 /50000",
+            "?2 *cos(pi*(2700000)/10800000)",
+            "?4 *sin(pi*(2700000)/10800000)",
+            "logwidth/2",
+            "?7 +0-?5 ",
+            "?7 +?5 -0",
+            "logheight/2",
+            "?10 +0-?6 ",
+            "?10 +?6 -0",
+            "?10 +0-?4 ",
+            "logheight",
+            "logwidth"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -8080,16 +7599,16 @@ class ShapeCmathNotEqual : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    58, 12
+                    7, 13
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 3);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -8102,10 +7621,10 @@ class ShapeCmathNotEqual : public CustomShapeProvider
             }
             {
                 aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
+                Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [2] = aPropSequence;
+            aPropSequenceSequence [0] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -8121,104 +7640,265 @@ class ShapeCmathNotEqual : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 14
+                    0, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 14
+                    8, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    43, 47
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    7, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    42, 46
+                    9, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    34, 14
+                    15, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 14
+                    9, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 12
+                    7, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    35, 12
-                },
+                    8, 12
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,7,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    36, 13
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        8, 11
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        9, 12
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star4"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCstar5 : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        {
+            Any aAny ((sal_Int32) 19098);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        {
+            Any aAny ((sal_Int32) 105146);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "hf";
+        }
+        {
+            Any aAny ((sal_Int32) 110557);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "vf";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "logwidth/2",
+            "?1 *$1 /100000",
+            "logheight/2",
+            "?3 *$2 /100000",
+            "logheight/2",
+            "?5 *$2 /100000",
+            "?2 *cos(pi*(1080000)/10800000)",
+            "?2 *cos(pi*(18360000)/10800000)",
+            "?4 *sin(pi*(1080000)/10800000)",
+            "?4 *sin(pi*(18360000)/10800000)",
+            "logwidth/2",
+            "?11 +0-?7 ",
+            "?11 +0-?8 ",
+            "?11 +?8 -0",
+            "?11 +?7 -0",
+            "?6 +0-?9 ",
+            "?6 +0-?10 ",
+            "?2 *?0 /50000",
+            "?4 *?0 /50000",
+            "?18 *cos(pi*(20520000)/10800000)",
+            "?18 *cos(pi*(3240000)/10800000)",
+            "?19 *sin(pi*(3240000)/10800000)",
+            "?19 *sin(pi*(20520000)/10800000)",
+            "?11 +0-?20 ",
+            "?11 +0-?21 ",
+            "?11 +?21 -0",
+            "?11 +?20 -0",
+            "?6 +0-?22 ",
+            "?6 +0-?23 ",
+            "?6 +?19 -0",
+            "?6 +0-?19 "
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 13
-                },
+                    11, 31
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 50000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 15
+                    12, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    37, 15
+                    25, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    49, 51
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    11, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    48, 50
+                    26, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    30, 15
+                    15, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 15
+                    27, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 13
+                    14, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 13
+                    11, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 12
+                    13, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 12
+                    24, 29
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8228,7 +7908,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,19,
+                2,9,
                 4,0,
                 5,0
             };
@@ -8244,7 +7924,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        9, 14
+                        24, 28
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8253,7 +7933,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        10, 15
+                        27, 30
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -8271,7 +7951,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-mathNotEqual"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star5"));
 
     return aPropertyMap;
   }
@@ -8279,24 +7959,92 @@ class ShapeCmathNotEqual : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCbentConnector2 : public CustomShapeProvider
+class ShapeCstar6 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        {
+            Any aAny ((sal_Int32) 28868);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        {
+            Any aAny ((sal_Int32) 115470);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "hf";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logwidth",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "logwidth/2",
+            "?1 *$1 /100000",
+            "?2 *cos(pi*(1800000)/10800000)",
+            "logwidth/2",
+            "?4 +0-?3 ",
+            "?4 +?3 -0",
+            "logheight/2",
+            "logheight/4",
+            "?7 +?8 -0",
+            "?2 *?0 /50000",
+            "logheight/2",
+            "?11 *?0 /50000",
+            "?10 *1/2",
+            "?4 +0-?10 ",
+            "?4 +0-?13 ",
+            "?4 +?13 -0",
+            "?4 +?10 -0",
+            "?12 *sin(pi*(3600000)/10800000)",
+            "?7 +0-?18 ",
+            "?7 +?18 -0",
+            "?7 +0-?12 ",
             "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 21
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 50000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -8310,19 +8058,64 @@ class ShapeCbentConnector2 : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 1
+                    16, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 7
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    16, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 7
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8332,8 +8125,8 @@ class ShapeCbentConnector2 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,2,
-                6,0,
+                2,11,
+                4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -8346,9 +8139,9 @@ class ShapeCbentConnector2 : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        14, 19
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8357,7 +8150,7 @@ class ShapeCbentConnector2 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 1
+                        17, 20
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -8375,7 +8168,7 @@ class ShapeCbentConnector2 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bentConnector2"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star6"));
 
     return aPropertyMap;
   }
@@ -8383,57 +8176,75 @@ class ShapeCbentConnector2 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCmathMultiply : public CustomShapeProvider
+class ShapeCstar7 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
         {
-            Any aAny ((sal_Int32) 23520);
+            Any aAny ((sal_Int32) 34601);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
+            aAdjSequence [0].Name = "adj";
+        }
+        {
+            Any aAny ((sal_Int32) 102572);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "hf";
+        }
+        {
+            Any aAny ((sal_Int32) 105210);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "vf";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(51965-$0 ,$0 ,51965))",
-            "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "(10800000*atan2(logheight,logwidth))/pi",
-            "1*sin(pi*(?3 )/10800000)",
-            "1*cos(pi*(?3 )/10800000)",
-            "1*tan(pi*(?3 )/10800000)",
-            "sqrt(logwidth*logwidth+logheight*logheight+0*0)",
-            "?7 *51965/100000",
-            "?7 +0-?8 ",
-            "?5 *?9 /2",
-            "?4 *?9 /2",
-            "?4 *?2 /2",
-            "?5 *?2 /2",
-            "?10 +0-?12 ",
-            "?11 +?13 -0",
-            "?10 +?12 -0",
-            "?11 +0-?13 ",
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
             "logwidth/2",
-            "?18 +0-?16 ",
-            "?19 *?6 /1",
-            "?20 +?17 -0",
-            "logwidth+0-?16 ",
-            "logwidth+0-?14 ",
+            "?1 *$1 /100000",
             "logheight/2",
-            "?24 +0-?15 ",
-            "?25 *1/?6 ",
-            "?23 +0-?26 ",
-            "?14 +?26 -0",
-            "logheight+0-?15 ",
-            "logheight+0-?17 ",
-            "logheight+0-?21 ",
-            "logwidth+0-?10 ",
-            "logheight+0-?11 "
+            "?3 *$2 /100000",
+            "logheight/2",
+            "?5 *$2 /100000",
+            "?2 *97493/100000",
+            "?2 *78183/100000",
+            "?2 *43388/100000",
+            "?4 *62349/100000",
+            "?4 *22252/100000",
+            "?4 *90097/100000",
+            "logwidth/2",
+            "?13 +0-?7 ",
+            "?13 +0-?8 ",
+            "?13 +0-?9 ",
+            "?13 +?9 -0",
+            "?13 +?8 -0",
+            "?13 +?7 -0",
+            "?6 +0-?10 ",
+            "?6 +?11 -0",
+            "?6 +?12 -0",
+            "?2 *?0 /50000",
+            "?4 *?0 /50000",
+            "?23 *97493/100000",
+            "?23 *78183/100000",
+            "?23 *43388/100000",
+            "?13 +0-?25 ",
+            "?13 +0-?26 ",
+            "?13 +0-?27 ",
+            "?13 +?27 -0",
+            "?13 +?26 -0",
+            "?13 +?25 -0",
+            "?24 *90097/100000",
+            "?24 *22252/100000",
+            "?24 *62349/100000",
+            "?6 +0-?34 ",
+            "?6 +0-?35 ",
+            "?6 +?36 -0",
+            "?6 +?24 -0",
+            "?6 +0-?24 "
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -8445,16 +8256,16 @@ class ShapeCmathMultiply : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 41
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 51965);
+                Any aAny ((sal_Int32) 50000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -8490,62 +8301,72 @@ class ShapeCmathMultiply : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
+                    14, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 17
+                    28, 38
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 21
+                    15, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    30, 37
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    13, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 17
+                    31, 37
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 15
+                    18, 20
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    27, 24
+                    33, 38
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    23, 29
+                    19, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    22, 30
+                    32, 39
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 31
+                    17, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 30
+                    13, 40
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 29
+                    16, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    28, 24
+                    29, 39
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8555,7 +8376,7 @@ class ShapeCmathMultiply : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,11,
+                2,13,
                 4,0,
                 5,0
             };
@@ -8571,7 +8392,7 @@ class ShapeCmathMultiply : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        14, 17
+                        29, 37
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8580,7 +8401,7 @@ class ShapeCmathMultiply : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        23, 30
+                        32, 39
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -8598,7 +8419,7 @@ class ShapeCmathMultiply : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-mathMultiply"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star7"));
 
     return aPropertyMap;
   }
@@ -8606,56 +8427,92 @@ class ShapeCmathMultiply : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCheptagon : public CustomShapeProvider
+class ShapeCstar8 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 102572);
+            Any aAny ((sal_Int32) 37500);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "hf";
-        }
-        {
-            Any aAny ((sal_Int32) 105210);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "vf";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
+            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
             "logwidth/2",
-            "?0 *$0 /100000",
+            "?1 *cos(pi*(2700000)/10800000)",
+            "logwidth/2",
+            "?3 +0-?2 ",
+            "?3 +?2 -0",
             "logheight/2",
-            "?2 *$1 /100000",
+            "?6 *sin(pi*(2700000)/10800000)",
             "logheight/2",
-            "?4 *$1 /100000",
-            "?1 *97493/100000",
-            "?1 *78183/100000",
-            "?1 *43388/100000",
-            "?3 *62349/100000",
-            "?3 *22252/100000",
-            "?3 *90097/100000",
-            "logwidth/2",
-            "?12 +0-?6 ",
-            "?12 +0-?7 ",
-            "?12 +0-?8 ",
-            "?12 +?8 -0",
-            "?12 +?7 -0",
-            "?12 +?6 -0",
-            "?5 +0-?9 ",
-            "?5 +?10 -0",
-            "?5 +?11 -0",
-            "logheight+0-?19 "
+            "?8 +0-?7 ",
+            "?8 +?7 -0",
+            "?1 *?0 /50000",
+            "?6 *?0 /50000",
+            "?11 *92388/100000",
+            "?11 *38268/100000",
+            "?12 *92388/100000",
+            "?12 *38268/100000",
+            "?3 +0-?13 ",
+            "?3 +0-?14 ",
+            "?3 +?14 -0",
+            "?3 +?13 -0",
+            "?8 +0-?15 ",
+            "?8 +0-?16 ",
+            "?8 +?16 -0",
+            "?8 +?15 -0",
+            "?8 +0-?12 ",
+            "logwidth",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 25
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 50000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -8669,39 +8526,84 @@ class ShapeCheptagon : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 8
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    13, 20
+                    17, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 19
+                    4, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    12, 0
+                    3, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 19
+                    19, 21
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 20
+                    5, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 21
+                    5, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 21
+                    19, 24
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 27
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 24
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 23
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8711,7 +8613,7 @@ class ShapeCheptagon : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,6,
+                2,15,
                 4,0,
                 5,0
             };
@@ -8727,7 +8629,7 @@ class ShapeCheptagon : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        14, 19
+                        17, 21
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -8736,7 +8638,7 @@ class ShapeCheptagon : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        17, 22
+                        20, 24
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -8754,7 +8656,7 @@ class ShapeCheptagon : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-heptagon"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star8"));
 
     return aPropertyMap;
   }
@@ -8762,7 +8664,7 @@ class ShapeCheptagon : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCrect : public CustomShapeProvider
+class ShapeCstraightConnector1 : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -8773,10 +8675,8 @@ class ShapeCrect : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "logwidth/2",
-            "logheight/2",
-            "logheight",
-            "logwidth"
+            "logwidth",
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -8801,18 +8701,8 @@ class ShapeCrect : public CustomShapeProvider
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 2
+                    0, 1
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -8822,8 +8712,8 @@ class ShapeCrect : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
-                4,0,
+                2,1,
+                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -8847,7 +8737,7 @@ class ShapeCrect : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        3, 2
+                        0, 1
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -8865,7 +8755,7 @@ class ShapeCrect : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-rect"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-straightConnector1"));
 
     return aPropertyMap;
   }
@@ -8873,231 +8763,122 @@ class ShapeCrect : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCaccentBorderCallout2 : public CustomShapeProvider
+class ShapeCstripedRightArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (6);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 18750);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) -8333);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
-        {
-            Any aAny ((sal_Int32) 18750);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) -16667);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
-        {
-            Any aAny ((sal_Int32) 112500);
-            aAdjSequence [4].Value = aAny;
-            aAdjSequence [4].Name = "adj5";
-        }
-        {
-            Any aAny ((sal_Int32) -46667);
-            aAdjSequence [5].Value = aAny;
-            aAdjSequence [5].Name = "adj6";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logheight*$0 /100000",
-            "logwidth*$1 /100000",
-            "logheight*$2 /100000",
-            "logwidth*$3 /100000",
-            "logheight*$4 /100000",
-            "logwidth*$5 /100000",
-            "logwidth",
+            "min(logwidth,logheight)",
+            "84375*logwidth/?0 ",
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "?0 *5/32",
+            "?0 *?3 /100000",
+            "logwidth+0-?5 ",
+            "logheight*?2 /200000",
             "logheight/2",
-            "logwidth/2",
-            "logheight"
+            "?8 +0-?7 ",
+            "?8 +?7 -0",
+            "logheight/2",
+            "?7 *?5 /?11 ",
+            "logwidth+0-?12 ",
+            "logheight",
+            "logwidth",
+            "min(logwidth,logheight)/32",
+            "min(logwidth,logheight)/16",
+            "min(logwidth,logheight)/8"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    0, 9
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 100000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    6, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
-        {
-            Sequence< PropertyValue > aPropSequence (7);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeXMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 5);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 4);
-                aPropSequence [6].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [2] = aPropSequence;
-        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -9113,48 +8894,78 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    16, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 9
+                    16, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
+                    0, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 10
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 9
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 9
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
+                    6, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 9
+                    15, 8
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    6, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    6, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
+                    4, 10
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -9166,14 +8977,12 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider
                 1,1,
                 2,3,
                 4,0,
-                5,0,
                 1,1,
-                2,1,
-                6,0,
-                5,0,
+                2,3,
+                4,0,
                 1,1,
-                2,2,
-                6,0,
+                2,6,
+                4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -9186,9 +8995,9 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        4, 9
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -9197,7 +9006,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 9
+                        13, 10
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -9215,7 +9024,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-accentBorderCallout2"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-stripedRightArrow"));
 
     return aPropertyMap;
   }
@@ -9223,34 +9032,117 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCpieWedge : public CustomShapeProvider
+class ShapeCsun : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logwidth*cos(pi*(13500000)/10800000)",
-            "logheight*sin(pi*(13500000)/10800000)",
-            "logwidth+?0 -0",
-            "logheight+?1 -0",
-            "logwidth",
+            "if(12500-$0 ,12500,if(46875-$0 ,$0 ,46875))",
+            "50000+0-?0 ",
+            "?1 *30274/32768",
+            "?1 *12540/32768",
+            "?2 +50000-0",
+            "?3 +50000-0",
+            "50000+0-?2 ",
+            "50000+0-?3 ",
+            "?1 *23170/32768",
+            "50000+?8 -0",
+            "50000+0-?8 ",
+            "?6 *3/4",
+            "?7 *3/4",
+            "?11 +3662-0",
+            "?12 +3662-0",
+            "?12 +12500-0",
+            "100000+0-?11 ",
+            "100000+0-?13 ",
+            "100000+0-?14 ",
+            "100000+0-?15 ",
+            "logwidth*18436/21600",
+            "logheight*3163/21600",
+            "logwidth*3163/21600",
+            "logheight*18436/21600",
+            "logwidth*?9 /100000",
+            "logwidth*?10 /100000",
+            "logwidth*?11 /100000",
+            "logwidth*?13 /100000",
+            "logwidth*?14 /100000",
+            "logwidth*?15 /100000",
+            "logwidth*?16 /100000",
+            "logwidth*?17 /100000",
+            "logwidth*?18 /100000",
+            "logwidth*?19 /100000",
+            "logwidth*?0 /100000",
+            "logwidth*?1 /100000",
+            "logheight*?1 /100000",
+            "logheight*?9 /100000",
+            "logheight*?10 /100000",
+            "logheight*?11 /100000",
+            "logheight*?13 /100000",
+            "logheight*?14 /100000",
+            "logheight*?15 /100000",
+            "logheight*?16 /100000",
+            "logheight*?17 /100000",
+            "logheight*?18 /100000",
+            "logheight*?19 /100000",
             "logheight/2",
             "logwidth/2",
             "logheight",
             "logwidth",
-            "logheight",
             "(10800000)/60000.0",
-            "(5400000)/60000.0"
+            "(21600000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    34, 47
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 46875);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 12500);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -9264,24 +9156,139 @@ class ShapeCpieWedge : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    50, 47
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    30, 46
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    30, 42
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    31, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 40
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
+                    48, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    33, 39
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 9
+                    29, 39
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 11
+                    22, 21
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 40
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 41
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 47
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 42
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 7
+                    26, 46
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 45
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 44
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    48, 49
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    29, 43
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    33, 43
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    32, 44
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    31, 45
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    34, 47
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    35, 36
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    51, 52
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -9291,8 +9298,31 @@ class ShapeCpieWedge : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
+                2,2,
+                4,0,
+                1,1,
+                2,2,
+                4,0,
+                1,1,
+                2,2,
+                4,0,
+                1,1,
+                2,2,
+                4,0,
+                1,1,
+                2,2,
+                4,0,
+                1,1,
+                2,2,
+                4,0,
+                1,1,
+                2,2,
+                4,0,
+                1,1,
+                2,2,
+                4,0,
+                1,1,
                 17,1,
-                2,1,
                 4,0,
                 5,0
             };
@@ -9308,7 +9338,7 @@ class ShapeCpieWedge : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        2, 3
+                        25, 38
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -9317,7 +9347,7 @@ class ShapeCpieWedge : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 7
+                        24, 37
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -9335,7 +9365,7 @@ class ShapeCpieWedge : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-pieWedge"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-sun"));
 
     return aPropertyMap;
   }
@@ -9343,66 +9373,65 @@ class ShapeCpieWedge : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCupArrowCallout : public CustomShapeProvider
+class ShapeCswooshArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
             Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 16667);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) 64977);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
+            "if(1-$0 ,1,if(75000-$0 ,$0 ,75000))",
             "min(logwidth,logheight)",
-            "50000*logwidth/?0 ",
-            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "?2 *2/1",
-            "if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))",
-            "100000*logheight/?0 ",
-            "if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))",
-            "?6 *?0 /logheight",
-            "100000+0-?7 ",
-            "if(0-$3 ,0,if(?8 -$3 ,$3 ,?8 ))",
-            "?0 *?2 /100000",
-            "?0 *?4 /200000",
-            "logwidth/2",
-            "?12 +0-?10 ",
-            "?12 +0-?11 ",
-            "?12 +?11 -0",
-            "?12 +?10 -0",
-            "?0 *?6 /100000",
-            "logheight*?9 /100000",
-            "logheight+0-?18 ",
-            "(?19 +logheight)/2",
-            "logwidth",
-            "logheight"
+            "70000*logwidth/?1 ",
+            "if(0-$1 ,0,if(?2 -$1 ,$1 ,?2 ))",
+            "logheight*?0 /100000",
+            "?1 *?3 /100000",
+            "logwidth+0-?5 ",
+            "min(logwidth,logheight)/8",
+            "0+?7 -0",
+            "5400000*1/14",
+            "?7 *tan(pi*(?9 )/10800000)",
+            "?6 +0-?10 ",
+            "?4 *tan(pi*(?9 )/10800000)",
+            "?8 +?4 -0",
+            "?6 +?12 -0",
+            "?14 +?10 -0",
+            "?13 +?7 -0",
+            "?16 +0-0",
+            "?17 *1/2",
+            "logheight*1/20",
+            "0+?18 -?19 ",
+            "logheight/6",
+            "?21 *1/1",
+            "?21 +?22 -0",
+            "logwidth/6",
+            "?24 ",
+            "?21 *1/2",
+            "?13 +?26 -0",
+            "logwidth/4",
+            "?28 ",
+            "logheight",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -9411,28 +9440,28 @@ class ShapeCupArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 17
+                    14, 13
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 3);
+                Any aAny ((sal_Int32) 75000);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -9445,15 +9474,15 @@ class ShapeCupArrowCallout : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    13, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 8
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 2);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -9473,63 +9502,199 @@ class ShapeCupArrowCallout : public CustomShapeProvider
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
         {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
+                    0, 30
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 17
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 5);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    11, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    31, 20
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 16
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 13
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    29, 27
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 30
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                16,1,
+                2,4,
+                16,1,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [3].Value = makeAny (aAny);
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        31, 30
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequenceSequence [2] = aPropSequence;
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-swooshArrow"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCteardrop : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 100000);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "if(0-$0 ,0,if(200000-$0 ,$0 ,200000))",
+            "sqrt(2)",
+            "logwidth/2",
+            "?2 *?1 /1",
+            "logheight/2",
+            "?4 *?1 /1",
+            "?3 *?0 /100000",
+            "?5 *?0 /100000",
+            "?6 *cos(pi*(2700000)/10800000)",
+            "?7 *sin(pi*(2700000)/10800000)",
+            "logwidth/2",
+            "?10 +?8 -0",
+            "logheight/2",
+            "?12 +0-?9 ",
+            "(?10 +?11 )/2",
+            "(?12 +?13 )/2",
+            "?2 *cos(pi*(2700000)/10800000)",
+            "?4 *sin(pi*(2700000)/10800000)",
+            "?10 +0-?16 ",
+            "?10 +?16 -0",
+            "?12 +0-?17 ",
+            "?12 +?17 -0",
+            "logwidth",
+            "logheight",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 19
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    11, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 8);
+                Any aAny ((sal_Int32) 200000);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -9537,11 +9702,11 @@ class ShapeCupArrowCallout : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 3);
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [3] = aPropSequence;
+            aPropSequenceSequence [0] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -9559,57 +9724,57 @@ class ShapeCupArrowCallout : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 19
+                    0, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 19
+                    2, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 17
+                    24, 25
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 17
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    14, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    12, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    16, 17
+                    22, 15
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 17
+                    22, 12
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 19
+                    2, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 19
+                    26, 27
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 22
+                    2, 4
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 22
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 29
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -9619,7 +9784,9 @@ class ShapeCupArrowCallout : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,10,
+                17,1,
+                16,2,
+                17,2,
                 4,0,
                 5,0
             };
@@ -9633,9 +9800,9 @@ class ShapeCupArrowCallout : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 19
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        18, 20
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -9644,7 +9811,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        21, 22
+                        19, 21
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -9662,7 +9829,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-upArrowCallout"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-teardrop"));
 
     return aPropertyMap;
   }
@@ -9673,41 +9840,41 @@ class ShapeCupArrowCallout : public CustomShapeProvider
 } // anonymous namespace
 void CustomShapeProperties::initializePresetsMap5()
 {
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "plus" ) ] = new ShapeCplus();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "accentCallout3" ) ] = new ShapeCaccentCallout3();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftCircularArrow" ) ] = new ShapeCleftCircularArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "quadArrow" ) ] = new ShapeCquadArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "quadArrowCallout" ) ] = new ShapeCquadArrowCallout();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "rect" ) ] = new ShapeCrect();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "ribbon" ) ] = new ShapeCribbon();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "ribbon2" ) ] = new ShapeCribbon2();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "rightArrow" ) ] = new ShapeCrightArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartPunchedCard" ) ] = new ShapeCflowChartPunchedCard();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "rightArrowCallout" ) ] = new ShapeCrightArrowCallout();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "rightBrace" ) ] = new ShapeCrightBrace();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "rightBracket" ) ] = new ShapeCrightBracket();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "round1Rect" ) ] = new ShapeCround1Rect();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "round2DiagRect" ) ] = new ShapeCround2DiagRect();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "round2SameRect" ) ] = new ShapeCround2SameRect();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "roundRect" ) ] = new ShapeCroundRect();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "rtTriangle" ) ] = new ShapeCrtTriangle();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "smileyFace" ) ] = new ShapeCsmileyFace();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "snip1Rect" ) ] = new ShapeCsnip1Rect();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "snip2DiagRect" ) ] = new ShapeCsnip2DiagRect();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "verticalScroll" ) ] = new ShapeCverticalScroll();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "snip2SameRect" ) ] = new ShapeCsnip2SameRect();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "snipRoundRect" ) ] = new ShapeCsnipRoundRect();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "squareTabs" ) ] = new ShapeCsquareTabs();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star10" ) ] = new ShapeCstar10();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star12" ) ] = new ShapeCstar12();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star16" ) ] = new ShapeCstar16();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star24" ) ] = new ShapeCstar24();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star32" ) ] = new ShapeCstar32();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star4" ) ] = new ShapeCstar4();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star5" ) ] = new ShapeCstar5();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star6" ) ] = new ShapeCstar6();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star7" ) ] = new ShapeCstar7();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "chartX" ) ] = new ShapeCchartX();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "cloud" ) ] = new ShapeCcloud();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "cube" ) ] = new ShapeCcube();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "round2DiagRect" ) ] = new ShapeCround2DiagRect();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartMultidocument" ) ] = new ShapeCflowChartMultidocument();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "actionButtonDocument" ) ] = new ShapeCactionButtonDocument();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartTerminator" ) ] = new ShapeCflowChartTerminator();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartDelay" ) ] = new ShapeCflowChartDelay();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "curvedConnector5" ) ] = new ShapeCcurvedConnector5();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "horizontalScroll" ) ] = new ShapeChorizontalScroll();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentConnector4" ) ] = new ShapeCbentConnector4();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "leftRightCircularArrow" ) ] = new ShapeCleftRightCircularArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "wedgeRectCallout" ) ] = new ShapeCwedgeRectCallout();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "accentCallout2" ) ] = new ShapeCaccentCallout2();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartMagneticDrum" ) ] = new ShapeCflowChartMagneticDrum();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "corner" ) ] = new ShapeCcorner();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "borderCallout2" ) ] = new ShapeCborderCallout2();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "donut" ) ] = new ShapeCdonut();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartCollate" ) ] = new ShapeCflowChartCollate();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "mathNotEqual" ) ] = new ShapeCmathNotEqual();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentConnector2" ) ] = new ShapeCbentConnector2();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "mathMultiply" ) ] = new ShapeCmathMultiply();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "heptagon" ) ] = new ShapeCheptagon();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "rect" ) ] = new ShapeCrect();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "accentBorderCallout2" ) ] = new ShapeCaccentBorderCallout2();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "pieWedge" ) ] = new ShapeCpieWedge();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "upArrowCallout" ) ] = new ShapeCupArrowCallout();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star8" ) ] = new ShapeCstar8();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "straightConnector1" ) ] = new ShapeCstraightConnector1();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "stripedRightArrow" ) ] = new ShapeCstripedRightArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "sun" ) ] = new ShapeCsun();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "swooshArrow" ) ] = new ShapeCswooshArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "teardrop" ) ] = new ShapeCteardrop();
 }
 
 } } // oox // drawingml
diff --git a/oox/source/drawingml/customshapepresets6.cxx b/oox/source/drawingml/customshapepresets6.cxx
index c8d97561d814..c31e632dae48 100644
--- a/oox/source/drawingml/customshapepresets6.cxx
+++ b/oox/source/drawingml/customshapepresets6.cxx
@@ -23,187 +23,39 @@ namespace oox { namespace drawingml {
 
 namespace
 {
-class ShapeCflowChartProcess : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "logwidth/2",
-            "logheight/2",
-            "logheight",
-            "logwidth"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (4);
-        {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    1, 1
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 1
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,3,
-                4,0,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
-        }
-        {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (1);
-            {
-                awt::Size aSize;
-                aSize.Width = 1;
-                aSize.Height = 1;
-                aSizeSequence [0] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
-            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
-            {
-                EnhancedCustomShapeTextFrame aTextFrame;
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
-                    };
-                    aTextFrame.TopLeft = createParameterPair(&aData);
-                }
-                {
-                    static const CustomShapeProvider::ParameterPairData aData =
-                    {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        3, 2
-                    };
-                    aTextFrame.BottomRight = createParameterPair(&aData);
-                }
-                aTextFrameSeq [0] = aTextFrame;
-            }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
-        }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-flowChartProcess"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCstar5 : public CustomShapeProvider
+class ShapeCtrapezoid : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) 19098);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj";
         }
-        {
-            Any aAny ((sal_Int32) 105146);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "hf";
-        }
-        {
-            Any aAny ((sal_Int32) 110557);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "vf";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
+            "min(logwidth,logheight)",
+            "50000*logwidth/?0 ",
+            "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
+            "?0 *?2 /200000",
+            "?0 *?2 /100000",
+            "logwidth+0-?4 ",
+            "logwidth+0-?3 ",
+            "logwidth/3",
+            "?7 *?2 /?1 ",
+            "logheight/3",
+            "?9 *?2 /?1 ",
+            "logwidth+0-?8 ",
             "logwidth/2",
-            "?1 *$1 /100000",
             "logheight/2",
-            "?3 *$2 /100000",
-            "logheight/2",
-            "?5 *$2 /100000",
-            "?2 *cos(pi*(1080000)/10800000)",
-            "?2 *cos(pi*(18360000)/10800000)",
-            "?4 *sin(pi*(1080000)/10800000)",
-            "?4 *sin(pi*(18360000)/10800000)",
-            "logwidth/2",
-            "?11 +0-?7 ",
-            "?11 +0-?8 ",
-            "?11 +?8 -0",
-            "?11 +?7 -0",
-            "?6 +0-?9 ",
-            "?6 +0-?10 ",
-            "?2 *?0 /50000",
-            "?4 *?0 /50000",
-            "?18 *cos(pi*(20520000)/10800000)",
-            "?18 *cos(pi*(3240000)/10800000)",
-            "?19 *sin(pi*(3240000)/10800000)",
-            "?19 *sin(pi*(20520000)/10800000)",
-            "?11 +0-?20 ",
-            "?11 +0-?21 ",
-            "?11 +?21 -0",
-            "?11 +?20 -0",
-            "?6 +0-?22 ",
-            "?6 +0-?23 ",
-            "?6 +?19 -0",
-            "?6 +0-?19 "
+            "logheight",
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -216,21 +68,21 @@ class ShapeCstar5 : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 31
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -238,7 +90,7 @@ class ShapeCstar5 : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -258,54 +110,24 @@ class ShapeCstar5 : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    11, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    26, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    15, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 29
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 17
+                    0, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 30
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    4, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    13, 17
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    5, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    24, 29
+                    15, 14
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -315,7 +137,7 @@ class ShapeCstar5 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,9,
+                2,3,
                 4,0,
                 5,0
             };
@@ -331,7 +153,7 @@ class ShapeCstar5 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        24, 28
+                        8, 10
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -340,7 +162,7 @@ class ShapeCstar5 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        27, 30
+                        11, 14
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -358,7 +180,7 @@ class ShapeCstar5 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-star5"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-trapezoid"));
 
     return aPropertyMap;
   }
@@ -366,95 +188,72 @@ class ShapeCstar5 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeClineInv : public CustomShapeProvider
+class ShapeCtriangle : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        {
+            Any aAny ((sal_Int32) 50000);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "logwidth*?0 /200000",
+            "logwidth*?0 /100000",
+            "logwidth/2",
+            "?1 +?3 -0",
+            "logheight/2",
             "logheight",
             "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
-    }
-    {
-        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
-    }
-    {
-        Sequence< PropertyValue > aPropSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
-            aPropSequence [0].Name = "Coordinates";
-            static const CustomShapeProvider::ParameterPairData aData[] = {
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 0
-                },
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    1, 0
-                }
-            };
-            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
-        }
-        {
-            aPropSequence [1].Name = "Segments";
-            static const sal_uInt16 nValues[] = {
-            // Command, Count
-                1,1,
-                2,1,
-                5,0
-            };
-            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+                    2, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 100000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
         }
-        aPropertyMap.setProperty(PROP_Path, aPropSequence);
-    }
-    {
-        awt::Rectangle aRectangle;
-        aRectangle.X = 0;
-        aRectangle.Y = 0;
-        aRectangle.Width = 0;
-        aRectangle.Height = 0;
-        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
-    }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-lineInv"));
-
-    return aPropertyMap;
-  }
-};
-
-// This is a generated source file. DO NOT EDIT.
-
-class ShapeCstraightConnector1 : public CustomShapeProvider
-{
-  virtual PropertyMap getProperties() SAL_OVERRIDE
-  {
-    PropertyMap aPropertyMap;
-
-    {
-        aPropertyMap.setProperty(PROP_AdjustmentValues, Sequence< OUString >(0));
-    }
-    {
-        static const char *aStrings[] = {
-            "logwidth",
-            "logheight"
-        };
-        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
-    }
-    {
-        aPropertyMap.setProperty(PROP_Handles, Sequence< OUString >(0));
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
         aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
@@ -469,13 +268,18 @@ class ShapeCstraightConnector1 : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 6
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    2, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 1
+                    7, 6
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -485,8 +289,8 @@ class ShapeCstraightConnector1 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,1,
-                6,0,
+                2,2,
+                4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -499,9 +303,9 @@ class ShapeCstraightConnector1 : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        1, 5
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -510,7 +314,7 @@ class ShapeCstraightConnector1 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 1
+                        4, 6
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -528,7 +332,7 @@ class ShapeCstraightConnector1 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-straightConnector1"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-triangle"));
 
     return aPropertyMap;
   }
@@ -536,7 +340,7 @@ class ShapeCstraightConnector1 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCstripedRightArrow : public CustomShapeProvider
+class ShapeCupArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -559,24 +363,20 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
     {
         static const char *aStrings[] = {
             "min(logwidth,logheight)",
-            "84375*logwidth/?0 ",
+            "100000*logheight/?0 ",
             "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
             "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
-            "?0 *5/32",
             "?0 *?3 /100000",
-            "logwidth+0-?5 ",
-            "logheight*?2 /200000",
-            "logheight/2",
-            "?8 +0-?7 ",
-            "?8 +?7 -0",
-            "logheight/2",
-            "?7 *?5 /?11 ",
-            "logwidth+0-?12 ",
+            "0+?4 -0",
+            "logwidth*?2 /200000",
+            "logwidth/2",
+            "?7 +0-?6 ",
+            "?7 +?6 -0",
+            "logwidth/2",
+            "?8 *?4 /?10 ",
+            "?5 +0-?11 ",
             "logheight",
-            "logwidth",
-            "min(logwidth,logheight)/32",
-            "min(logwidth,logheight)/16",
-            "min(logwidth,logheight)/8"
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
@@ -588,14 +388,14 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 13
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 100000);
                 aParameter.Value = aAny;
@@ -603,7 +403,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -611,7 +411,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -623,14 +423,14 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    6, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 5
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
@@ -638,7 +438,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
@@ -646,7 +446,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 1);
                 aPropSequence [3].Value = makeAny (aAny);
             }
@@ -668,77 +468,37 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 9
+                    0, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    16, 10
-                },
-                {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    0, 10
+                    7, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 9
+                    14, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 9
+                    9, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 10
+                    9, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    17, 10
+                    8, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 9
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    15, 8
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 14
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 10
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    4, 10
+                    8, 5
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -748,12 +508,6 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
-                4,0,
-                1,1,
-                2,3,
-                4,0,
-                1,1,
                 2,6,
                 4,0,
                 5,0
@@ -770,7 +524,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 9
+                        8, 12
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -779,7 +533,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        13, 10
+                        9, 13
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -797,7 +551,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-stripedRightArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-upArrow"));
 
     return aPropertyMap;
   }
@@ -805,69 +559,60 @@ class ShapeCstripedRightArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcallout3 : public CustomShapeProvider
+class ShapeCupArrowCallout : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (8);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
         {
-            Any aAny ((sal_Int32) 18750);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) -8333);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
         {
-            Any aAny ((sal_Int32) 18750);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [2].Value = aAny;
             aAdjSequence [2].Name = "adj3";
         }
         {
-            Any aAny ((sal_Int32) -16667);
+            Any aAny ((sal_Int32) 64977);
             aAdjSequence [3].Value = aAny;
             aAdjSequence [3].Name = "adj4";
         }
-        {
-            Any aAny ((sal_Int32) 100000);
-            aAdjSequence [4].Value = aAny;
-            aAdjSequence [4].Name = "adj5";
-        }
-        {
-            Any aAny ((sal_Int32) -16667);
-            aAdjSequence [5].Value = aAny;
-            aAdjSequence [5].Name = "adj6";
-        }
-        {
-            Any aAny ((sal_Int32) 112963);
-            aAdjSequence [6].Value = aAny;
-            aAdjSequence [6].Name = "adj7";
-        }
-        {
-            Any aAny ((sal_Int32) -8333);
-            aAdjSequence [7].Value = aAny;
-            aAdjSequence [7].Name = "adj8";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logheight*$0 /100000",
-            "logwidth*$1 /100000",
-            "logheight*$2 /100000",
-            "logwidth*$3 /100000",
-            "logheight*$4 /100000",
-            "logwidth*$5 /100000",
-            "logheight*$6 /100000",
-            "logwidth*$7 /100000",
-            "logwidth",
-            "logheight/2",
+            "min(logwidth,logheight)",
+            "50000*logwidth/?0 ",
+            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "?2 *2/1",
+            "if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))",
+            "100000*logheight/?0 ",
+            "if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))",
+            "?6 *?0 /logheight",
+            "100000+0-?7 ",
+            "if(0-$3 ,0,if(?8 -$3 ,$3 ,?8 ))",
+            "?0 *?2 /100000",
+            "?0 *?4 /200000",
             "logwidth/2",
+            "?12 +0-?10 ",
+            "?12 +0-?11 ",
+            "?12 +?11 -0",
+            "?12 +?10 -0",
+            "?0 *?6 /100000",
+            "logheight*?9 /100000",
+            "logheight+0-?18 ",
+            "(?19 +logheight)/2",
+            "logwidth",
             "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
@@ -875,226 +620,142 @@ class ShapeCcallout3 : public CustomShapeProvider
     {
         Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    14, 17
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 3);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    13, 0
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
                 aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [1] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
+                    21, 17
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 5);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 5);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 4);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [2] = aPropSequence;
         }
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 6
+                    0, 19
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 8);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 7);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 6);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [3] = aPropSequence;
         }
@@ -1113,43 +774,58 @@ class ShapeCcallout3 : public CustomShapeProvider
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    14, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 11
+                    13, 17
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
+                    12, 0
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 11
+                    16, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    15, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    15, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 4
+                    21, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 6
+                    21, 22
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 22
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1159,13 +835,8 @@ class ShapeCcallout3 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
+                2,10,
                 4,0,
-                7,0,
-                5,0,
-                1,1,
-                2,3,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -1179,8 +850,8 @@ class ShapeCcallout3 : public CustomShapeProvider
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
                         EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        0, 19
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1189,7 +860,7 @@ class ShapeCcallout3 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        8, 11
+                        21, 22
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -1207,7 +878,7 @@ class ShapeCcallout3 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-callout3"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-upArrowCallout"));
 
     return aPropertyMap;
   }
@@ -1215,108 +886,66 @@ class ShapeCcallout3 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCbentUpArrow : public CustomShapeProvider
+class ShapeCupDownArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 25000);
+            Any aAny ((sal_Int32) 50000);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
-        {
-            Any aAny ((sal_Int32) 25000);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
-            "if(0-$1 ,0,if(50000-$1 ,$1 ,50000))",
-            "if(0-$2 ,0,if(50000-$2 ,$2 ,50000))",
             "min(logwidth,logheight)",
-            "?3 *?2 /100000",
-            "?3 *?1 /50000",
-            "logwidth+0-?5 ",
-            "?3 *?1 /100000",
-            "logwidth+0-?7 ",
-            "?3 *?0 /200000",
-            "?8 +0-?9 ",
-            "?8 +?9 -0",
-            "?3 *?0 /100000",
-            "logheight+0-?12 ",
-            "?11 *1/2",
-            "(?13 +logheight)/2",
-            "(?4 +logheight)/2",
+            "50000*logheight/?0 ",
+            "if(0-$0 ,0,if(100000-$0 ,$0 ,100000))",
+            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "?0 *?3 /100000",
+            "logheight+0-?4 ",
+            "logwidth*?2 /200000",
+            "logwidth/2",
+            "?7 +0-?6 ",
+            "?7 +?6 -0",
+            "logwidth/2",
+            "?8 *?4 /?10 ",
+            "?4 +0-?11 ",
+            "?5 +?11 -0",
+            "logheight/2",
             "logheight",
             "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (3);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 13
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [2].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6, 0
+                    8, 5
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 100000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
@@ -1331,10 +960,10 @@ class ShapeCbentUpArrow : public CustomShapeProvider
             }
             {
                 aPropSequence [3].Name = "RefX";
-                Any aAny ((sal_Int32) 1);
+                Any aAny ((sal_Int32) 0);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [1] = aPropSequence;
+            aPropSequenceSequence [0] = aPropSequence;
         }
         {
             Sequence< PropertyValue > aPropSequence (4);
@@ -1342,18 +971,18 @@ class ShapeCbentUpArrow : public CustomShapeProvider
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 4
+                    0, 4
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
                 aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 1);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
@@ -1366,10 +995,10 @@ class ShapeCbentUpArrow : public CustomShapeProvider
             }
             {
                 aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
+                Any aAny ((sal_Int32) 1);
                 aPropSequence [3].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [2] = aPropSequence;
+            aPropSequenceSequence [1] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -1387,47 +1016,52 @@ class ShapeCbentUpArrow : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 13
+                    0, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 13
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    7, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 4
+                    16, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 4
+                    9, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    8, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    9, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    18, 4
+                    16, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 4
+                    7, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 5
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    11, 17
+                    8, 5
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 17
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    8, 4
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1437,7 +1071,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,8,
+                2,9,
                 4,0,
                 5,0
             };
@@ -1451,9 +1085,9 @@ class ShapeCbentUpArrow : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        0, 13
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        8, 12
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1462,7 +1096,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        11, 17
+                        9, 13
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -1480,7 +1114,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-bentUpArrow"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-upDownArrow"));
 
     return aPropertyMap;
   }
@@ -1488,109 +1122,209 @@ class ShapeCbentUpArrow : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCnoSmoking : public CustomShapeProvider
+class ShapeCupDownArrowCallout : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
         {
-            Any aAny ((sal_Int32) 18750);
+            Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) 48123);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))",
             "min(logwidth,logheight)",
-            "?1 *?0 /100000",
-            "logwidth/2",
-            "?3 +0-?2 ",
+            "50000*logwidth/?0 ",
+            "if(0-$1 ,0,if(?1 -$1 ,$1 ,?1 ))",
+            "?2 *2/1",
+            "if(0-$0 ,0,if(?3 -$0 ,$0 ,?3 ))",
+            "50000*logheight/?0 ",
+            "if(0-$2 ,0,if(?5 -$2 ,$2 ,?5 ))",
             "logheight/2",
-            "?5 +0-?2 ",
-            "(10800000*atan2(logheight,logwidth))/pi",
-            "?6 *cos(pi*(?7 )/10800000)",
-            "?4 *sin(pi*(?7 )/10800000)",
-            "sqrt(?8 *?8 +?9 *?9 +0*0)",
-            "?4 *?6 /?10 ",
-            "?2 *1/2",
-            "(10800000*atan2(?12 ,?11 ))/pi",
-            "?13 *2/1",
-            "-10800000+2-0",
-            "(10800000*atan2(logheight,logwidth))/pi",
-            "?16 +0-?13 ",
-            "?17 +0-10800000",
-            "?6 *cos(pi*(?17 )/10800000)",
-            "?4 *sin(pi*(?17 )/10800000)",
-            "sqrt(?19 *?19 +?20 *?20 +0*0)",
-            "?4 *?6 /?21 ",
-            "?22 *cos(pi*(?17 )/10800000)",
-            "?22 *sin(pi*(?17 )/10800000)",
+            "?6 *?0 /?7 ",
+            "100000+0-?8 ",
+            "if(0-$3 ,0,if(?9 -$3 ,$3 ,?9 ))",
+            "?0 *?2 /100000",
+            "?0 *?4 /200000",
             "logwidth/2",
-            "?25 +?23 -0",
+            "?13 +0-?11 ",
+            "?13 +0-?12 ",
+            "?13 +?12 -0",
+            "?13 +?11 -0",
+            "?0 *?6 /100000",
+            "logheight+0-?18 ",
+            "logheight*?10 /200000",
             "logheight/2",
-            "?27 +?24 -0",
-            "?25 +0-?23 ",
-            "?27 +0-?24 ",
-            "?3 *cos(pi*(2700000)/10800000)",
-            "?5 *sin(pi*(2700000)/10800000)",
-            "?25 +0-?31 ",
-            "?25 +?31 -0",
-            "?27 +0-?32 ",
-            "?27 +?32 -0",
-            "logheight",
+            "?21 +0-?20 ",
+            "?21 +?20 -0",
             "logwidth",
-            "(10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(?17 )/60000.0",
-            "(?15 )/60000.0",
-            "(?18 )/60000.0",
-            "(?15 )/60000.0"
+            "logheight"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (4);
         {
-            Sequence< PropertyValue > aPropSequence (3);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 27
+                    15, 18
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RadiusRangeMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 50000);
+                Any aAny ((sal_Int32) 3);
                 aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RadiusRangeMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
                 Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
             aPropSequenceSequence [0] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    14, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 1);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    24, 18
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 5);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 22
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 9);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [3] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -1607,77 +1341,92 @@ class ShapeCnoSmoking : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 27
+                    0, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    15, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    39, 40
+                    15, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    14, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    13, 0
+                },
+                {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    41, 42
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    16, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    43, 44
+                    16, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    24, 22
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    45, 46
+                    24, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    26, 28
+                    16, 23
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 6
+                    16, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    47, 48
+                    17, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    29, 30
+                    13, 25
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 6
+                    14, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    49, 50
+                    15, 19
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 23
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1687,13 +1436,7 @@ class ShapeCnoSmoking : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,4,
-                4,0,
-                1,1,
-                17,1,
-                4,0,
-                1,1,
-                17,1,
+                2,17,
                 4,0,
                 5,0
             };
@@ -1707,9 +1450,9 @@ class ShapeCnoSmoking : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
+                        EnhancedCustomShapeParameterType::NORMAL,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        33, 35
+                        0, 22
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1718,7 +1461,7 @@ class ShapeCnoSmoking : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        34, 36
+                        24, 23
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -1736,7 +1479,7 @@ class ShapeCnoSmoking : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-noSmoking"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-upDownArrowCallout"));
 
     return aPropertyMap;
   }
@@ -1744,44 +1487,91 @@ class ShapeCnoSmoking : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCtrapezoid : public CustomShapeProvider
+class ShapeCuturnArrow : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (5);
         {
             Any aAny ((sal_Int32) 25000);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj";
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 25000);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        {
+            Any aAny ((sal_Int32) 43750);
+            aAdjSequence [3].Value = aAny;
+            aAdjSequence [3].Name = "adj4";
+        }
+        {
+            Any aAny ((sal_Int32) 75000);
+            aAdjSequence [4].Value = aAny;
+            aAdjSequence [4].Name = "adj5";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "min(logwidth,logheight)",
-            "50000*logwidth/?0 ",
+            "if(0-$1 ,0,if(25000-$1 ,$1 ,25000))",
+            "?0 *2/1",
             "if(0-$0 ,0,if(?1 -$0 ,$0 ,?1 ))",
-            "?0 *?2 /200000",
-            "?0 *?2 /100000",
-            "logwidth+0-?4 ",
-            "logwidth+0-?3 ",
-            "logwidth/3",
-            "?7 *?2 /?1 ",
-            "logheight/3",
-            "?9 *?2 /?1 ",
-            "logwidth+0-?8 ",
-            "logwidth/2",
-            "logheight/2",
+            "min(logwidth,logheight)",
+            "?2 *?3 /logheight",
+            "100000+0-?4 ",
+            "?5 *logheight/?3 ",
+            "if(0-$2 ,0,if(?6 -$2 ,$2 ,?6 ))",
+            "?7 +?2 -0",
+            "?8 *?3 /logheight",
+            "if(?9 -$4 ,?9 ,if(100000-$4 ,$4 ,100000))",
+            "?3 *?2 /100000",
+            "?3 *?0 /100000",
+            "?11 *1/2",
+            "?12 +0-?13 ",
+            "logheight*?10 /100000",
+            "?3 *?7 /100000",
+            "?15 +0-?16 ",
+            "logwidth+0-?14 ",
+            "?18 *1/2",
+            "min(?19 ,?17 )",
+            "?20 *100000/?3 ",
+            "if(0-$3 ,0,if(?21 -$3 ,$3 ,?21 ))",
+            "?3 *?22 /100000",
+            "?23 +0-?11 ",
+            "max(?24 ,0)",
+            "?11 +?25 -0",
+            "logwidth+0-?12 ",
+            "?27 +0-?12 ",
+            "?28 +?14 -0",
+            "?18 +0-?23 ",
+            "?29 +0-?25 ",
+            "(?11 +?29 )/2",
             "logheight",
-            "logwidth"
+            "logwidth",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(-5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(-5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (5);
         {
             Sequence< PropertyValue > aPropSequence (4);
             {
@@ -1789,8 +1579,8 @@ class ShapeCtrapezoid : public CustomShapeProvider
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 33
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -1817,6 +1607,146 @@ class ShapeCtrapezoid : public CustomShapeProvider
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 33
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 25000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 17
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 6);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 2);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [2] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    23, 0
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 21);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 0);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefX";
+                Any aAny ((sal_Int32) 3);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [3] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    34, 15
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 100000);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 9);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::EQUATION;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 4);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [4] = aPropSequence;
+        }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
     {
@@ -1833,22 +1763,97 @@ class ShapeCtrapezoid : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 14
+                    0, 33
                 },
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    0, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    23, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    35, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    5, 0
+                    30, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    15, 14
+                    23, 23
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    37, 38
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    34, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    27, 15
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    28, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    29, 17
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    29, 26
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 25
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    39, 40
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    26, 11
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 25
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    41, 42
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    11, 33
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -1858,7 +1863,15 @@ class ShapeCtrapezoid : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
+                2,1,
+                17,1,
+                2,1,
+                17,1,
+                2,6,
+                17,1,
+                2,1,
+                17,1,
+                2,1,
                 4,0,
                 5,0
             };
@@ -1872,9 +1885,9 @@ class ShapeCtrapezoid : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        EnhancedCustomShapeParameterType::EQUATION,
-                        8, 10
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -1883,7 +1896,7 @@ class ShapeCtrapezoid : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        11, 14
+                        34, 33
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -1901,7 +1914,7 @@ class ShapeCtrapezoid : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-trapezoid"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-uturnArrow"));
 
     return aPropertyMap;
   }
@@ -1909,184 +1922,113 @@ class ShapeCtrapezoid : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcloudCallout : public CustomShapeProvider
+class ShapeCverticalScroll : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (1);
         {
-            Any aAny ((sal_Int32) -20833);
+            Any aAny ((sal_Int32) 12500);
             aAdjSequence [0].Value = aAny;
-            aAdjSequence [0].Name = "adj1";
-        }
-        {
-            Any aAny ((sal_Int32) 62500);
-            aAdjSequence [1].Value = aAny;
-            aAdjSequence [1].Name = "adj2";
+            aAdjSequence [0].Name = "adj";
         }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logwidth*$0 /100000",
-            "logheight*$1 /100000",
+            "if(0-$0 ,0,if(25000-$0 ,$0 ,25000))",
+            "min(logwidth,logheight)",
+            "?1 *?0 /100000",
+            "?2 *1/2",
+            "?2 *1/4",
+            "?2 +?3 -0",
+            "?2 +?2 -0",
+            "logwidth+0-?2 ",
+            "logwidth+0-?3 ",
+            "?7 +0-?3 ",
+            "logheight+0-?2 ",
+            "logheight+0-?3 ",
             "logwidth/2",
-            "?2 +?0 -0",
-            "logheight/2",
-            "?4 +?1 -0",
             "logheight/2",
-            "?6 *(cos(atan2(?1 ,?0 )))",
-            "logwidth/2",
-            "?8 *(sin(atan2(?1 ,?0 )))",
-            "?8 *(cos(atan2(?9 ,?7 )))",
-            "?6 *(sin(atan2(?9 ,?7 )))",
-            "?2 +?10 -0",
-            "?4 +?11 -0",
-            "?12 +0-?3 ",
-            "?13 +0-?5 ",
-            "sqrt(?14 *?14 +?15 *?15 +0*0)",
-            "min(logwidth,logheight)",
-            "?17 *6600/21600",
-            "?16 +0-?18 ",
-            "?19 *1/3",
-            "?17 *1800/21600",
-            "?20 +?21 -0",
-            "?22 *?14 /?16 ",
-            "?22 *?15 /?16 ",
-            "?23 +?3 -0",
-            "?24 +?5 -0",
-            "?17 *4800/21600",
-            "?20 *2/1",
-            "?27 +?28 -0",
-            "?29 *?14 /?16 ",
-            "?29 *?15 /?16 ",
-            "?30 +?3 -0",
-            "?31 +?5 -0",
-            "?17 *1200/21600",
-            "?17 *600/21600",
-            "?3 +?35 -0",
-            "?25 +?34 -0",
-            "?32 +?21 -0",
-            "logwidth*2977/21600",
-            "logheight*3262/21600",
-            "logwidth*17087/21600",
-            "logheight*17337/21600",
-            "logwidth*67/21600",
-            "logheight*21577/21600",
-            "logwidth*21582/21600",
-            "logheight*1235/21600",
-            "(10800000*atan2(?1 ,?0 ))/pi",
-            "(-11429249)/60000.0",
-            "(7426832)/60000.0",
-            "(-8646143)/60000.0",
-            "(5396714)/60000.0",
-            "(-8748475)/60000.0",
-            "(5983381)/60000.0",
-            "(-7859164)/60000.0",
-            "(7034504)/60000.0",
-            "(-4722533)/60000.0",
-            "(6541615)/60000.0",
-            "(-2776035)/60000.0",
-            "(7816140)/60000.0",
-            "(37501)/60000.0",
-            "(6842000)/60000.0",
-            "(1347096)/60000.0",
-            "(6910353)/60000.0",
-            "(3974558)/60000.0",
-            "(4542661)/60000.0",
-            "(-16496525)/60000.0",
-            "(8804134)/60000.0",
-            "(-14809710)/60000.0",
-            "(9151131)/60000.0",
+            "logheight",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(-10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(10800000)/60000.0",
             "(0)/60000.0",
-            "(21600000)/60000.0",
+            "(5400000)/60000.0",
             "(0)/60000.0",
-            "(21600000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
             "(0)/60000.0",
-            "(21600000)/60000.0",
-            "(5204520)/60000.0",
-            "(1585770)/60000.0",
-            "(4416628)/60000.0",
-            "(686848)/60000.0",
-            "(8257449)/60000.0",
-            "(844866)/60000.0",
-            "(387196)/60000.0",
-            "(959901)/60000.0",
-            "(-4217541)/60000.0",
-            "(4255042)/60000.0",
-            "(1819082)/60000.0",
-            "(1665090)/60000.0",
-            "(-824660)/60000.0",
-            "(891534)/60000.0",
-            "(-8950887)/60000.0",
-            "(1091722)/60000.0",
-            "(-9809656)/60000.0",
-            "(1061181)/60000.0",
-            "(-4002417)/60000.0",
-            "(739161)/60000.0",
-            "(9459261)/60000.0",
-            "(711490)/60000.0"
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(16200000)/60000.0",
+            "(16200000)/60000.0",
+            "(10800000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(10800000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(10800000)/60000.0",
+            "(16200000)/60000.0",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(-5400000)/60000.0"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
         Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 5
+                    0, 2
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 25000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [4].Name = "RangeYMinimum";
-                EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
-                aParameter.Value = aAny;
-                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
-            }
-            {
-                aPropSequence [5].Name = "RefX";
+                aPropSequence [3].Name = "RefY";
                 Any aAny ((sal_Int32) 0);
-                aPropSequence [5].Value = makeAny (aAny);
-            }
-            {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 1);
-                aPropSequence [6].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
             aPropSequenceSequence [0] = aPropSequence;
         }
@@ -2099,334 +2041,319 @@ class ShapeCcloudCallout : public CustomShapeProvider
         aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
     }
     {
-        Sequence< PropertyValue > aPropSequence (4);
+        Sequence< PropertyValue > aPropSequence (3);
         {
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    3900, 14370
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6753, 9190
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    48, 49
+                    3, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5333, 7267
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    50, 51
+                    3, 11
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4365, 5945
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    52, 53
+                    17, 18
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4857, 6595
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    54, 55
+                    2, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5333, 7273
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    56, 57
+                    19, 20
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6775, 9220
+                    8, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    58, 59
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5785, 7867
+                    3, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    60, 61
+                    21, 22
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6752, 9215
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 2
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    62, 63
+                    7, 11
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    7720, 10543
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    64, 65
+                    23, 24
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4360, 5918
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    66, 67
+                    3, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4345, 5945
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 26
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    68, 69
+                    4, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    36, 5
+                    27, 28
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    35, 35
+                    6, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    70, 71
+                    3, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    37, 26
+                    29, 30
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    34, 34
+                    4, 4
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    72, 73
+                    31, 32
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    38, 33
+                    2, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    21, 21
+                    3, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    74, 75
+                    33, 34
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4693, 26177
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    4, 4
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4345, 5945
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    35, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    76, 77
+                    2, 10
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6928, 34899
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4360, 5918
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    78, 79
+                    37, 38
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    16478, 39090
+                    8, 0
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6752, 9215
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    80, 81
+                    39, 40
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    28827, 34751
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6752, 9215
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    7, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    82, 83
+                    3, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    34129, 22954
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    41, 42
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5785, 7867
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 14
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    84, 85
+                    3, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    41798, 15354
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    43, 44
                 },
                 {
+                    EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    5333, 7273
+                    5, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    86, 87
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    38324, 5426
+                    3, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4857, 6595
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    45, 46
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    88, 89
+                    4, 4
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    29078, 3952
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    47, 48
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4857, 6595
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    6, 3
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    90, 91
+                    7, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    22141, 4720
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    5, 2
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4365, 5945
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 10
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    92, 93
+                    4, 4
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    14000, 5192
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    49, 50
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6753, 9190
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    2, 11
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    94, 95
+                    3, 14
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4127, 15789
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    3, 3
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6753, 9190
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    51, 52
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    96, 97
+                    2, 10
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2436,85 +2363,58 @@ class ShapeCcloudCallout : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                17,11,
+                17,1,
+                2,1,
+                17,1,
+                2,2,
+                17,1,
+                2,1,
+                17,1,
+                2,2,
+                17,1,
                 4,0,
-                5,0,
                 1,1,
-                17,1,
+                17,2,
                 4,0,
+                7,0,
                 5,0,
                 1,1,
-                17,1,
+                17,2,
                 4,0,
-                5,0,
                 1,1,
-                17,1,
+                17,2,
                 4,0,
+                19,0,
+                7,0,
                 5,0,
                 1,1,
+                2,1,
                 17,1,
-                1,1,
-                17,1,
-                1,1,
-                17,1,
-                1,1,
-                17,1,
-                1,1,
+                2,1,
                 17,1,
-                1,1,
+                2,2,
                 17,1,
-                1,1,
+                2,1,
                 17,1,
+                4,0,
                 1,1,
-                17,1,
+                17,2,
+                2,1,
                 1,1,
-                17,1,
+                2,1,
                 1,1,
                 17,1,
+                2,1,
                 1,1,
                 17,1,
+                2,1,
                 6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
         }
         {
-            aPropSequence [2].Name = "SubViewSize";
-            Sequence< awt::Size > aSizeSequence (5);
-            {
-                awt::Size aSize;
-                aSize.Width = 43200;
-                aSize.Height = 43200;
-                aSizeSequence [0] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 0;
-                aSize.Height = 0;
-                aSizeSequence [1] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 0;
-                aSize.Height = 0;
-                aSizeSequence [2] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 0;
-                aSize.Height = 0;
-                aSizeSequence [3] = aSize;
-            }
-            {
-                awt::Size aSize;
-                aSize.Width = 43200;
-                aSize.Height = 43200;
-                aSizeSequence [4] = aSize;
-            }
-            aPropSequence [2].Value = makeAny (aSizeSequence);
-        }
-        {
-            aPropSequence [3].Name = "TextFrames";
+            aPropSequence [2].Name = "TextFrames";
             Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
                 EnhancedCustomShapeTextFrame aTextFrame;
@@ -2523,7 +2423,7 @@ class ShapeCcloudCallout : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        39, 40
+                        2, 2
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -2532,13 +2432,13 @@ class ShapeCcloudCallout : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        41, 42
+                        7, 11
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
                 aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequence [3].Value = makeAny (aTextFrameSeq);
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
         }
         aPropertyMap.setProperty(PROP_Path, aPropSequence);
     }
@@ -2550,7 +2450,7 @@ class ShapeCcloudCallout : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-cloudCallout"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-verticalScroll"));
 
     return aPropertyMap;
   }
@@ -2558,108 +2458,314 @@ class ShapeCcloudCallout : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCcallout1 : public CustomShapeProvider
+class ShapeCwave : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
     PropertyMap aPropertyMap;
 
     {
-        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (4);
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 18750);
+            Any aAny ((sal_Int32) 12500);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) -8333);
+            Any aAny ((sal_Int32) 0);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
-        {
-            Any aAny ((sal_Int32) 112500);
-            aAdjSequence [2].Value = aAny;
-            aAdjSequence [2].Name = "adj3";
-        }
-        {
-            Any aAny ((sal_Int32) -38333);
-            aAdjSequence [3].Value = aAny;
-            aAdjSequence [3].Name = "adj4";
-        }
         aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
     }
     {
         static const char *aStrings[] = {
-            "logheight*$0 /100000",
-            "logwidth*$1 /100000",
-            "logheight*$2 /100000",
-            "logwidth*$3 /100000",
-            "logwidth",
-            "logheight/2",
+            "if(0-$0 ,0,if(20000-$0 ,$0 ,20000))",
+            "if(-10000-$1 ,-10000,if(10000-$1 ,$1 ,10000))",
+            "logheight*?0 /100000",
+            "?2 *10/3",
+            "?2 +0-?3 ",
+            "?2 +?3 -0",
+            "logheight+0-?2 ",
+            "?6 +0-?3 ",
+            "?6 +?3 -0",
+            "logwidth*?1 /100000",
+            "logwidth*?1 /50000",
+            "abs(?9 )",
+            "if(?10 ,0,?10 )",
+            "0+0-?12 ",
+            "if(?10 ,?10 ,0)",
+            "logwidth+0-?14 ",
+            "(?12 +?15 )/3",
+            "?13 +?16 -0",
+            "(?17 +?15 )/2",
+            "0+?14 -0",
+            "logwidth+?12 -0",
+            "?19 +?16 -0",
+            "(?21 +?20 )/2",
+            "logwidth+0-?11 ",
             "logwidth/2",
-            "logheight"
+            "?24 +?9 -0",
+            "?24 +0-?9 ",
+            "max(?13 ,?19 )",
+            "min(?15 ,?20 )",
+            "logheight*?0 /50000",
+            "logheight+0-?29 ",
+            "logheight",
+            "logheight/2"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
         Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
         {
-            Sequence< PropertyValue > aPropSequence (7);
+            Sequence< PropertyValue > aPropSequence (4);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    0, 2
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [1].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 20000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [2].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) 0);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RangeYMaximum";
+                aPropSequence [3].Name = "RefY";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [3].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        {
+            Sequence< PropertyValue > aPropSequence (4);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    25, 31
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 2147483647);
+                Any aAny ((sal_Int32) 10000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [3].Value = makeAny (aParameter);
+                aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [4].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) -2147483647);
+                Any aAny ((sal_Int32) -10000);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [4].Value = makeAny (aParameter);
+                aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [5].Name = "RefX";
+                aPropSequence [3].Name = "RefX";
                 Any aAny ((sal_Int32) 1);
-                aPropSequence [5].Value = makeAny (aAny);
+                aPropSequence [3].Value = makeAny (aAny);
             }
+            aPropSequenceSequence [1] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    13, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    17, 4
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    18, 5
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 2
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    20, 6
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    22, 8
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    21, 7
+                },
+                {
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    19, 6
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                3,1,
+                2,1,
+                3,1,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
             {
-                aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [6].Value = makeAny (aAny);
+                EnhancedCustomShapeTextFrame aTextFrame;
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        27, 29
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
+                {
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        28, 30
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
             }
-            aPropSequenceSequence [0] = aPropSequence;
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-wave"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCwedgeEllipseCallout : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
+        {
+            Any aAny ((sal_Int32) -20833);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
         }
         {
+            Any aAny ((sal_Int32) 62500);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "logwidth*$0 /100000",
+            "logheight*$1 /100000",
+            "logwidth/2",
+            "?2 +?0 -0",
+            "logheight/2",
+            "?4 +?1 -0",
+            "?0 *logheight/1",
+            "?1 *logwidth/1",
+            "(10800000*atan2(?7 ,?6 ))/pi",
+            "?8 +660000-0",
+            "?8 +0-660000",
+            "logwidth/2",
+            "?11 *cos(pi*(?9 )/10800000)",
+            "logheight/2",
+            "?13 *sin(pi*(?9 )/10800000)",
+            "?2 +?12 -0",
+            "?4 +?14 -0",
+            "?11 *cos(pi*(?10 )/10800000)",
+            "?13 *sin(pi*(?10 )/10800000)",
+            "?2 +?17 -0",
+            "?4 +?18 -0",
+            "(10800000*atan2(?14 ,?12 ))/pi",
+            "(10800000*atan2(?18 ,?17 ))/pi",
+            "?22 +0-?21 ",
+            "?23 +21600000-0",
+            "if(?23 ,?23 ,?24 )",
+            "?11 *cos(pi*(2700000)/10800000)",
+            "?13 *sin(pi*(2700000)/10800000)",
+            "?2 +0-?26 ",
+            "?2 +?26 -0",
+            "?4 +0-?27 ",
+            "?4 +?27 -0",
+            "logheight",
+            "logwidth",
+            "(?21 )/60000.0",
+            "(?25 )/60000.0"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
             Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
@@ -2667,7 +2773,7 @@ class ShapeCcallout1 : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    3, 5
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
@@ -2705,15 +2811,15 @@ class ShapeCcallout1 : public CustomShapeProvider
             }
             {
                 aPropSequence [5].Name = "RefX";
-                Any aAny ((sal_Int32) 3);
+                Any aAny ((sal_Int32) 0);
                 aPropSequence [5].Value = makeAny (aAny);
             }
             {
                 aPropSequence [6].Name = "RefY";
-                Any aAny ((sal_Int32) 2);
+                Any aAny ((sal_Int32) 1);
                 aPropSequence [6].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [1] = aPropSequence;
+            aPropSequenceSequence [0] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -2729,34 +2835,24 @@ class ShapeCcallout1 : public CustomShapeProvider
             aPropSequence [0].Name = "Coordinates";
             static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    4, 0
-                },
-                {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    4, 7
+                    3, 5
                 },
                 {
-                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 7
+                    EnhancedCustomShapeParameterType::EQUATION,
+                    15, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    1, 0
+                    11, 13
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 2
+                    34, 35
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -2766,13 +2862,9 @@ class ShapeCcallout1 : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,3,
-                4,0,
-                7,0,
-                5,0,
-                1,1,
                 2,1,
-                6,0,
+                17,1,
+                4,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -2785,9 +2877,9 @@ class ShapeCcallout1 : public CustomShapeProvider
                 {
                     static const CustomShapeProvider::ParameterPairData aData =
                     {
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        EnhancedCustomShapeParameterType::NORMAL,
-                        0, 0
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        28, 30
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -2796,7 +2888,7 @@ class ShapeCcallout1 : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        4, 7
+                        29, 31
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -2814,7 +2906,7 @@ class ShapeCcallout1 : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-callout1"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-wedgeEllipseCallout"));
 
     return aPropertyMap;
   }
@@ -2822,7 +2914,7 @@ class ShapeCcallout1 : public CustomShapeProvider
 
 // This is a generated source file. DO NOT EDIT.
 
-class ShapeCribbon : public CustomShapeProvider
+class ShapeCwedgeRectCallout : public CustomShapeProvider
 {
   virtual PropertyMap getProperties() SAL_OVERRIDE
   {
@@ -2831,12 +2923,12 @@ class ShapeCribbon : public CustomShapeProvider
     {
         Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (2);
         {
-            Any aAny ((sal_Int32) 16667);
+            Any aAny ((sal_Int32) -20833);
             aAdjSequence [0].Value = aAny;
             aAdjSequence [0].Name = "adj1";
         }
         {
-            Any aAny ((sal_Int32) 50000);
+            Any aAny ((sal_Int32) 62500);
             aAdjSequence [1].Value = aAny;
             aAdjSequence [1].Name = "adj2";
         }
@@ -2844,136 +2936,104 @@ class ShapeCribbon : public CustomShapeProvider
     }
     {
         static const char *aStrings[] = {
-            "if(0-$0 ,0,if(33333-$0 ,$0 ,33333))",
-            "if(25000-$1 ,25000,if(75000-$1 ,$1 ,75000))",
-            "logwidth/8",
-            "logwidth+0-?2 ",
-            "logwidth*?1 /200000",
+            "logwidth*$0 /100000",
+            "logheight*$1 /100000",
             "logwidth/2",
+            "?2 +?0 -0",
+            "logheight/2",
+            "?4 +?1 -0",
+            "?3 +0-?2 ",
             "?5 +0-?4 ",
-            "?5 +?4 -0",
-            "logwidth/32",
-            "?6 +?8 -0",
-            "?7 +0-?8 ",
-            "?6 +?2 -0",
-            "?7 +0-?2 ",
-            "?11 +0-?8 ",
-            "?12 +?8 -0",
-            "logheight*?0 /200000",
-            "logheight*?0 /100000",
-            "logheight+0-?16 ",
-            "?17 *1/2",
-            "logheight*?0 /400000",
-            "logheight+0-?19 ",
-            "?16 +0-?19 ",
+            "?0 *logheight/logwidth",
+            "abs(?1 )",
+            "abs(?8 )",
+            "?9 +0-?10 ",
+            "if(?0 ,7,2)",
+            "if(?0 ,10,5)",
+            "logwidth*?12 /12",
+            "logwidth*?13 /12",
+            "if(?1 ,7,2)",
+            "if(?1 ,10,5)",
+            "logheight*?16 /12",
+            "logheight*?17 /12",
+            "if(?0 ,0,?3 )",
+            "if(?11 ,0,?20 )",
+            "if(?1 ,?14 ,?3 )",
+            "if(?11 ,?22 ,?14 )",
+            "if(?0 ,?3 ,logwidth)",
+            "if(?11 ,logwidth,?24 )",
+            "if(?1 ,?3 ,?14 )",
+            "if(?11 ,?26 ,?14 )",
+            "if(?0 ,?18 ,?5 )",
+            "if(?11 ,?18 ,?28 )",
+            "if(?1 ,0,?5 )",
+            "if(?11 ,?30 ,0)",
+            "if(?0 ,?5 ,?18 )",
+            "if(?11 ,?18 ,?32 )",
+            "if(?1 ,?5 ,logheight)",
+            "if(?11 ,?34 ,logheight)",
             "logheight",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(-10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(-10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "logwidth",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(-10800000)/60000.0",
-            "(10800000)/60000.0",
-            "(-5400000)/60000.0",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(10800000)/60000.0",
-            "(16200000)/60000.0",
-            "(-10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(-10800000)/60000.0",
-            "(5400000)/60000.0",
-            "(10800000)/60000.0",
-            "(0)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0",
-            "(5400000)/60000.0"
+            "logwidth"
         };
         aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
     }
     {
-        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (2);
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
         {
-            Sequence< PropertyValue > aPropSequence (4);
+            Sequence< PropertyValue > aPropSequence (7);
             {
                 aPropSequence [0].Name = "Position";
                 static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    5, 16
+                    3, 5
                 };
                 aPropSequence [0].Value = makeAny (createParameterPair(&aData));
             }
             {
-                aPropSequence [1].Name = "RangeYMaximum";
+                aPropSequence [1].Name = "RangeXMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 33333);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [1].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeYMinimum";
+                aPropSequence [2].Name = "RangeXMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 0);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
                 aPropSequence [2].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefY";
-                Any aAny ((sal_Int32) 0);
-                aPropSequence [3].Value = makeAny (aAny);
-            }
-            aPropSequenceSequence [0] = aPropSequence;
-        }
-        {
-            Sequence< PropertyValue > aPropSequence (4);
-            {
-                aPropSequence [0].Name = "Position";
-                static const CustomShapeProvider::ParameterPairData aData =
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    6, 0
-                };
-                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
-            }
-            {
-                aPropSequence [1].Name = "RangeXMaximum";
+                aPropSequence [3].Name = "RangeYMaximum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 75000);
+                Any aAny ((sal_Int32) 2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [1].Value = makeAny (aParameter);
+                aPropSequence [3].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [2].Name = "RangeXMinimum";
+                aPropSequence [4].Name = "RangeYMinimum";
                 EnhancedCustomShapeParameter aParameter;
-                Any aAny ((sal_Int32) 25000);
+                Any aAny ((sal_Int32) -2147483647);
                 aParameter.Value = aAny;
                 aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
-                aPropSequence [2].Value = makeAny (aParameter);
+                aPropSequence [4].Value = makeAny (aParameter);
             }
             {
-                aPropSequence [3].Name = "RefX";
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
                 Any aAny ((sal_Int32) 1);
-                aPropSequence [3].Value = makeAny (aAny);
+                aPropSequence [6].Value = makeAny (aAny);
             }
-            aPropSequenceSequence [1] = aPropSequence;
+            aPropSequenceSequence [0] = aPropSequence;
         }
         aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
     }
@@ -2996,202 +3056,313 @@ class ShapeCribbon : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    13, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    23, 24
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    25, 26
+                    14, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    27, 28
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    29, 30
+                    23, 31
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::NORMAL,
-                    31, 0
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    3, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    31, 17
+                    15, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 17
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    37, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 20
+                    37, 18
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
+                    25, 33
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    32, 33
+                    37, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 22
+                    37, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
+                    15, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    34, 35
+                    27, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 17
+                    14, 36
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    0, 17
+                    0, 36
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    2, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    36, 37
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 15
+                    0, 19
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
+                    21, 29
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    38, 39
-                },
+                    0, 18
+                }
+            };
+            aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
+        }
+        {
+            aPropSequence [1].Name = "Segments";
+            static const sal_uInt16 nValues[] = {
+            // Command, Count
+                1,1,
+                2,15,
+                4,0,
+                5,0
+            };
+            aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
+        }
+        {
+            aPropSequence [2].Name = "TextFrames";
+            Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1);
+            {
+                EnhancedCustomShapeTextFrame aTextFrame;
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 16
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        EnhancedCustomShapeParameterType::NORMAL,
+                        0, 0
+                    };
+                    aTextFrame.TopLeft = createParameterPair(&aData);
+                }
                 {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 19
-                },
+                    static const CustomShapeProvider::ParameterPairData aData =
+                    {
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        EnhancedCustomShapeParameterType::EQUATION,
+                        37, 36
+                    };
+                    aTextFrame.BottomRight = createParameterPair(&aData);
+                }
+                aTextFrameSeq [0] = aTextFrame;
+            }
+            aPropSequence [2].Value = makeAny (aTextFrameSeq);
+        }
+        aPropertyMap.setProperty(PROP_Path, aPropSequence);
+    }
+    {
+        awt::Rectangle aRectangle;
+        aRectangle.X = 0;
+        aRectangle.Y = 0;
+        aRectangle.Width = 0;
+        aRectangle.Height = 0;
+        aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
+    }
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-wedgeRectCallout"));
+
+    return aPropertyMap;
+  }
+};
+
+// This is a generated source file. DO NOT EDIT.
+
+class ShapeCwedgeRoundRectCallout : public CustomShapeProvider
+{
+  virtual PropertyMap getProperties() SAL_OVERRIDE
+  {
+    PropertyMap aPropertyMap;
+
+    {
+        Sequence< EnhancedCustomShapeAdjustmentValue > aAdjSequence (3);
+        {
+            Any aAny ((sal_Int32) -20833);
+            aAdjSequence [0].Value = aAny;
+            aAdjSequence [0].Name = "adj1";
+        }
+        {
+            Any aAny ((sal_Int32) 62500);
+            aAdjSequence [1].Value = aAny;
+            aAdjSequence [1].Name = "adj2";
+        }
+        {
+            Any aAny ((sal_Int32) 16667);
+            aAdjSequence [2].Value = aAny;
+            aAdjSequence [2].Name = "adj3";
+        }
+        aPropertyMap.setProperty(PROP_AdjustmentValues, aAdjSequence);
+    }
+    {
+        static const char *aStrings[] = {
+            "logwidth*$0 /100000",
+            "logheight*$1 /100000",
+            "logwidth/2",
+            "?2 +?0 -0",
+            "logheight/2",
+            "?4 +?1 -0",
+            "?0 *logheight/logwidth",
+            "abs(?1 )",
+            "abs(?6 )",
+            "?7 +0-?8 ",
+            "if(?0 ,7,2)",
+            "if(?0 ,10,5)",
+            "logwidth*?10 /12",
+            "logwidth*?11 /12",
+            "if(?1 ,7,2)",
+            "if(?1 ,10,5)",
+            "logheight*?14 /12",
+            "logheight*?15 /12",
+            "if(?0 ,0,?3 )",
+            "if(?9 ,0,?18 )",
+            "if(?1 ,?12 ,?3 )",
+            "if(?9 ,?20 ,?12 )",
+            "if(?0 ,?3 ,logwidth)",
+            "if(?9 ,logwidth,?22 )",
+            "if(?1 ,?3 ,?12 )",
+            "if(?9 ,?24 ,?12 )",
+            "if(?0 ,?16 ,?5 )",
+            "if(?9 ,?16 ,?26 )",
+            "if(?1 ,0,?5 )",
+            "if(?9 ,?28 ,0)",
+            "if(?0 ,?5 ,?16 )",
+            "if(?9 ,?16 ,?30 )",
+            "if(?1 ,?5 ,logheight)",
+            "if(?9 ,?32 ,logheight)",
+            "min(logwidth,logheight)",
+            "?34 *$2 /100000",
+            "logwidth+0-?35 ",
+            "logheight+0-?35 ",
+            "?35 *29289/100000",
+            "logwidth+0-?38 ",
+            "logheight+0-?38 ",
+            "logheight",
+            "logwidth",
+            "(10800000)/60000.0",
+            "(5400000)/60000.0",
+            "(16200000)/60000.0",
+            "(5400000)/60000.0",
+            "(0)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0",
+            "(5400000)/60000.0"
+        };
+        aPropertyMap.setProperty(PROP_Equations, createStringSequence( SAL_N_ELEMENTS( aStrings ), aStrings ));
+    }
+    {
+        Sequence< Sequence < PropertyValue > > aPropSequenceSequence (1);
+        {
+            Sequence< PropertyValue > aPropSequence (7);
+            {
+                aPropSequence [0].Name = "Position";
+                static const CustomShapeProvider::ParameterPairData aData =
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
-                },
+                    3, 5
+                };
+                aPropSequence [0].Value = makeAny (createParameterPair(&aData));
+            }
+            {
+                aPropSequence [1].Name = "RangeXMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [1].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [2].Name = "RangeXMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [2].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [3].Name = "RangeYMaximum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) 2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [3].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [4].Name = "RangeYMinimum";
+                EnhancedCustomShapeParameter aParameter;
+                Any aAny ((sal_Int32) -2147483647);
+                aParameter.Value = aAny;
+                aParameter.Type = EnhancedCustomShapeParameterType::NORMAL;
+                aPropSequence [4].Value = makeAny (aParameter);
+            }
+            {
+                aPropSequence [5].Name = "RefX";
+                Any aAny ((sal_Int32) 0);
+                aPropSequence [5].Value = makeAny (aAny);
+            }
+            {
+                aPropSequence [6].Name = "RefY";
+                Any aAny ((sal_Int32) 1);
+                aPropSequence [6].Value = makeAny (aAny);
+            }
+            aPropSequenceSequence [0] = aPropSequence;
+        }
+        aPropertyMap.setProperty(PROP_Handles, aPropSequenceSequence);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredX, (sal_Bool) sal_False);
+    }
+    {
+        aPropertyMap.setProperty(PROP_MirroredY, (sal_Bool) sal_False);
+    }
+    {
+        Sequence< PropertyValue > aPropSequence (3);
+        {
+            aPropSequence [0].Name = "Coordinates";
+            static const CustomShapeProvider::ParameterPairData aData[] = {
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    40, 41
+                    0, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    10, 15
+                    35, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
+                    43, 44
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    42, 43
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    12, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    12, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    0, 0
+                    21, 29
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
@@ -3200,113 +3371,78 @@ class ShapeCribbon : public CustomShapeProvider
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    44, 45
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    9, 15
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    46, 47
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    10, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
+                    EnhancedCustomShapeParameterType::NORMAL,
+                    36, 0
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    48, 49
+                    35, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    14, 15
+                    45, 46
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
+                    42, 16
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    50, 51
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::NORMAL,
-                    31, 0
+                    23, 31
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    3, 18
+                    42, 17
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    31, 17
+                    42, 37
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 17
+                    35, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    7, 20
+                    47, 48
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
+                    13, 41
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    52, 53
+                    25, 33
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    9, 22
+                    12, 41
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    8, 19
+                    35, 41
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    54, 55
+                    35, 35
                 },
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    6, 17
+                    49, 50
                 },
                 {
                     EnhancedCustomShapeParameterType::NORMAL,
@@ -3316,47 +3452,12 @@ class ShapeCribbon : public CustomShapeProvider
                 {
                     EnhancedCustomShapeParameterType::EQUATION,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    2, 18
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    11, 16
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 16
+                    19, 27
                 },
                 {
+                    EnhancedCustomShapeParameterType::NORMAL,
                     EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    12, 19
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 17
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    6, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 21
-                },
-                {
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    EnhancedCustomShapeParameterType::EQUATION,
-                    7, 17
+                    0, 16
                 }
             };
             aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData));
@@ -3366,61 +3467,15 @@ class ShapeCribbon : public CustomShapeProvider
             static const sal_uInt16 nValues[] = {
             // Command, Count
                 1,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
                 17,1,
-                2,1,
+                2,4,
                 17,1,
-                2,5,
+                2,4,
                 17,1,
-                2,1,
+                2,4,
                 17,1,
                 2,3,
                 4,0,
-                7,0,
-                5,0,
-                1,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                4,0,
-                1,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                4,0,
-                19,0,
-                7,0,
-                5,0,
-                1,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,1,
-                17,1,
-                2,5,
-                17,1,
-                2,1,
-                17,1,
-                2,3,
-                4,0,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                1,1,
-                2,1,
-                6,0,
                 5,0
             };
             aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues ));
@@ -3435,7 +3490,7 @@ class ShapeCribbon : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        6, 16
+                        38, 38
                     };
                     aTextFrame.TopLeft = createParameterPair(&aData);
                 }
@@ -3444,7 +3499,7 @@ class ShapeCribbon : public CustomShapeProvider
                     {
                         EnhancedCustomShapeParameterType::EQUATION,
                         EnhancedCustomShapeParameterType::EQUATION,
-                        7, 22
+                        39, 40
                     };
                     aTextFrame.BottomRight = createParameterPair(&aData);
                 }
@@ -3462,7 +3517,7 @@ class ShapeCribbon : public CustomShapeProvider
         aRectangle.Height = 0;
         aPropertyMap.setProperty(PROP_ViewBox, aRectangle);
     }
-    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-ribbon"));
+    aPropertyMap.setProperty( PROP_Type, OUString("ooxml-wedgeRoundRectCallout"));
 
     return aPropertyMap;
   }
@@ -3473,18 +3528,18 @@ class ShapeCribbon : public CustomShapeProvider
 } // anonymous namespace
 void CustomShapeProperties::initializePresetsMap6()
 {
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "flowChartProcess" ) ] = new ShapeCflowChartProcess();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "star5" ) ] = new ShapeCstar5();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "lineInv" ) ] = new ShapeClineInv();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "straightConnector1" ) ] = new ShapeCstraightConnector1();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "stripedRightArrow" ) ] = new ShapeCstripedRightArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "callout3" ) ] = new ShapeCcallout3();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "bentUpArrow" ) ] = new ShapeCbentUpArrow();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "noSmoking" ) ] = new ShapeCnoSmoking();
     maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "trapezoid" ) ] = new ShapeCtrapezoid();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "cloudCallout" ) ] = new ShapeCcloudCallout();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "callout1" ) ] = new ShapeCcallout1();
-    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "ribbon" ) ] = new ShapeCribbon();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "triangle" ) ] = new ShapeCtriangle();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "upArrow" ) ] = new ShapeCupArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "upArrowCallout" ) ] = new ShapeCupArrowCallout();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "upDownArrow" ) ] = new ShapeCupDownArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "upDownArrowCallout" ) ] = new ShapeCupDownArrowCallout();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "uturnArrow" ) ] = new ShapeCuturnArrow();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "verticalScroll" ) ] = new ShapeCverticalScroll();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "wave" ) ] = new ShapeCwave();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "wedgeEllipseCallout" ) ] = new ShapeCwedgeEllipseCallout();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "wedgeRectCallout" ) ] = new ShapeCwedgeRectCallout();
+    maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( "wedgeRoundRectCallout" ) ] = new ShapeCwedgeRoundRectCallout();
 }
 
 } } // oox // drawingml