From 232ee4b089154d05ee4f2766cfbe3130e44c5467 Mon Sep 17 00:00:00 2001
From: andreas kainz <kainz.a@gmail.com>
Date: Wed, 28 Nov 2018 17:06:53 +0100
Subject: NB: change macro selection in writer notebookbar

Change-Id: I64d580096783300179ab10ecde270544bc561d54
Reviewed-on: https://gerrit.libreoffice.org/64382
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
(cherry picked from commit 7c2e9a3b56c1607a47521e7803b80d793eaf0f97)
Reviewed-on: https://gerrit.libreoffice.org/64494
---
 sw/uiconfig/swriter/ui/notebookbar.ui | 54 ++++++++++++-----------------------
 1 file changed, 19 insertions(+), 35 deletions(-)

diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index b70e945f68a0..b59212d80a45 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -1543,52 +1543,45 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="MenuTools-MacroOrganizer">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-MacroSignature">
+      <object class="GtkMenuItem" id="MenuTools-MacroRecorder">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroSignature</property>
+        <property name="action_name">.uno:MacroRecorder</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer">
+      <object class="GtkMenuItem" id="MenuTools-RunMacro">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ScriptOrganizer</property>
+        <property name="action_name">.uno:RunMacro</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser">
+      <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:ViewDataSourceBrowser</property>
+        <property name="action_name">.uno:BasicIDEAppear</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuTools-BasicIDEAppear">
+      <object class="GtkMenuItem" id="MenuTools-MacroOrganizer">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:BasicIDEAppear</property>
+        <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuTools-RunMacro">
+      <object class="GtkMenuItem" id="MenuTools-ScriptOrganizer">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:RunMacro</property>
+        <property name="action_name">.uno:ScriptOrganizer</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuTools-MacroRecorder">
+      <object class="GtkMenuItem" id="MenuTools-MacroSignature">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:MacroRecorder</property>
+        <property name="action_name">.uno:MacroSignature</property>
       </object>
     </child>
     <child>
@@ -1631,13 +1624,6 @@
         <property name="action_name">.uno:BibliographyComponent</property>
       </object>
     </child>
-    <child>
-      <object class="GtkMenuItem" id="MenuTools-ChangeDatabaseField">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="action_name">.uno:ChangeDatabaseField</property>
-      </object>
-    </child>
     <child>
       <object class="GtkSeparatorMenuItem" id="MenuTools-separator3">
         <property name="visible">True</property>
@@ -1645,32 +1631,30 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings">
+      <object class="GtkMenuItem" id="MenuTools-ChangeDatabaseField">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:OpenXMLFilterSettings</property>
+        <property name="action_name">.uno:ChangeDatabaseField</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuTools-PackageManagerDialog">
+      <object class="GtkMenuItem" id="MenuTools-ViewDataSourceBrowser">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">service:com.sun.star.deployment.ui.PackageManagerDialog</property>
+        <property name="action_name">.uno:ViewDataSourceBrowser</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuTools-UpdateMenu">
+      <object class="GtkSeparatorMenuItem" id="MenuTools-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
-        <property name="label" translatable="yes" context="WriterNotebookbar|Tools">_Check for Updates...</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuTools-OptionsTreeDialog">
+      <object class="GtkMenuItem" id="MenuTools-OpenXMLFilterSettings">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:OptionsTreeDialog</property>
+        <property name="action_name">.uno:OpenXMLFilterSettings</property>
       </object>
     </child>
   </object>
-- 
cgit v1.2.3