[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - chart2/uiconfig officecfg/registry sd/uiconfig starmath/uiconfig sw/uiconfig

andreas kainz kainz.a at gmail.com
Tue Jul 10 06:37:47 UTC 2018


 chart2/uiconfig/menubar/menubar.xml                                  |    2 --
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |    5 -----
 sd/uiconfig/sdraw/menubar/menubar.xml                                |    1 -
 sd/uiconfig/simpress/menubar/menubar.xml                             |    1 -
 starmath/uiconfig/smath/menubar/menubar.xml                          |    1 -
 sw/uiconfig/sglobal/menubar/menubar.xml                              |    1 -
 sw/uiconfig/sweb/menubar/menubar.xml                                 |    1 -
 sw/uiconfig/swform/menubar/menubar.xml                               |    1 -
 sw/uiconfig/swreport/menubar/menubar.xml                             |    1 -
 sw/uiconfig/swriter/menubar/menubar.xml                              |    1 -
 sw/uiconfig/swxform/menubar/menubar.xml                              |    1 -
 11 files changed, 16 deletions(-)

New commits:
commit 501bb68bbeee19e39e62947a479e273f9a85e6bd
Author: andreas kainz <kainz.a at gmail.com>
Date:   Mon Jul 9 15:39:33 2018 +0200

    tdf#118314 menubar: remove ShowImeStatusWindow in menubars
    
    Function isn't available any more. codebase has to be cleanded up
    
    Change-Id: I42597cde5b5d2472f670552f49776775d5bf391e
    Reviewed-on: https://gerrit.libreoffice.org/57185
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml
index f7b5047e4700..65cef6328d37 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -46,8 +46,6 @@
             <menu:menuitem menu:id=".uno:AvailableToolbars"/>
             <menu:menuitem menu:id=".uno:StatusBarVisible"/>
             <menu:menuseparator/>
-            <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
-            <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:Sidebar"/>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:DiagramData"/>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index aaeeaec9ecbb..9bb38f44eb09 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -4983,11 +4983,6 @@
           <value xml:lang="en-US">~Function Bar</value>
         </prop>
       </node>
-      <node oor:name=".uno:ShowImeStatusWindow" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Input M~ethod Status</value>
-        </prop>
-      </node>
       <node oor:name=".uno:OptionBarVisible" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Optio~n Bar</value>
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index c6f347807c58..95c302c57273 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -132,7 +132,6 @@
         </menu:menupopup>
       </menu:menu>
       <menu:menuitem menu:id=".uno:ShowAnnotations"/>
-      <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Sidebar"/>
       <menu:menuitem menu:id=".uno:ViewSidebarStyles"/>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index a6d39c4c3020..84e264c58cb6 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -143,7 +143,6 @@
                 </menu:menupopup>
             </menu:menu>
             <menu:menuitem menu:id=".uno:ShowAnnotations"/>
-            <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:Sidebar"/>
             <menu:menuitem menu:id=".uno:ModifyPage"/>
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml
index dfd419a8e8b4..35529de1f77d 100644
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -87,7 +87,6 @@
       <menu:menuitem menu:id=".uno:AvailableToolbars"/>
       <menu:menuitem menu:id=".uno:StatusBarVisible"/>
       <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
       <menu:menuitem menu:id=".uno:ElementsDockingWindow"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:FullScreen"/>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index b745aeaa7989..59776bb1bf80 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -202,7 +202,6 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Marks"/>
       <menu:menuitem menu:id=".uno:Fieldnames"/>
-      <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Sidebar"/>
       <menu:menuitem menu:id=".uno:ViewSidebarStyles"/>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index a7d80cfe3b1d..f41d3666c7c0 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -125,7 +125,6 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:AvailableToolbars"/>
       <menu:menuitem menu:id=".uno:StatusBarVisible"/>
-      <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
       <menu:menuitem menu:id=".uno:Ruler"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ShowAnnotations"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 6e43ecf9876a..a9185d853626 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -145,7 +145,6 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:AvailableToolbars"/>
       <menu:menuitem menu:id=".uno:StatusBarVisible"/>
-      <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
       <menu:menuitem menu:id=".uno:Ruler"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ViewBounds"/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index abfc3c126997..47ea1bfd73ff 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -145,7 +145,6 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:AvailableToolbars"/>
       <menu:menuitem menu:id=".uno:StatusBarVisible"/>
-      <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
       <menu:menuitem menu:id=".uno:Ruler"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ViewBounds"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 7dd3f046371a..9cd34bea88d7 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -202,7 +202,6 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Marks"/>
       <menu:menuitem menu:id=".uno:Fieldnames"/>
-      <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Sidebar"/>
       <menu:menuitem menu:id=".uno:ViewSidebarStyles"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 4e5d822dcd08..b5157799d302 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -202,7 +202,6 @@
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Marks"/>
       <menu:menuitem menu:id=".uno:Fieldnames"/>
-      <menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Sidebar"/>
       <menu:menuitem menu:id=".uno:ViewSidebarStyles"/>


More information about the Libreoffice-commits mailing list