From c991fb49aa174f300be0b978d89bc63e01e0aa2b Mon Sep 17 00:00:00 2001
From: Oliver-Rainer Wittmann <orw@apache.org>
Date: Thu, 18 Apr 2013 11:16:00 +0000
Subject: Resolves: #i122026# adjust names of newly introduced UNO commands

correct uno:FlipHorizontal and uno:FlipVertical

(cherry picked from commit 1ea8067f70bb806aa501ea72686a950f1e5ee591)

Conflicts:
	default_images/res/commandimagelist/lc_fliphorizontal.png
	default_images/res/commandimagelist/lc_flipvertical.png
	default_images/res/commandimagelist/lch_fliphorizontal.png
	default_images/res/commandimagelist/lch_flipvertical.png
	default_images/res/commandimagelist/sc_fliphorizontal.png
	default_images/res/commandimagelist/sc_flipvertical.png
	officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
	officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
	officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
	svx/sdi/svx.sdi
	sw/inc/cmdid.h
	sw/source/ui/shells/drawsh.cxx
	sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
	sw/uiconfig/swform/toolbar/graphicobjectbar.xml
	sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
	sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
	sw/uiconfig/swxform/toolbar/graphicobjectbar.xml

Change-Id: I2c646586d592eb1d703c6db07e4c913d858fdc47
---
 .../data/org/openoffice/Office/UI/CalcCommands.xcu     | 10 +++++-----
 .../data/org/openoffice/Office/UI/GenericCommands.xcu  | 18 ++++++++++++------
 .../data/org/openoffice/Office/UI/WriterCommands.xcu   | 18 +++++-------------
 3 files changed, 22 insertions(+), 24 deletions(-)

(limited to 'officecfg')

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 12a12631344a..bb7cdac479ec 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1628,11 +1628,6 @@
           <value xml:lang="en-US">~Filter</value>
         </prop>
       </node>
-      <node oor:name=".uno:SCDialogBorder" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Cell Borders</value>
-        </prop>
-      </node>
       <node oor:name=".uno:SendTo" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Sen~d</value>
@@ -1643,6 +1638,11 @@
           <value xml:lang="en-US">~Protect Document</value>
         </prop>
       </node>
+      <node oor:name=".uno:FormatCellBorders" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Format Cell Borders</value>
+        </prop>
+      </node>
       <node oor:name=".uno:GroupOutlineMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Group and Outline</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index db5e67d3571f..517d601208e1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1611,7 +1611,7 @@
           <value>1</value>
         </prop>
       </node>
-      <node oor:name=".uno:TransAngle" oor:op="replace">
+      <node oor:name=".uno:TransformRotationAngle" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Rotation Angle</value>
         </prop>
@@ -3404,12 +3404,12 @@
           <value>1</value>
         </prop>
       </node>
-      <node oor:name=".uno:TransRotX" oor:op="replace">
+      <node oor:name=".uno:TransformRotationX" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Rotation Pivot Point X</value>
         </prop>
       </node>
-      <node oor:name=".uno:TransRotY" oor:op="replace">
+      <node oor:name=".uno:TransformRotationY" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Rotation Pivot Point Y</value>
         </prop>
@@ -3864,15 +3864,21 @@
           <value xml:lang="en-US">Merge Documen~t...</value>
         </prop>
       </node>
-      <node oor:name=".uno:SvxFlipHorizontal" oor:op="replace">
+      <node oor:name=".uno:FlipHorizontal" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Flip Horizontally</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
-      <node oor:name=".uno:SvxFlipVertical" oor:op="replace">
+      <node oor:name=".uno:FlipVertical" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Flip Vertically</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:SwEditOptions" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -5319,7 +5325,7 @@
           <value>1</value>
         </prop>
       </node>
-      <node oor:name=".uno:FontDialogEff" oor:op="replace">
+      <node oor:name=".uno:FontEffectsDialog" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Character Font Effects...</value>
         </prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 9328758d2d3a..c8dc745e6c05 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -715,14 +715,6 @@
           <value xml:lang="en-US">Select to Page End</value>
         </prop>
       </node>
-      <node oor:name=".uno:FlipHorizontal" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Flip Vertically</value>
-        </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>1</value>
-        </prop>
-      </node>
       <node oor:name=".uno:SendOutlineToClipboard" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Outline to ~Clipboard</value>
@@ -850,6 +842,11 @@
           <value xml:lang="en-US">Page Columns</value>
         </prop>
       </node>
+      <node oor:name=".uno:PageColumnType" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Page Column Type</value>
+        </prop>
+      </node>
       <node oor:name=".uno:BackgroundDialog" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Background</value>
@@ -1482,11 +1479,6 @@
           <value xml:lang="en-US">Backspace</value>
         </prop>
       </node>
-      <node oor:name=".uno:SwPageColumnType" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Page Column Type</value>
-        </prop>
-      </node>
       <node oor:name=".uno:GotoPrevInputField" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">To Previous Input Field</value>
-- 
cgit v1.2.3