tdf#155876 UI cmds Calc-Sheet menu (33)

+ Sheet menu for Calc: manage Comments submenu
+ untangle Calc comments from Writer
+ refactoring

Change-Id: I22b8e79b96d72b8918da04bc802cdd29c5d9dba0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160958
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit afcd5a5df56c3d4ad3b265572ff1a343c4e4ba18)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160936

10 files changed, 329 insertions, 63 deletions

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 8b630a5e2f..968c68ce67 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -189,6 +189,8 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/data_provider \
     helpcontent2/source/text/scalc/01/databar_more_options \
     helpcontent2/source/text/scalc/01/default_number_formats \
+    helpcontent2/source/text/scalc/01/DeleteNote \
+    helpcontent2/source/text/scalc/01/DeleteAllNotes \
     helpcontent2/source/text/scalc/01/duplicate_sheet \
     helpcontent2/source/text/scalc/01/EditSelectMenu \
     helpcontent2/source/text/scalc/01/events_sheet \
@@ -285,6 +287,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/func_workday \
     helpcontent2/source/text/scalc/01/func_year \
     helpcontent2/source/text/scalc/01/func_yearfrac \
+    helpcontent2/source/text/scalc/01/HideNote \
     helpcontent2/source/text/scalc/01/hide_sheet \
     helpcontent2/source/text/scalc/01/InsertCurrentDate \
     helpcontent2/source/text/scalc/01/InsertCurrentTime \
@@ -300,7 +303,9 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
     helpcontent2/source/text/scalc/01/SelectRow \
     helpcontent2/source/text/scalc/01/SetInputMode \
     helpcontent2/source/text/scalc/01/shared_spreadsheet \
+    helpcontent2/source/text/scalc/01/SheetCommentMenu \
     helpcontent2/source/text/scalc/01/sheet_tab_color \
+    helpcontent2/source/text/scalc/01/ShowNote \
     helpcontent2/source/text/scalc/01/solver \
     helpcontent2/source/text/scalc/01/solver_options \
     helpcontent2/source/text/scalc/01/solver_options_algo \
diff --git a/source/text/scalc/00/sheet_menu.xhp b/source/text/scalc/00/sheet_menu.xhp
index ca278f7fbf..7cd27e75cc 100644
--- a/source/text/scalc/00/sheet_menu.xhp
+++ b/source/text/scalc/00/sheet_menu.xhp
@@ -362,10 +362,84 @@
   <paragraph role="paragraph" id="par_id221702167401368">On the <menuitem>Layout</menuitem> menu of the <menuitem>Layout</menuitem> tab, choose <menuitem>Column Break</menuitem>.</paragraph>
 </section>
 
+<section id="cell_comment_menu">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id511702935011731">Choose <menuitem>Sheet - Cell Comments</menuitem>.</paragraph>
+</section>
+
 <paragraph role="paragraph" id="par_id281631903136031"><variable id="edit_comment">Choose <menuitem>Sheet - Cell Comments - Edit Comment</menuitem></variable></paragraph>
-<paragraph role="paragraph" id="par_id641631903140705"><variable id="hide_comment">Choose <menuitem>Sheet - Cell Comments - Hide Comment</menuitem></variable></paragraph>
-<paragraph role="paragraph" id="par_id611631903144777"><variable id="show_comment">Choose <menuitem>Sheet - Cell Comments - Show Comment</menuitem></variable></paragraph>
-<paragraph role="paragraph" id="par_id961631903149304"><variable id="delete_comment">Choose <menuitem>Sheet - Cell Comments - Delete Comment</menuitem></variable></paragraph>
-<paragraph role="paragraph" id="par_id471631903160977"><variable id="delete_all_comments">Choose <menuitem>Sheet - Cell Comments - Delete All Comments</menuitem></variable></paragraph>
+
+<section id="hide_comment">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id641631903140705">Choose <menuitem>Sheet - Cell Comments - Hide Comment</menuitem></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_context"/>
+  <paragraph role="paragraph" id="par_id591702936735244">Choose <menuitem>Hide Comment</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <table id="tab_id811702937087574">
+    <tablerow>
+      <tablecell>
+        <paragraph id="par_id311702937087575" role="paragraph"><image src="cmd/lc_hidenote.svg" id="img_id591702937087576" width="1cm" height="1cm"><alt id="alt_id441702937087577">Icon Hide Comment</alt></image></paragraph>
+      </tablecell>
+      <tablecell>
+        <paragraph id="par_id161702937087579" role="paragraph">Hide Comment</paragraph>
+      </tablecell>
+    </tablerow>
+  </table>
+</section>
+<section id="show_comment">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id611631903144777">Choose <menuitem>Sheet - Cell Comments - Show Comment</menuitem></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_context"/>
+  <paragraph role="paragraph" id="par_id711702938268509">Choose <menuitem>Show Comment</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <table id="tab_id81702938290459">
+    <tablerow>
+      <tablecell>
+        <paragraph id="par_id161702938290460" role="paragraph"><image src="cmd/lc_shownote.svg" id="img_id21702938290461" width="1cm" height="1cm"><alt id="alt_id91702938290462">Icon Show Comment</alt></image></paragraph>
+      </tablecell>
+      <tablecell>
+        <paragraph id="par_id841702938290463" role="paragraph">Show Comment</paragraph>
+      </tablecell>
+    </tablerow>
+  </table>
+</section>
+
+<section id="delete_comment">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id961631903149304">Choose <menuitem>Sheet - Cell Comments - Delete Comment</menuitem></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_context"/>
+  <paragraph role="paragraph" id="par_id181702947009943">Choose <menuitem>Delete Comment</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id381702947173325">Choose <menuitem>Review - Delete Comment</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <table id="tab_id451702947038210">
+    <tablerow>
+      <tablecell>
+        <paragraph id="par_id961702947038211" role="paragraph"><image src="cmd/lc_deleteannotation.svg" id="img_id361702947038212" width="1cm"  height="1cm"><alt id="alt_id681702947038213">Icon Delete Comment</alt></image></paragraph>
+      </tablecell>
+      <tablecell>
+        <paragraph id="par_id221702947038214" role="paragraph">Delete Comment</paragraph>
+      </tablecell>
+    </tablerow>
+  </table>
+</section>
+
+<section id="delete_all_comments">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id471631903160977">Choose <menuitem>Sheet - Cell Comments - Delete All Comments</menuitem></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id201702947317948">Choose <menuitem>Review - Delete All Comments</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <table id="tab_id291702947343457">
+    <tablerow>
+      <tablecell>
+        <paragraph id="par_id371702947343458" role="paragraph"><image src="cmd/lc_deleteallannotation.svg" id="img_id221702947343459" width="1cm" height="1cm"><alt id="alt_id941702947343460">Icon Delete All Comments</alt></image></paragraph>
+      </tablecell>
+      <tablecell>
+        <paragraph id="par_id31702947343462" role="paragraph">Delete All Comments</paragraph>
+      </tablecell>
+    </tablerow>
+  </table>
+</section>
 </body>
 </helpdocument>
diff --git a/source/text/scalc/01/DeleteAllNotes.xhp b/source/text/scalc/01/DeleteAllNotes.xhp
new file mode 100644
index 0000000000..9285224807
--- /dev/null
+++ b/source/text/scalc/01/DeleteAllNotes.xhp
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+    <!--
+    * This file is part of the LibreOffice project.
+    *
+    * This Source Code Form is subject to the terms of the Mozilla Public
+    * License, v. 2.0. If a copy of the MPL was not distributed with this
+    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    *
+    -->
+
+    <meta>
+        <topic id="textscalc01DeleteAllNotesxhp" indexer="include" status="PUBLISH">
+            <title id="tit">Delete All Comments</title>
+            <filename>/text/scalc/01/DeleteAllNotes.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+
+<bookmark branch="hid/.uno:DeleteAllNotes" id="bm_id841702947646882" localize="false"/>
+    <section id="delete_all_notes">
+        <h1 id="hd_id361702947725743"><variable id="h1"><link href="text/scalc/01/DeleteAllNotes.xhp">Delete All Comments</link></variable></h1>
+        <paragraph id="par_id731702947725744" role="paragraph">Deletes all cell notes of the current sheet.</paragraph>
+    </section>
+    <section id="howtoget">
+        <embed href="text/scalc/00/sheet_menu.xhp#delete_all_comments"/>
+    </section>
+        <section id="relatedtopics">
+        <paragraph role="paragraph" id="par_id321702948452216" localize="false"><embedvar href="text/scalc/01/SheetCommentMenu.xhp#h1" markup="ignore"/></paragraph>
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/scalc/01/DeleteNote.xhp b/source/text/scalc/01/DeleteNote.xhp
new file mode 100644
index 0000000000..979de1d3e5
--- /dev/null
+++ b/source/text/scalc/01/DeleteNote.xhp
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+    <!--
+    * This file is part of the LibreOffice project.
+    *
+    * This Source Code Form is subject to the terms of the Mozilla Public
+    * License, v. 2.0. If a copy of the MPL was not distributed with this
+    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    *
+    -->
+
+    <meta>
+        <topic id="textscalc01DeleteNotexhp" indexer="include" status="PUBLISH">
+            <title id="tit">Delete Comment</title>
+            <filename>/text/scalc/01/DeleteNote.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+
+<bookmark branch="hid/.uno:DeleteNote" id="bm_id921702946751041" localize="false"/>
+    <section id="delete_note">
+        <h1 id="hd_id801702946820149"><variable id="h1"><link href="text/scalc/01/DeleteNote.xhp">Delete Comment</link></variable></h1>
+        <paragraph id="par_id501702946820151" role="paragraph">Deletes the comment of the cell.</paragraph>
+    </section>
+    <section id="howtoget">
+        <embed href="text/scalc/00/sheet_menu.xhp#delete_comment"/>
+    </section>
+    <section id="relatedtopics">
+        <paragraph role="paragraph" id="par_id321702948452216" localize="false"><embedvar href="text/scalc/01/SheetCommentMenu.xhp#h1" markup="ignore"/></paragraph>
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/scalc/01/HideNote.xhp b/source/text/scalc/01/HideNote.xhp
new file mode 100644
index 0000000000..2449b9e34c
--- /dev/null
+++ b/source/text/scalc/01/HideNote.xhp
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+    <!--
+    * This file is part of the LibreOffice project.
+    *
+    * This Source Code Form is subject to the terms of the Mozilla Public
+    * License, v. 2.0. If a copy of the MPL was not distributed with this
+    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    *
+    -->
+
+    <meta>
+        <topic id="text/scalc/01/HideNote.xhp" indexer="include" status="PUBLISH">
+            <title id="tit">Hide Comment</title>
+            <filename>/text/scalc/01/HideNote.xhp</filename>
+        </topic>
+    </meta>
+<body>
+    <bookmark branch="hid/.uno:HideNote" id="bm_id571702936274627" localize="false"/>
+    <section id="hide_note">
+        <h1 id="hd_id531702936339053"><variable id="h1"><link href="text/scalc/01/HideNote.xhp">Hide Comment</link></variable></h1>
+        <paragraph id="par_id921702936339055" role="paragraph">Hides the comment of the cell.</paragraph>
+    </section>
+    <section id="howtoget">
+        <embed href="text/scalc/00/sheet_menu.xhp#hide_comment"/>
+    </section>
+    <section id="relatedtopics">
+        <paragraph role="paragraph" id="par_id321702948452216" localize="false"><embedvar href="text/scalc/01/SheetCommentMenu.xhp#h1" markup="ignore"/></paragraph>
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/scalc/01/SheetCommentMenu.xhp b/source/text/scalc/01/SheetCommentMenu.xhp
new file mode 100644
index 0000000000..51892e3aa1
--- /dev/null
+++ b/source/text/scalc/01/SheetCommentMenu.xhp
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+    <!--
+    * This file is part of the LibreOffice project.
+    *
+    * This Source Code Form is subject to the terms of the Mozilla Public
+    * License, v. 2.0. If a copy of the MPL was not distributed with this
+    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    *
+    -->
+
+    <meta>
+        <topic id="textscalc01SheetCommentMenuxhp" indexer="include" status="PUBLISH">
+            <title id="tit">Comment Menu</title>
+            <filename>/text/scalc/01/SheetCommentMenu.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+<bookmark branch="hid/.uno:SheetCommentMenu" id="bm_id321702927094846" localize="false"/>
+    <section id="comment_menu">
+        <h1 id="hd_id481702927167722"><variable id="h1"><link href="text/scalc/01/SheetCommentMenu.xhp">Sheet Comment Menu</link></variable></h1>
+        <paragraph id="par_id271702927167724" role="paragraph">Opens a submenu with comments commands.</paragraph>
+    </section>
+    <section id="howtoget">
+        <embed href="text/scalc/00/sheet_menu.xhp#cell_comment_menu"/>
+    </section>
+    <embed href="text/shared/01/04050000.xhp#comment"/>
+    <embed href="text/scalc/01/ShowNote.xhp#show_note"/>
+    <embed href="text/scalc/01/HideNote.xhp#hide_note"/>
+    <embed href="text/scalc/01/DeleteNote.xhp#delete_note"/>
+    <embed href="text/scalc/01/DeleteAllNotes.xhp#delete_all_notes"/>
+</body>
+</helpdocument>
+
diff --git a/source/text/scalc/01/ShowNote.xhp b/source/text/scalc/01/ShowNote.xhp
new file mode 100644
index 0000000000..91e02f0fa4
--- /dev/null
+++ b/source/text/scalc/01/ShowNote.xhp
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+    <!--
+    * This file is part of the LibreOffice project.
+    *
+    * This Source Code Form is subject to the terms of the Mozilla Public
+    * License, v. 2.0. If a copy of the MPL was not distributed with this
+    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    *
+    -->
+
+    <meta>
+        <topic id="textscalc01ShowNotexhp" indexer="include" status="PUBLISH">
+            <title id="tit">Show Comment</title>
+            <filename>/text/scalc/01/ShowNote.xhp</filename>
+        </topic>
+    </meta>
+<body>
+    <bookmark branch="hid/.uno:ShowNote" id="bm_id571702936274627" localize="false"/>
+    <section id="show_note">
+        <h1 id="hd_id531702936339053"><variable id="h1"><link href="text/scalc/01/ShowNote.xhp">Show  Comment</link></variable></h1>
+        <paragraph id="par_id921702936339055" role="paragraph">Shows the comment of the cell.</paragraph>
+    </section>
+    <section id="howtoget">
+        <embed href="text/scalc/00/sheet_menu.xhp#show_comment"/>
+    </section>
+    <section id="relatedtopics">
+        <paragraph role="paragraph" id="par_id321702948452216" localize="false"><embedvar href="text/scalc/01/SheetCommentMenu.xhp#h1" markup="ignore"/></paragraph>
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/00/00000404.xhp b/source/text/shared/00/00000404.xhp
index 9c1883f316..ff1917d731 100644
--- a/source/text/shared/00/00000404.xhp
+++ b/source/text/shared/00/00000404.xhp
@@ -269,30 +269,64 @@
 </section>
 
 <section id="annotation">
-    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
-    <paragraph role="paragraph" id="par_id3153808"><variable id="notiz">Choose <menuitem>Insert - Comment</menuitem>.</variable></paragraph>
-    <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
-    <paragraph role="paragraph" id="par_id841689472443824">Choose <menuitem>Review - Insert Comment</menuitem>.</paragraph>
     <switch select="appl">
         <case select="WRITER">
+            <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+            <paragraph role="paragraph" id="par_id3153808"><variable id="notiz">Choose <menuitem>Insert - Comment</menuitem>.</variable></paragraph>
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id841689472443824">Choose <menuitem>Review - Insert Comment</menuitem>.</paragraph>
             <paragraph role="paragraph" id="par_id11689501613616">Choose <menuitem>Home - Insert Comment</menuitem>.</paragraph>
+            <embed href="text/shared/00/00000004.xhp#from_context"/>
+            <paragraph role="paragraph" id="par_id211689472213113" localize="false"><embedvar href="text/shared/00/00000404.xhp#notiz" markup="keep"/></paragraph>
+            <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+            <paragraph role="paragraph" id="par_id3253808"><variable id="notizkbd"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode>+<keycode>Option</keycode></caseinline><defaultinline><keycode>Ctrl</keycode> + <keycode>Alt</keycode></defaultinline></switchinline> + <keycode>C</keycode>.</variable></paragraph>
+        </case>
+        <case select="CALC">
+            <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+            <paragraph role="paragraph" id="par_id371702933232002">On a cell with no comment, choose <menuitem>Insert - Comment</menuitem>.</paragraph>
+            <paragraph role="paragraph" id="par_id311702929340458">On a cell with existing comment, choose <menuitem>Sheet - Cell Comments - Edit Comment</menuitem>.</paragraph>
+            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+            <paragraph role="paragraph" id="par_id901702953197565">On a cell with no comment, choose <menuitem>Review - Comment</menuitem>.</paragraph>
+            <paragraph role="paragraph" id="par_id431702929426265">On a cell with existing comment, choose <menuitem>Review - Edit Comment</menuitem>.</paragraph>
+            <embed href="text/shared/00/00000004.xhp#from_context"/>
+            <paragraph role="paragraph" id="par_id671702933301253">On a cell with existing comment, choose <menuitem>Edit Comment</menuitem>.</paragraph>
+            <paragraph role="paragraph" id="par_id21702933306128">On a cell with no comment, choose <menuitem>Insert Comment</menuitem>.</paragraph>
+            <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+            <paragraph role="paragraph" id="par_id731702933940903">To insert a comment in a cell: <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode>+<keycode>Option</keycode></caseinline><defaultinline><keycode>Ctrl</keycode> + <keycode>Alt</keycode></defaultinline></switchinline> + <keycode>M</keycode>.</paragraph>
+            <paragraph role="paragraph" id="par_id351702934106068">To edit a comment in a cell: <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode>+<keycode>Option</keycode></caseinline><defaultinline><keycode>Ctrl</keycode> + <keycode>Alt</keycode></defaultinline></switchinline> + <keycode>C</keycode>.</paragraph>
+        </case>
+        <case select="IMPRESS">
         </case>
+        <case select="DRAW">
+        </case>
+        <default>
+        </default>
     </switch>
-    <embed href="text/shared/00/00000004.xhp#from_context"/>
-    <paragraph role="paragraph" id="par_id211689472213113" localize="false"><embedvar href="text/shared/00/00000404.xhp#notiz" markup="keep"/></paragraph>
     <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <switch select="appl">
+        <case select="CALC">
+            <table id="tab_id21702935879037">
+                <tablerow>
+                    <tablecell>
+                        <paragraph id="par_id561702935879038" role="paragraph"><image src="cmd/lc_editannotation.svg" id="img_id381702935879039" width="1cm"  height="1cm"><alt id="alt_id261702935879040">Icon Edit Comment</alt></image></paragraph>
+                    </tablecell>
+                    <tablecell>
+                        <paragraph id="par_id471702935879042" role="paragraph">Edit Comment</paragraph>
+                    </tablecell>
+                </tablerow>
+            </table>
+        </case>
+    </switch>
     <table id="tab_id701689471839958">
         <tablerow>
             <tablecell>
-                <paragraph id="par_id131689471839959" role="paragraph"><image src="cmd/lc_shownote.svg" id="img_id531689471839960" width="1cm"  height="1cm"><alt id="alt_id211689471839961">Icon Insert Comment</alt></image></paragraph>
+                <paragraph id="par_id131689471839959" role="paragraph"><image src="cmd/lc_shownote.svg" id="img_id531689471839960" width="1cm" height="1cm"><alt id="alt_id211689471839961">Icon Insert Comment</alt></image></paragraph>
             </tablecell>
             <tablecell>
                 <paragraph id="par_id191689471839963" role="paragraph">Insert Comment</paragraph>
             </tablecell>
         </tablerow>
     </table>
-    <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
-    <paragraph role="paragraph" id="par_id3253808"><variable id="notizkbd"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode>+<keycode>Option</keycode></caseinline><defaultinline><keycode>Ctrl</keycode> + <keycode>Alt</keycode></defaultinline></switchinline> + <keycode>C</keycode>.</variable></paragraph>
 </section>
 
 <section id="scan">
diff --git a/source/text/shared/01/04050000.xhp b/source/text/shared/01/04050000.xhp
index e21532b621..05e21ac470 100644
--- a/source/text/shared/01/04050000.xhp
+++ b/source/text/shared/01/04050000.xhp
@@ -20,12 +20,12 @@
 
     <meta>
         <topic id="textshared0104050000xml" indexer="include">
-            <title id="tit" xml-lang="en-US">Comments</title>
+            <title id="tit">Comments</title>
             <filename>/text/shared/01/04050000.xhp</filename>
         </topic>
     </meta>
     <body>
-    <bookmark xml-lang="en-US" branch="index" id="bm_id3154100">
+    <bookmark branch="index" id="bm_id3154100">
         <bookmark_value>comments;inserting/editing/deleting/printing/resolving</bookmark_value>
         <bookmark_value>comments;hide resolved</bookmark_value>
         <bookmark_value>comments;resolve in text documents</bookmark_value>
@@ -39,32 +39,32 @@
         <bookmark_value>remarks, see also comments</bookmark_value>
     </bookmark>
     <comment>mw changed "notes;" and added 3 entries</comment>
+<bookmark branch="hid/.uno:InsertAnnotation" id="bm_id8906707" localize="false"/>
+<bookmark branch="hid/.uno:EditAnnotation" id="bm_id8905607" localize="false"/>
     <section id="comment">
-        <bookmark xml-lang="en-US" branch="hid/.uno:InsertAnnotation" id="bm_id8906707" localize="false"/>
-        <bookmark xml-lang="en-US" branch="hid/.uno:EditAnnotation" id="bm_id8905607" localize="false"/>
         <h1 id="hd_id3154100"><variable id="h1"><link href="text/shared/01/04050000.xhp">Comment</link></variable></h1>
-        <paragraph id="par_id3151100" role="paragraph" xml-lang="en-US"><variable id="notizbearbeitentext"><ahelp hid=".">Inserts a comment around the selected text, presentation slide, drawing page or at the current spreadsheet cursor position.</ahelp></variable></paragraph>
+        <paragraph id="par_id3151100" role="paragraph"><variable id="notizbearbeitentext"><ahelp hid=".">Inserts a comment around the selected text, presentation slide, drawing page or at the current spreadsheet cursor position.</ahelp></variable></paragraph>
     </section>
     <section id="howtoget">
         <embed href="text/shared/00/00000404.xhp#annotation"/>
     </section>
 
-    <paragraph id="par_id6718649" role="paragraph" xml-lang="en-US">The comments by different authors get different colors. Choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - User Data</menuitem> to enter your name so that it can show up as the comment author.</paragraph>
+    <paragraph id="par_id6718649" role="paragraph">The comments by different authors get different colors. Choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - User Data</menuitem> to enter your name so that it can show up as the comment author.</paragraph>
     <switch select="appl">
         <case select="CALC">
             <h2 id="hd_id0915200910571612">Comments in spreadsheets</h2>
-            <paragraph id="par_id3166460" role="paragraph" xml-lang="en-US">When you attach a comment to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a comment. To display the comment permanently, right-click the cell, and choose <emph>Show Comment</emph>.</paragraph>
-            <paragraph role="paragraph" id="par_id101565954872022" xml-lang="en-US">
-                <image src="media/helpimg/sc_cell_with_comment_displayed.png" id="img_id901565954872022" width="451px" height="173px"><alt xml-lang="en-US" id="alt_id771565954872022">Cell with comment displayed</alt></image>
+            <paragraph id="par_id3166460" role="paragraph">When you attach a comment to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a comment. To display the comment permanently, right-click the cell, and choose <emph>Show Comment</emph>.</paragraph>
+            <paragraph role="paragraph" id="par_id101565954872022">
+                <image src="media/helpimg/sc_cell_with_comment_displayed.png" id="img_id901565954872022" width="451px" height="173px"><alt id="alt_id771565954872022">Cell with comment displayed</alt></image>
             </paragraph>
-            <paragraph id="par_id8336741" role="paragraph" xml-lang="en-US">To change the object properties of a comment, for example the background color, choose <emph>Show Comment</emph> as above, then right-click the comment. Do <emph>not</emph> double-click the text!</paragraph>
-            <paragraph id="par_id3155390" role="paragraph" xml-lang="en-US">To edit a shown comment, double-click the comment text. To edit a comment that is not shown permanently, right-click in the cell that contains the comment, and then choose <emph>Edit Comment</emph>. To specify the formatting of the comment text, right-click the comment text in edit mode.</paragraph>
-            <paragraph id="par_idN107A1" role="paragraph" xml-lang="en-US">To change the position or size of a comment, drag a border or corner of the comment box.</paragraph>
-            <paragraph id="par_id9499496" role="paragraph" xml-lang="en-US">To delete a comment, right-click the cell, then choose <emph>Delete Comment</emph>.</paragraph>
+            <paragraph id="par_id8336741" role="paragraph">To change the object properties of a comment, for example the background color, choose <emph>Show Comment</emph> as above, then right-click the comment. Do <emph>not</emph> double-click the text!</paragraph>
+            <paragraph id="par_id3155390" role="paragraph">To edit a shown comment, double-click the comment text. To edit a comment that is not shown permanently, right-click in the cell that contains the comment, and then choose <emph>Edit Comment</emph>. To specify the formatting of the comment text, right-click the comment text in edit mode.</paragraph>
+            <paragraph id="par_idN107A1" role="paragraph">To change the position or size of a comment, drag a border or corner of the comment box.</paragraph>
+            <paragraph id="par_id9499496" role="paragraph">To delete a comment, right-click the cell, then choose <emph>Delete Comment</emph>.</paragraph>
 
-            <paragraph id="par_id2036805" role="paragraph" xml-lang="en-US">You can also right-click a comment name in the <emph>Navigator</emph> window to choose some editing commands.</paragraph>
+            <paragraph id="par_id2036805" role="paragraph">You can also right-click a comment name in the <emph>Navigator</emph> window to choose some editing commands.</paragraph>
 
-            <paragraph id="par_id3153716" role="paragraph" xml-lang="en-US">To set the printing options for comments in your spreadsheet, choose <menuitem>Format - Page Style</menuitem>, and then click the <emph>Sheet</emph> tab.</paragraph>
+            <paragraph id="par_id3153716" role="paragraph">To set the printing options for comments in your spreadsheet, choose <menuitem>Format - Page Style</menuitem>, and then click the <emph>Sheet</emph> tab.</paragraph>
         </case>
         <case select="IMPRESS">
             <h2 id="hd_id1001565974085289">Inserting Comments in Presentations</h2>
@@ -72,33 +72,33 @@
                 <paragraph role="paragraph" id="par_id901565974475262">Use the command <menuitem>Insert - Comment</menuitem> or the key combination above to insert a comment anchor to the current <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><caseinline select="DRAW">page</caseinline></switchinline>. A colored comment box is shown at the top left corner, to enter the text of the comment. A small colored box -  the anchor - in the top left of the <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><caseinline select="DRAW">page</caseinline></switchinline> contains the initials of the author name, followed by a sequential number. Click on the anchor to open or close the corresponding comment.</paragraph>
                 <section id="dropdown">
                  <paragraph role="paragraph" id="par_id521565974498192">The author name and the comment creation date and time is shown at the bottom of the comment box.</paragraph>
-                 <paragraph id="par_id2571794" role="paragraph" xml-lang="en-US">The comment box contains a button with a down arrow. Click the icon to open a menu with commands for comment management.</paragraph>
+                 <paragraph id="par_id2571794" role="paragraph">The comment box contains a button with a down arrow. Click the icon to open a menu with commands for comment management.</paragraph>
                 </section>
             </section>
-            <paragraph role="paragraph" id="par_id561345967371982" xml-lang="en-US">
-                <image src="media/helpimg/si_presentation_with_comment.png" id="img_id23465967371982" width="598px" height="291px"><alt xml-lang="en-US" id="alt_id481565967371982">Comments in Presentations</alt></image>
+            <paragraph role="paragraph" id="par_id561345967371982">
+                <image src="media/helpimg/si_presentation_with_comment.png" id="img_id23465967371982" width="598px" height="291px"><alt id="alt_id481565967371982">Comments in Presentations</alt></image>
             </paragraph>
         </case>
         <case select="DRAW">
             <h2 id="hd_id491566054901283">Inserting Comments in Drawings</h2>
             <embed href="text/shared/01/04050000.xhp#comment001"/>
-            <paragraph role="paragraph" id="par_id561345998371982" xml-lang="en-US">
-                <image src="media/helpimg/sd_drawing_with_comment.png" id="img_id23465967371982" width="413px" height="293px"><alt xml-lang="en-US" id="alt_id481565967371982">Comments in Drawings</alt></image>
+            <paragraph role="paragraph" id="par_id561345998371982">
+                <image src="media/helpimg/sd_drawing_with_comment.png" id="img_id23465967371982" width="413px" height="293px"><alt id="alt_id481565967371982">Comments in Drawings</alt></image>
             </paragraph>
         </case>
         <default>
             <h2 id="hd_id9851680">Inserting Comments in Text Documents</h2><comment>issue 113019 112000</comment>
-            <paragraph id="par_id1830500" role="paragraph" xml-lang="en-US">Use the command <menuitem>Insert - Comment</menuitem> or the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode>+<keycode>Option</keycode></caseinline><defaultinline><keycode>Ctrl</keycode>+<keycode>Alt</keycode></defaultinline></switchinline>+<keycode>C</keycode> key combination to insert a comment anchor at the current cursor position. A colored comment box is shown at the page margin, to enter the text of the comment. A line connects the anchor to the comment box. If a text range is selected, the comment is attached to the text range. The commented text range is shadowed.</paragraph>
-            <paragraph role="paragraph" id="par_id561565967371982" xml-lang="en-US">
-                <image src="media/helpimg/sw_text_with_comment.png" id="img_id21565967371982" width="834px" height="244px"><alt xml-lang="en-US" id="alt_id481565967371982">Comments in text documents</alt></image>
+            <paragraph id="par_id1830500" role="paragraph">Use the command <menuitem>Insert - Comment</menuitem> or the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode>+<keycode>Option</keycode></caseinline><defaultinline><keycode>Ctrl</keycode>+<keycode>Alt</keycode></defaultinline></switchinline>+<keycode>C</keycode> key combination to insert a comment anchor at the current cursor position. A colored comment box is shown at the page margin, to enter the text of the comment. A line connects the anchor to the comment box. If a text range is selected, the comment is attached to the text range. The commented text range is shadowed.</paragraph>
+            <paragraph role="paragraph" id="par_id561565967371982">
+                <image src="media/helpimg/sw_text_with_comment.png" id="img_id21565967371982" width="834px" height="244px"><alt id="alt_id481565967371982">Comments in text documents</alt></image>
             </paragraph>
             <h2 id="hd_id2929166">Editing comments</h2>
-            <paragraph id="par_id5201879" role="paragraph" xml-lang="en-US">Every user with write permission to the document can edit and delete comments of all authors. You can use the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode>+<keycode>Option</keycode></caseinline><defaultinline><keycode>Ctrl</keycode>+<keycode>Alt</keycode></defaultinline></switchinline>+<keycode>C</keycode> key combination to edit a comment at the current cursor position.</paragraph>
+            <paragraph id="par_id5201879" role="paragraph">Every user with write permission to the document can edit and delete comments of all authors. You can use the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode>+<keycode>Option</keycode></caseinline><defaultinline><keycode>Ctrl</keycode>+<keycode>Alt</keycode></defaultinline></switchinline>+<keycode>C</keycode> key combination to edit a comment at the current cursor position.</paragraph>
             <embed href="text/shared/01/04050000.xhp#dropdown"/>
-            <bookmark xml-lang="en-US" branch="hid/.uno:ReplyComment" id="bm_id0429200810593995" localize="false"/>
+            <bookmark branch="hid/.uno:ReplyComment" id="bm_id0429200810593995" localize="false"/>
             <tip id="par_id0302200901430918">In the <emph>Find &amp; Replace</emph> dialog of text documents, you can select to include the comments texts in your searches.</tip>
             <h2 id="hd_id601573488847729">Replying to comments</h2>
-            <paragraph id="par_id0305200911090684" role="paragraph" xml-lang="en-US">If the comment in a text document was written by another author, there is a <emph>Reply</emph> command in the context menu. <ahelp hid=".">This command inserts a new comment adjacent to the comment to which you want to reply.</ahelp> The comment anchor is the same for both comments. Type your reply text in the new comment. Save and send your document to other authors, then those authors can add replies, too.</paragraph><comment>View - Comments command</comment>
+            <paragraph id="par_id0305200911090684" role="paragraph">If the comment in a text document was written by another author, there is a <emph>Reply</emph> command in the context menu. <ahelp hid=".">This command inserts a new comment adjacent to the comment to which you want to reply.</ahelp> The comment anchor is the same for both comments. Type your reply text in the new comment. Save and send your document to other authors, then those authors can add replies, too.</paragraph><comment>View - Comments command</comment>
             <section id="resolvecomments">
             <h2 id="hd_id201573491050815">Marking comments as resolved</h2>
             <paragraph role="paragraph" id="par_id961573491046250">When the document has been reviewed and commented and requires your action in its contents, you can mark the comment  <emph>Resolved</emph> or <emph>Unresolved</emph>. Open the comment context menu or click on the comment dropdown list to mark the Resolved checkbox. When you mark the comment resolved, the word <literal>Resolved</literal> is inserted under the date in the comment box. When marking unresolved, the word <literal>Resolved</literal> is removed.</paragraph>
@@ -107,25 +107,24 @@
 
             <h2 id="hd_id3445539">Navigating from comment to comment in text documents</h2>
 
-            <paragraph id="par_id4271370" role="paragraph" xml-lang="en-US">When the cursor is inside a comment, you can press <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph>+<emph>Option</emph></caseinline><defaultinline><emph>Ctrl</emph>+<emph>Alt</emph></defaultinline></switchinline>+<emph>Page Down</emph> to jump to the next comment, or press <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph>+<emph>Option</emph></caseinline><defaultinline><emph>Ctrl</emph>+<emph>Alt</emph></defaultinline></switchinline>+<emph>Page Up</emph> to jump to the previous comment.</paragraph>
+            <paragraph id="par_id4271370" role="paragraph">When the cursor is inside a comment, you can press <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph>+<emph>Option</emph></caseinline><defaultinline><emph>Ctrl</emph>+<emph>Alt</emph></defaultinline></switchinline>+<emph>Page Down</emph> to jump to the next comment, or press <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph>+<emph>Option</emph></caseinline><defaultinline><emph>Ctrl</emph>+<emph>Alt</emph></defaultinline></switchinline>+<emph>Page Up</emph> to jump to the previous comment.</paragraph>
 
-            <paragraph id="par_id2116153" role="paragraph" xml-lang="en-US">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor.</paragraph>
+            <paragraph id="par_id2116153" role="paragraph">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor.</paragraph>
 
             <tip id="par_id5381328">You can also open the <emph>Navigator</emph> to see a list of all comments. Right-click a comment name in the Navigator to edit or delete the comment.</tip>
 
         </default>
     </switch>
 
-    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteNote" id="bm_id0429200810584478" localize="false"/>
-    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAnnotation" id="bm_id0915200910464881" localize="false"/>
-    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteComment" id="bm_id0429200810584479" localize="false"/>
-    <paragraph id="par_id0522200809383431" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Delete the current comment.</ahelp></paragraph>
-    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAuthor" id="bm_id0429200810592549" localize="false"/>
-    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAllAnnotationByAuthor" id="bm_id0915200910471559" localize="false"/>
-    <paragraph id="par_id0522200809383485" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Delete all comments by this author in the current document.</ahelp></paragraph>
-    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAllNotes" id="bm_id0429200810593994" localize="false"/>
-    <bookmark xml-lang="en-US" branch="hid/.uno:DeleteAllAnnotation" id="bm_id0915200910474796" localize="false"/>
-    <paragraph id="par_id0522200809383428" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Delete all comments in the current document.</ahelp></paragraph>
+        <bookmark branch="hid/.uno:DeleteAnnotation" id="bm_id0915200910464881" localize="false"/>
+    <bookmark branch="hid/.uno:DeleteComment" id="bm_id0429200810584479" localize="false"/>
+    <paragraph id="par_id0522200809383431" role="paragraph"><ahelp hid="." visibility="hidden">Delete the current comment.</ahelp></paragraph>
+    <bookmark branch="hid/.uno:DeleteAuthor" id="bm_id0429200810592549" localize="false"/>
+    <bookmark branch="hid/.uno:DeleteAllAnnotationByAuthor" id="bm_id0915200910471559" localize="false"/>
+    <paragraph id="par_id0522200809383485" role="paragraph"><ahelp hid="." visibility="hidden">Delete all comments by this author in the current document.</ahelp></paragraph>
+
+    <bookmark branch="hid/.uno:DeleteAllAnnotation" id="bm_id0915200910474796" localize="false"/>
+    <paragraph id="par_id0522200809383428" role="paragraph"><ahelp hid="." visibility="hidden">Delete all comments in the current document.</ahelp></paragraph>
 
     <h2 id="hd_id51565980483588">Viewing Comments</h2>
     <switch select="appl">
@@ -139,7 +138,7 @@
             <paragraph role="paragraph" id="par_id821565980437922">Use <menuitem>View - Comments</menuitem> to show or hide all anchor comments on the top of the slide.</paragraph>
         </case>
         <default>
-            <paragraph id="par_id0804200803435883" role="paragraph" xml-lang="en-US">Use <menuitem>View - Comments</menuitem> or click on the Comment button on the right of the horizontal ruler to show or hide all comments.</paragraph>
+            <paragraph id="par_id0804200803435883" role="paragraph">Use <menuitem>View - Comments</menuitem> or click on the Comment button on the right of the horizontal ruler to show or hide all comments.</paragraph>
         </default>
     </switch>
 
@@ -156,8 +155,11 @@
             <paragraph role="paragraph" id="par_id461565984972664">Comments are printed when they are made visible.</paragraph>
         </case>
         <default>
-            <paragraph id="par_id2254402" role="paragraph" xml-lang="en-US">To change the printing option for comments for all your text documents, choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME Writer - Print</menuitem>.</paragraph>
+            <paragraph id="par_id2254402" role="paragraph">To change the printing option for comments for all your text documents, choose <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME Writer - Print</menuitem>.</paragraph>
         </default>
     </switch>
+    <section id="relatedtopics">
+        <paragraph role="paragraph" id="par_id321702948452216" localize="false"><embedvar href="text/scalc/01/SheetCommentMenu.xhp#h1" markup="ignore"/></paragraph>
+    </section>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/view_comments.xhp b/source/text/shared/01/view_comments.xhp
index ca2929786e..285813144a 100644
--- a/source/text/shared/01/view_comments.xhp
+++ b/source/text/shared/01/view_comments.xhp
@@ -20,14 +20,13 @@
 <bookmark branch="hid/.uno:ShowAllNotes" id="bm_id871686938115438" localize="false"/>
 <bookmark branch="hid/.uno:NoteVisible" id="bm_id991686942333141" localize="false"/>
 <bookmark branch="hid/.uno:ShowAnnotations" id="bm_id0804200803411260" localize="false"/>
-<bookmark branch="hid/.uno:ShowNote" id="bm_id0804200803411261" localize="false"/>
 
 <bookmark branch="index" id="bm_id21686938229553">
 <bookmark_value>view;comments</bookmark_value>
 <bookmark_value>comments;show</bookmark_value>
 </bookmark>
 <section id="viewcomments">
-    <h1 id="hd_id931686938115440"><variable id="h1"><link href="text/shared/01/view_comments.xhp">Comments</link></variable></h1>
+    <h1 id="hd_id931686938115440"><variable id="h1"><link href="text/shared/01/view_comments.xhp"><switchinline select="appl"><caseinline select="CALC">Show Comment</caseinline><defaultinline>Comments</defaultinline></switchinline></link></variable></h1>
     <paragraph id="par_id102720150854014989" role="paragraph">Show or hide a document's comments and replies to them.</paragraph>
 </section>
 <section id="howtoget">
@@ -38,14 +37,6 @@
             <h4 id="hd_id961686939248454">On the left of the horizontal ruler</h4>
             <paragraph role="paragraph" id="par_id21686939238276">Click <menuitem>Comments</menuitem>.</paragraph>
         </case>
-        <case select="CALC">
-            <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
-            <paragraph role="paragraph" id="par_id491686939392854" localize="false"><embedvar href="text/shared/01/view_comments.xhp#showcomts" markup="ignore"/></paragraph>
-            <embed href="text/shared/00/00000004.xhp#from_context"/>
-            <paragraph role="paragraph" id="par_id921686939507900">Choose <menuitem>Show Comment</menuitem>.</paragraph>
-            <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
-            <paragraph role="paragraph" id="par_id641686939721451">Choose <menuitem>Review - Show All Comments</menuitem>.</paragraph>
-        </case>
         <case select="DRAW">
             <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
             <paragraph role="paragraph" id="par_id491684569392854" localize="false"><embedvar href="text/shared/01/view_comments.xhp#showcomts" markup="ignore"/></paragraph>