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

[Maxim Monastirsky]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   16 ----------
 sw/uiconfig/swriter/menubar/menubar.xml                              |    5 ---
 2 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit 5e5dee3512f5b010b832fcf569d7a3eb60f0f62c
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Aug 9 15:23:16 2015 +0000

    Revert "tdf#91781 Add additional selection options and go to page to menu"
    
    This reverts commit 351c17497e36c5a42fba627043dabaef2e7040eb.
    
    Change-Id: I0f1367dd4ede68183cdb8d0574a4db10997bbe49
    Reviewed-on: https://gerrit.libreoffice.org/17616
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    Tested-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index ab3148e..3ee4ec3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5558,22 +5558,6 @@
         </prop>
       </node>
     </node>
-    <node oor:name=".uno:StatusSelectionModeExt" oor:op="replace">
-      <prop oor:name="Label" oor:type="xs:string">
-        <value xml:lang="en-US">Extended Selection</value>
-      </prop>
-      <prop oor:name="ContextLabel" oor:type="xs:string">
-        <value xml:lang="en-US">Extended</value>
-      </prop>
-    </node>
-    <node oor:name=".uno:StatusSelectionModeExp" oor:op="replace">
-      <prop oor:name="Label" oor:type="xs:string">
-        <value xml:lang="en-US">Adding Selection</value>
-      </prop>
-      <prop oor:name="ContextLabel" oor:type="xs:string">
-        <value xml:lang="en-US">Adding</value>
-      </prop>
-    </node>
     <node oor:name="Popups">
       <node oor:name=".uno:HelpMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 40dbed3..8300196 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -37,9 +37,9 @@
       <menu:menuitem menu:id=".uno:VersionDialog"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Save"/>
-      <menu:menuitem menu:id=".uno:SaveAsRemote"/>
       <menu:menuitem menu:id=".uno:SaveAs"/>
       <menu:menuitem menu:id=".uno:SaveACopy"/>
+      <menu:menuitem menu:id=".uno:SaveAsRemote"/>
       <menu:menuitem menu:id=".uno:SaveAll"/>
       <menu:menuitem menu:id=".uno:CheckOut"/>
       <menu:menuitem menu:id=".uno:CancelCheckOut"/>
@@ -91,8 +91,6 @@
       <menu:menu menu:id=".uno:SelectionModeMenu">
         <menu:menupopup>
           <menu:menuitem menu:id=".uno:SelectionModeDefault" menu:style="radio"/>
-          <menu:menuitem menu:id=".uno:StatusSelectionModeExt" menu:style="radio"/>
-          <menu:menuitem menu:id=".uno:StatusSelectionModeExp" menu:style="radio"/>
           <menu:menuitem menu:id=".uno:SelectionModeBlock" menu:style="radio"/>
         </menu:menupopup>
       </menu:menu>
@@ -101,7 +99,6 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id="vnd.sun.star.findbar:FocusToFindbar"/>
       <menu:menuitem menu:id=".uno:SearchDialog"/>
-      <menu:menuitem menu:id=".uno:GotoPage"/>
       <menu:menuseparator/>
       <menu:menu menu:id=".uno:ChangesMenu">
         <menu:menupopup>