CWS-TOOLING: integrate CWS chartshapes

3 files changed, 107 insertions, 4 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
index cc40843f4d..d69c481fa7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
@@ -656,6 +656,29 @@
                     <value xml:lang="en-US">Number of lines in combination chart</value>
                 </prop>
             </node>
+            <node oor:name=".uno:TextAttributes" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Te~xt...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:ObjectTitleDescription" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Description...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:RenameObject" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Name...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:LineArrowEnd" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Line Ends with Arrow</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>
         </node>
         
         <!-- menu items with sub menu -->
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
index 337efa0969..2397810ed2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
@@ -59,6 +59,20 @@
                     <value>true</value>
                 </prop>
             </node>
+            <node oor:name="private:resource/toolbar/drawbar" oor:op="replace">
+                <prop oor:name="Docked" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+                <prop oor:name="DockingArea" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+                <prop oor:name="UIName" oor:type="xs:string">
+                    <value xml:lang="en-US">Drawing</value>
+                </prop>
+                <prop oor:name="Visible" oor:type="xs:boolean">
+                    <value>true</value>
+                </prop>
+            </node>
         </node>
     </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 65c884fe51..d57d1b3b4d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -220,15 +220,81 @@
       </node>
       <node oor:name="c3" oor:op="replace">
         <prop oor:name="Command">
-            <value>.uno:ChartElementSelector</value>
+          <value>.uno:ChartElementSelector</value>
         </prop>
         <prop oor:name="Module">
-            <value>com.sun.star.chart2.ChartDocument</value>
+          <value>com.sun.star.chart2.ChartDocument</value>
         </prop>
         <prop oor:name="Controller">
-            <value>com.sun.star.comp.chart.ElementSelectorToolbarController</value>
+          <value>com.sun.star.comp.chart.ElementSelectorToolbarController</value>
         </prop>
-    </node>
+      </node>
+      <node oor:name="c4" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:BasicShapes</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.chart2.ChartDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+        </prop>
+      </node>
+      <node oor:name="c5" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:SymbolShapes</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.chart2.ChartDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+        </prop>
+      </node>
+      <node oor:name="c6" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:ArrowShapes</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.chart2.ChartDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+        </prop>
+      </node>
+      <node oor:name="c7" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:FlowChartShapes</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.chart2.ChartDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+        </prop>
+      </node>
+      <node oor:name="c8" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:CalloutShapes</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.chart2.ChartDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+        </prop>
+      </node>
+      <node oor:name="c9" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:StarShapes</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.chart2.ChartDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.chart2.comp.ShapeToolbarController</value>
+        </prop>
+      </node>
     </node>
     <node oor:name="StatusBar">
       <node oor:name="c1" oor:op="replace">