sc/uiconfig/scalc/popupmenu/graphic.xml    |    5 -
 sc/uiconfig/scalc/ui/notebookbar.ui        |  115 ++++++++++++++++++-----------
 sd/uiconfig/sdraw/popupmenu/graphic.xml    |    3 
 sd/uiconfig/sdraw/ui/notebookbar.ui        |   69 ++++++++++++-----
 sd/uiconfig/simpress/popupmenu/graphic.xml |   11 +-
 sd/uiconfig/simpress/ui/notebookbar.ui     |   69 ++++++++++++-----
 sw/uiconfig/swriter/ui/notebookbar.ui      |   48 ++++++++++--
 7 files changed, 224 insertions(+), 96 deletions(-)

New commits:
commit ca341bbe44169135958d7a0b28feaed7d1aa11d3
Author:     andreas kainz <kain...@gmail.com>
AuthorDate: Thu Oct 18 15:13:24 2018 +0200
Commit:     andreas_kainz <kain...@gmail.com>
CommitDate: Thu Oct 18 21:15:26 2018 +0200

    Sync Image/Graphic Tabb and context menu
    
    NB: sync MenuImage in tabbed toolbar
    context menu: sync graphic.xml context menu
    
    in writer, calc, impress and draw
    
    Change-Id: Idab90ae9af7ac68815fe689811d6c11f948063ca
    Reviewed-on: https://gerrit.libreoffice.org/61938
    Reviewed-by: andreas_kainz <kain...@gmail.com>
    Tested-by: andreas_kainz <kain...@gmail.com>

diff --git a/sc/uiconfig/scalc/popupmenu/graphic.xml 
b/sc/uiconfig/scalc/popupmenu/graphic.xml
index e37109fdb963..b769a614848a 100644
--- a/sc/uiconfig/scalc/popupmenu/graphic.xml
+++ b/sc/uiconfig/scalc/popupmenu/graphic.xml
@@ -59,10 +59,11 @@
   <menu:menuitem menu:id=".uno:EnterGroup"/>
   <menu:menuitem menu:id=".uno:LeaveGroup"/>
   <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:RenameObject"/>
   <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
-  <menu:menuitem menu:id=".uno:NameGroup"/>
-  <menu:menuitem menu:id=".uno:AssignMacro"/>
+  <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:EditShapeHyperlink"/>
   <menu:menuitem menu:id=".uno:DeleteShapeHyperlink"/>
   <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
+  <menu:menuitem menu:id=".uno:AssignMacro"/>
 </menu:menupopup>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 418cb46f549c..ee8e119ccda2 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -483,163 +483,163 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="AddDirectD">
+      <object class="GtkMenuItem" id="MenuFile-AddDirect">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:AddDirect</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="RecentFileListD">
+      <object class="GtkMenuItem" id="MenuFile-RecentFileList">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:RecentFileList</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="CloseDocD">
+      <object class="GtkMenuItem" id="MenuFile-CloseDoc">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:CloseDoc</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator39">
+      <object class="GtkSeparatorMenuItem" id="MenuFile-separator">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SaveD">
+      <object class="GtkMenuItem" id="MenuFile-Save">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Save</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SaveAsD">
+      <object class="GtkMenuItem" id="MenuFile-SaveAs">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SaveAs</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SaveAsRemoteD">
+      <object class="GtkMenuItem" id="MenuFile-SaveAsRemote">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SaveAsRemote</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="NewGlobalDocD">
+      <object class="GtkMenuItem" id="MenuFile-NewGlobalDoc">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:NewGlobalDoc</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator61">
+      <object class="GtkSeparatorMenuItem" id="MenuFile-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExportToD">
+      <object class="GtkMenuItem" id="MenuFile-ExportTo">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExportTo</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExportToPDFD">
+      <object class="GtkMenuItem" id="MenuFile-ExportToPDF">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExportToPDF</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExportToEPUBD">
+      <object class="GtkMenuItem" id="MenuFile-ExportToEPUB">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExportToEPUB</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator44">
+      <object class="GtkSeparatorMenuItem" id="MenuFile-separator2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendMailD">
+      <object class="GtkMenuItem" id="MenuFile-SendMail">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SendMail</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendMailDocAsPDFD">
+      <object class="GtkMenuItem" id="MenuFile-SendMailDocAsPDF">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SendMailDocAsPDF</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendViaBluetoothD">
+      <object class="GtkMenuItem" id="MenuFile-SendViaBluetooth">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SendViaBluetooth</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator48">
+      <object class="GtkSeparatorMenuItem" id="MenuFile-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PrintPreviewD">
+      <object class="GtkMenuItem" id="MenuFile-PrintPreview">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:PrintPreview</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PrintDefaultD">
+      <object class="GtkMenuItem" id="MenuFile-PrintDefault">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:PrintDefault</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="PrinterSetupD">
+      <object class="GtkMenuItem" id="MenuFile-PrinterSetup">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:PrinterSetup</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator50">
+      <object class="GtkSeparatorMenuItem" id="MenuFile-separator4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SignatureD">
+      <object class="GtkMenuItem" id="MenuFile-Signature">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Signature</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SignPDFD">
+      <object class="GtkMenuItem" id="MenuFile-SignPDF">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SignPDF</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SetDocumentPropertiesD">
+      <object class="GtkMenuItem" id="MenuFile-SetDocumentProperties">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SetDocumentProperties</property>
@@ -652,7 +652,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="QuitD">
+      <object class="GtkMenuItem" id="MenuFile-Quit">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Quit</property>
@@ -663,89 +663,107 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="HelpIndexD">
+      <object class="GtkMenuItem" id="MenuHelp-HelpIndex">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:HelpIndex</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExtendedHelpD">
+      <object class="GtkMenuItem" id="MenuHelp-ExtendedHelp">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtendedHelp</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DocumentationD">
+      <object class="GtkMenuItem" id="MenuHelp-Documentation">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Documentation</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator72">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="QuestionAnswersD1">
+      <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:QuestionAnswers</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendFeedbackD1">
+      <object class="GtkMenuItem" id="MenuHelp-SendFeedback">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SendFeedback</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DonationD1">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Donation</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator94">
+      <object class="GtkMenuItem" id="MenuHelp-SafeMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:SafeMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SafeModeD1">
+      <object class="GtkMenuItem" id="MenuHelp-GetInvolved">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SafeMode</property>
+        <property name="action_name">.uno:GetInvolved</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="UpdateMenuD">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator2">
         <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="CalcNotebookbar|Help">_Check for Updates...</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator100">
+      <object class="GtkMenuItem" id="MenuHelp-Donation">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:Donation</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowLicenseD1">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuHelp-ShowLicense">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowLicense</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AboutD">
+      <object class="GtkMenuItem" id="MenuHelp-UpdateMenu">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property 
name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuHelp-About">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:About</property>
@@ -999,6 +1017,13 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="MenuImage-TransformDialog">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:TransformDialog</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="MenuImage-ImageMapDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -1026,6 +1051,12 @@
       </object>
     </child>
     <child>
+      <object class="GtkSeparatorMenuItem" id="separator39">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="MenuImage-AssignMacro">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
diff --git a/sd/uiconfig/sdraw/popupmenu/graphic.xml 
b/sd/uiconfig/sdraw/popupmenu/graphic.xml
index 95171630443a..9107d5888f6b 100644
--- a/sd/uiconfig/sdraw/popupmenu/graphic.xml
+++ b/sd/uiconfig/sdraw/popupmenu/graphic.xml
@@ -70,7 +70,8 @@
   <menu:menuitem menu:id=".uno:EnterGroup"/>
   <menu:menuitem menu:id=".uno:LeaveGroup"/>
   <menu:menuseparator/>
-  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
   <menu:menuitem menu:id=".uno:NameGroup"/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:EditStyle"/>
 </menu:menupopup>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index fb90567bf803..f7f8afcdd81e 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -496,89 +496,107 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="HelpIndexD">
+      <object class="GtkMenuItem" id="MenuHelp-HelpIndex">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:HelpIndex</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExtendedHelpD">
+      <object class="GtkMenuItem" id="MenuHelp-ExtendedHelp">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtendedHelp</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DocumentationD">
+      <object class="GtkMenuItem" id="MenuHelp-Documentation">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Documentation</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator94">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="QuestionAnswersD1">
+      <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:QuestionAnswers</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendFeedbackD1">
+      <object class="GtkMenuItem" id="MenuHelp-SendFeedback">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SendFeedback</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DonationD1">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Donation</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator100">
+      <object class="GtkMenuItem" id="MenuHelp-SafeMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:SafeMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SafeModeD1">
+      <object class="GtkMenuItem" id="MenuHelp-GetInvolved">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SafeMode</property>
+        <property name="action_name">.uno:GetInvolved</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="UpdateMenuD">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator2">
         <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="drawnotebookbar|Help">_Check for Updates...</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator113">
+      <object class="GtkMenuItem" id="MenuHelp-Donation">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Donation</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowLicenseD1">
+      <object class="GtkMenuItem" id="MenuHelp-ShowLicense">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowLicense</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AboutD">
+      <object class="GtkMenuItem" id="MenuHelp-UpdateMenu">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property 
name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuHelp-About">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:About</property>
@@ -844,6 +862,13 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="MenuImage-OriginalSize">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:OriginalSize</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="MenuImage-ImageMapDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -871,10 +896,16 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuImage-GraphicDialog">
+      <object class="GtkSeparatorMenuItem" id="separator35">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuImage-AnimationEffects">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:GraphicDialog</property>
+        <property name="action_name">.uno:AnimationEffects</property>
       </object>
     </child>
   </object>
diff --git a/sd/uiconfig/simpress/popupmenu/graphic.xml 
b/sd/uiconfig/simpress/popupmenu/graphic.xml
index 7189be930ad9..112ddab678e6 100644
--- a/sd/uiconfig/simpress/popupmenu/graphic.xml
+++ b/sd/uiconfig/simpress/popupmenu/graphic.xml
@@ -65,13 +65,14 @@
       <menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
     </menu:menupopup>
   </menu:menu>
-      <menu:menuitem menu:id=".uno:FormatGroup"/>
-      <menu:menuitem menu:id=".uno:FormatUngroup"/>
-      <menu:menuitem menu:id=".uno:EnterGroup"/>
-      <menu:menuitem menu:id=".uno:LeaveGroup"/>
+  <menu:menuitem menu:id=".uno:FormatGroup"/>
+  <menu:menuitem menu:id=".uno:FormatUngroup"/>
+  <menu:menuitem menu:id=".uno:EnterGroup"/>
+  <menu:menuitem menu:id=".uno:LeaveGroup"/>
   <menu:menuseparator/>
-  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
   <menu:menuitem menu:id=".uno:NameGroup"/>
+  <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+  <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:AnimationEffects"/>
   <menu:menuitem menu:id=".uno:EditStyle"/>
 </menu:menupopup>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui 
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 33f3df379ddb..f4c47622ca8f 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -496,89 +496,107 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="HelpIndexD">
+      <object class="GtkMenuItem" id="MenuHelp-HelpIndex">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:HelpIndex</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ExtendedHelpD">
+      <object class="GtkMenuItem" id="MenuHelp-ExtendedHelp">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ExtendedHelp</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DocumentationD">
+      <object class="GtkMenuItem" id="MenuHelp-Documentation">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:Documentation</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator94">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="QuestionAnswersD1">
+      <object class="GtkMenuItem" id="MenuHelp-QuestionAnswers">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:QuestionAnswers</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SendFeedbackD1">
+      <object class="GtkMenuItem" id="MenuHelp-SendFeedback">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:SendFeedback</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="DonationD1">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Donation</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator100">
+      <object class="GtkMenuItem" id="MenuHelp-SafeMode">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="action_name">.uno:SafeMode</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="SafeModeD1">
+      <object class="GtkMenuItem" id="MenuHelp-GetInvolved">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SafeMode</property>
+        <property name="action_name">.uno:GetInvolved</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="UpdateMenuD">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator2">
         <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="impressnotebookbar|Help">_Check for Updates...</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator113">
+      <object class="GtkMenuItem" id="MenuHelp-Donation">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:Donation</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="ShowLicenseD1">
+      <object class="GtkMenuItem" id="MenuHelp-ShowLicense">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:ShowLicense</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="AboutD">
+      <object class="GtkMenuItem" id="MenuHelp-UpdateMenu">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property 
name="action_name">vnd.sun.star.job:alias=UpdateCheck</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuHelp-About">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="action_name">.uno:About</property>
@@ -844,6 +862,13 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="MenuImage-OriginalSize">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:OriginalSize</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="MenuImage-ImageMapDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -871,10 +896,16 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuImage-GraphicDialog">
+      <object class="GtkSeparatorMenuItem" id="separator10">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuImage-AnimationEffects">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:GraphicDialog</property>
+        <property name="action_name">.uno:AnimationEffects</property>
       </object>
     </child>
   </object>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui 
b/sw/uiconfig/swriter/ui/notebookbar.ui
index c6ba52eb73d3..c5fe3f23f665 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -411,10 +411,16 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuHelp-Donation">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:Donation</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="MenuHelp-SafeMode">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:SafeMode</property>
       </object>
     </child>
     <child>
@@ -424,22 +430,21 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuHelp-SafeMode">
+      <object class="GtkMenuItem" id="MenuHelp-GetInvolved">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="action_name">.uno:SafeMode</property>
+        <property name="action_name">.uno:GetInvolved</property>
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="MenuHelp-UpdateMenu">
+      <object class="GtkMenuItem" id="MenuHelp-Donation">
         <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|Help">_Check for Updates...</property>
+        <property name="action_name">.uno:Donation</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separator">
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -452,6 +457,20 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="MenuHelp-UpdateMenu">
+        <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|Help">_Check for Updates...</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="MenuHelp-separator4">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="MenuHelp-About">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -753,6 +772,13 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="MenuImage-FormatArea">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="action_name">.uno:FormatArea</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="MenuImage-ImageMapDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -780,6 +806,12 @@
       </object>
     </child>
     <child>
+      <object class="GtkSeparatorMenuItem" id="separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
       <object class="GtkMenuItem" id="MenuImage-GraphicDialog">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to