[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sw/uiconfig

[Yousuf Philips]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |    5 +++++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |    5 -----
 sc/uiconfig/scalc/menubar/menubar.xml                                |    3 ++-
 sc/uiconfig/scalc/popupmenu/cell.xml                                 |    6 ++++--
 sw/uiconfig/sglobal/menubar/menubar.xml                              |    2 +-
 sw/uiconfig/swriter/menubar/menubar.xml                              |    2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit b2f79f363c02738bf9d3b4e7b2834214b8a52c96
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Wed Nov 22 17:56:53 2017 +0400

    tdf#50746 add paste unformatted to menu and context menu
    
    also unified menus and context menus in writer and calc
    
    Change-Id: I929df7a0fe2be7b8bf58cf048e53536ea89d5c9c
    Reviewed-on: https://gerrit.libreoffice.org/45095
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 6b755820bb41..791ebefce51b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6036,6 +6036,11 @@
       </node>
     </node>
     <node oor:name="Popups">
+      <node oor:name=".uno:PasteSpecialMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Paste ~Special</value>
+        </prop>
+      </node>
       <node oor:name=".uno:StyleMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">St~yle</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 5b3c5ed09ae9..fb87ee73b526 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2635,11 +2635,6 @@
       </node>
     </node>
     <node oor:name="Popups">
-      <node oor:name=".uno:PasteSpecialMenu" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Paste ~Special</value>
-        </prop>
-      </node>
       <node oor:name=".uno:TableMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">T~able</value>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 812903a8de48..0a4136d3c242 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -84,7 +84,7 @@
             <menu:menuitem menu:id=".uno:Cut"/>
             <menu:menuitem menu:id=".uno:Copy"/>
             <menu:menuitem menu:id=".uno:Paste"/>
-            <menu:menuitem menu:id=".uno:PasteSpecial"/>
+            <menu:menuitem menu:id=".uno:PasteUnformatted"/>
             <menu:menu menu:id=".uno:PasteOnly">
                 <menu:menupopup>
                     <menu:menuitem menu:id=".uno:PasteOnlyText"/>
@@ -92,6 +92,7 @@
                     <menu:menuitem menu:id=".uno:PasteOnlyFormula"/>
                 </menu:menupopup>
             </menu:menu>
+            <menu:menuitem menu:id=".uno:PasteSpecial"/>
             <menu:menuitem menu:id=".uno:SelectAll"/>
             <menu:menu menu:id=".uno:EditSelectMenu">
                 <menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/cell.xml b/sc/uiconfig/scalc/popupmenu/cell.xml
index 57ecd2864069..7412caf636ff 100644
--- a/sc/uiconfig/scalc/popupmenu/cell.xml
+++ b/sc/uiconfig/scalc/popupmenu/cell.xml
@@ -11,12 +11,14 @@
   <menu:menuitem menu:id=".uno:Cut"/>
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
-  <menu:menuitem menu:id=".uno:PasteSpecial"/>
-  <menu:menu menu:id=".uno:PasteOnly">
+  <menu:menu menu:id=".uno:PasteSpecialMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:PasteOnlyText"/>
       <menu:menuitem menu:id=".uno:PasteOnlyValue"/>
       <menu:menuitem menu:id=".uno:PasteOnlyFormula"/>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
     </menu:menupopup>
   </menu:menu>
   <menu:menuseparator/>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index e492f604017c..19b9c3fabbaf 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -93,8 +93,8 @@
       <menu:menuitem menu:id=".uno:Cut"/>
       <menu:menuitem menu:id=".uno:Copy"/>
       <menu:menuitem menu:id=".uno:Paste"/>
-      <menu:menuitem menu:id=".uno:PasteSpecial"/>
       <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
       <menu:menuitem menu:id=".uno:SelectAll"/>
       <menu:menu menu:id=".uno:SelectionModeMenu">
         <menu:menupopup>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index b5ba20d1f96d..1f7366733f59 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -93,8 +93,8 @@
       <menu:menuitem menu:id=".uno:Cut"/>
       <menu:menuitem menu:id=".uno:Copy"/>
       <menu:menuitem menu:id=".uno:Paste"/>
-      <menu:menuitem menu:id=".uno:PasteSpecial"/>
       <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
       <menu:menuitem menu:id=".uno:SelectAll"/>
       <menu:menu menu:id=".uno:SelectionModeMenu">
         <menu:menupopup>