From c909609c28e12c2aba260dc565bd8c82aed28086 Mon Sep 17 00:00:00 2001
From: Yousuf Philips <philipz85@hotmail.com>
Date: Sat, 22 Apr 2017 05:30:15 +0400
Subject: tdf#84837 Comment submenu icon and remove hide/show all comments

Change-Id: Ifa0fd92363a4edc64e312a8b063179ce6ea30dd4
Reviewed-on: https://gerrit.libreoffice.org/36570
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
---
 icon-themes/breeze/links.txt                                      | 1 +
 icon-themes/galaxy/links.txt                                      | 1 +
 icon-themes/tango/links.txt                                       | 1 +
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 5 ++++-
 sc/uiconfig/scalc/menubar/menubar.xml                             | 2 --
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index c73f12acdaa4..7d250e210c53 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -563,6 +563,7 @@ cmd/sc_datapilotmenu.png cmd/sc_datadatapilotrun.png
 cmd/sc_insertrowsmenu.png cmd/sc_insertrows.png
 cmd/sc_insertcolumnsmenu.png cmd/sc_insertcolumns.png
 cmd/sc_functiondialog.png cmd/sc_dbviewfunctions.png
+cmd/sc_sheetcommentmenu.png cmd/sc_showannotations.png
 
 # Shapes
 cmd/lc_basicshapes.png cmd/lc_basicshapes.diamond.png
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 3742652181fa..c6113afc67c7 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -51,6 +51,7 @@ cmd/sc_datapilotmenu.png cmd/sc_datadatapilotrun.png
 cmd/sc_insertrowsmenu.png cmd/sc_insertrows.png
 cmd/sc_insertcolumnsmenu.png cmd/sc_insertcolumns.png
 cmd/sc_functiondialog.png cmd/sc_insertformula.png
+cmd/sc_sheetcommentmenu.png cmd/sc_insertannotation.png
 
 # image/object context menu entries
 cmd/sc_wrapmenu.png cmd/sc_wrapon.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index c855dbc8e50c..5009947fc08a 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -532,6 +532,7 @@ cmd/sc_sortdialog.png cmd/sc_sortascending.png
 cmd/sc_mailmergewizard.png cmd/sc_autoformat.png
 cmd/sc_macrosmenu.png cmd/sc_trackchanges.png
 cmd/sc_showannotations.png cmd/sc_insertannotation.png
+cmd/sc_sheetcommentmenu.png cmd/sc_insertannotation.png
 
 # text background colour Impress/Draw
 cmd/sc_charbackcolor.png cmd/sc_backcolor.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index dc0797652f9f..6c0ebf974d89 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -2081,7 +2081,10 @@
       </node>
       <node oor:name=".uno:SheetCommentMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Cell ~Comment</value>
+          <value xml:lang="en-US">Cell ~Comments</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
         </prop>
       </node>
       <node oor:name=".uno:MergeCellsMenu" oor:op="replace">
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index afb04b77c26b..362c879a08df 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -543,8 +543,6 @@
                     <menu:menuitem menu:id=".uno:EditAnnotation"/>
                     <menu:menuitem menu:id=".uno:HideNote"/>
                     <menu:menuitem menu:id=".uno:ShowNote"/>
-                    <menu:menuitem menu:id=".uno:HideAllNotes"/>
-                    <menu:menuitem menu:id=".uno:ShowAllNotes"/>
                     <menu:menuitem menu:id=".uno:DeleteNote"/>
                     <menu:menuitem menu:id=".uno:DeleteAllNotes"/>
                 </menu:menupopup>
-- 
cgit v1.2.3