Fix list of View commands in Writer menu help

Reorder and update View menu description for  Writer

Change-Id: Ib7af048b603977dabbdb53069935a5158e3a6bbe
Reviewed-on: https://gerrit.libreoffice.org/35927
Reviewed-by: Olivier Hallot <olivier.hallot@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot@edx.srv.br>

5 files changed, 80 insertions, 54 deletions

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index e5f29dd00f..0deb8b2123 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -332,6 +332,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/01/gallery \
     helpcontent2/source/text/shared/01/gallery_files \
     helpcontent2/source/text/shared/01/grid \
+    helpcontent2/source/text/shared/01/grid_and_helplines \
     helpcontent2/source/text/shared/01/guides \
     helpcontent2/source/text/shared/01/mediaplayer \
     helpcontent2/source/text/shared/01/menu_edit_find \
diff --git a/source/text/scalc/main0103.xhp b/source/text/scalc/main0103.xhp
index fde4ef2f9b..209d51834d 100644
--- a/source/text/scalc/main0103.xhp
+++ b/source/text/scalc/main0103.xhp
@@ -40,7 +40,6 @@
 <paragraph id="par_idN105AF" role="paragraph" xml-lang="en-US"><ahelp hid=".">Displays the normal layout view of the sheet.</ahelp></paragraph>
 
 <paragraph id="hd_id102720151109097115" role="heading" level="2" xml-lang="en-US"><link href="text/scalc/01/03100000.xhp">Page Break</link></paragraph>
-<embed href="text/scalc/01/03100000.xhp#page_break_view_text"/>
 <embed href="text/shared/01/03990000.xhp#toolbars"/>
 <embed href="text/scalc/01/03090000.xhp#formula_bar"/>
 <embed href="text/shared/01/03060000.xhp#status_bar"/>
@@ -50,16 +49,20 @@
 <paragraph id="hd_id10272015110909623" role="heading" level="2" xml-lang="en-US">Grid Lines for Sheet</paragraph>
 <paragraph id="par_id102720151147483554" role="paragraph" xml-lang="en-US">Toggle the visibility of grid lines for the current sheet.</paragraph>
 <embed href="text/scalc/01/03080000.xhp#value_highlighting"/>
+
+<paragraph id="hd_id033020170228348624" role="heading" level="2" xml-lang="en-US">Show Formula</paragraph>
+<paragraph id="par_id03302017024610704" role="paragraph" xml-lang="en-US">Display the cell formula expression instead of the calculated result.</paragraph>
+<embed href="text/shared/01/grid_and_helplines.xhp#grid_and_help_lines"/>
 <embed href="text/scalc/01/07090000.xhp#freeze_rows_and_columns"/>
 <embed href="text/scalc/01/07080000.xhp#split_window"/>
 <embed href="text/shared/01/menu_view_sidebar.xhp#sidebar"/>
 <embed href="text/scalc/01/05100000.xhp#styles_and_formatting"/>
 
-<paragraph id="hd_id102720150908397549" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/gallery.xhp">Clip Art Gallery</link></paragraph>
+<paragraph id="hd_id102720150908397549" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/gallery.xhp">Gallery</link></paragraph>
 <embed href="text/shared/01/gallery.xhp#media_gallery_text"/>
 <embed href="text/scalc/01/02110000.xhp#navigator"/>
 
-<paragraph id="hd_id102720151147488697" role="heading" level="2" xml-lang="en-US" localize="false"><embedvar href="text/scalc/01/04080000.xhp#function_list_title"/></paragraph>
+<paragraph id="hd_id102720151147488697" role="heading" level="2" localize="false" xml-lang="en-US"><embedvar href="text/scalc/01/04080000.xhp#function_list_title"/></paragraph>
 <embed href="text/scalc/01/04080000.xhp#function_list_text"/>
 <embed href="text/shared/01/04180100.xhp#data_sources"/>
 <embed href="text/shared/01/03110000.xhp#full_screen"/>
@@ -68,4 +71,4 @@
 <embed href="text/shared/01/03010000.xhp#zoom_text"/>
 </body>
 
-</helpdocument>
+</helpdocument>
\ No newline at end of file
diff --git a/source/text/shared/01/grid.xhp b/source/text/shared/01/grid.xhp
index 2d076b4183..5ab02c0345 100644
--- a/source/text/shared/01/grid.xhp
+++ b/source/text/shared/01/grid.xhp
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,33 +16,50 @@
  *   License, Version 2.0 (the "License"); you may not use this file
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
+-->
 
-		<helpdocument version="1.0">
 <meta>
-<topic id="textshared01gridxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Grid</title>
-<filename>/text/shared/01/grid.xhp</filename>
-</topic>
+  <topic id="textshared01gridxml" indexer="include" status="PUBLISH">
+    <title id="tit" xml-lang="en-US">Grid</title>
+    <filename>/text/shared/01/grid.xhp</filename>
+  </topic>
 </meta>
+
 <body>
+
+
 <section id="grid">
-<bookmark xml-lang="en-US" branch="index" id="bm_id4263435"><bookmark_value>grids;display options (Impress/Draw)</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id4263435">
+  <bookmark_value>grids;display options (Impress/Draw)</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:GridMenu" id="bm_id9596240" localize="false"/><paragraph role="heading" id="par_idN10565" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/grid.xhp">Grid</link></paragraph>
-<paragraph role="paragraph" id="par_id3147340" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid=".">Sets the display properties of a grid.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.uno:GridMenu" id="bm_id9596240" localize="false"/>
+
+<paragraph id="par_idN10565" role="heading" level="1" xml-lang="en-US"><link href="text/shared/01/grid.xhp">Grid</link></paragraph>
+<paragraph id="par_id3147340" role="paragraph" xml-lang="en-US"><ahelp hid=".">Sets the display properties of a grid.</ahelp></paragraph>
 </section>
+
 <section id="howtoget">
-  <embed href="text/shared/00/00000403.xhp#grid"/>
+<embed href="text/shared/00/00000403.xhp#grid"/>
 </section>
-<paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="2" l10n="NEW">Display Grid</paragraph>
-<paragraph role="paragraph" id="par_idN10582" xml-lang="en-US" l10n="NEW">Displays or hides grid lines that you can use to align objects such as graphics on a page.</paragraph>
-<paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Snap to Grid</paragraph>
-<comment>issue 112000 for new key</comment><paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Option key</caseinline><defaultinline>Alt key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph><comment>UFI removed GridFront help id</comment><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Grid to Front</paragraph>
-<paragraph role="paragraph" id="par_idN105CD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the grid lines in front of the objects on the slide or page.</ahelp></paragraph>
+
+<section id="DisplayandSnap">
+
+<paragraph id="par_idN1057E" role="heading" level="2" xml-lang="en-US">Display Grid</paragraph>
+<paragraph id="par_idN10582" role="paragraph" xml-lang="en-US">Displays or hides grid lines that you can use to align objects such as graphics on a page.</paragraph>
+
+<paragraph id="par_idN10585" role="heading" level="2" xml-lang="en-US">Snap to Grid</paragraph><comment>issue 112000 for new key</comment>
+<paragraph id="par_idN10589" role="paragraph" xml-lang="en-US">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Option key
+</caseinline><defaultinline>Alt key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph>
+</section><comment>UFI removed GridFront help id</comment>
+
+<paragraph id="par_idN105C9" role="heading" level="2" xml-lang="en-US">Grid to Front</paragraph>
+<paragraph id="par_idN105CD" role="paragraph" xml-lang="en-US"><ahelp hid=".">Displays the grid lines in front of the objects on the slide or page.</ahelp></paragraph>
+
 <section id="relatedtopics">
-<paragraph role="paragraph" id="par_id4372692" xml-lang="en-US">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Application Colors</link>.</paragraph>
+<paragraph id="par_id4372692" role="paragraph" xml-lang="en-US">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences
+</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Application Colors</link>.</paragraph>
 </section>
 </body>
-</helpdocument>
+
+</helpdocument>
\ No newline at end of file
diff --git a/source/text/shared/02/01171400.xhp b/source/text/shared/02/01171400.xhp
index 546f1295c9..d1c0267c6f 100644
--- a/source/text/shared/02/01171400.xhp
+++ b/source/text/shared/02/01171400.xhp
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -17,36 +16,39 @@
  *   License, Version 2.0 (the "License"); you may not use this file
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-	
-<helpdocument version="1.0">
+-->
+
 <meta>
-<topic id="textshared0201171400xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Helplines While Moving</title>
-<filename>/text/shared/02/01171400.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
+  <topic id="textshared0201171400xml" indexer="include" status="PUBLISH">
+    <title id="tit" xml-lang="en-US">Helplines While Moving</title>
+    <filename>/text/shared/02/01171400.xhp</filename>
+  </topic>
 </meta>
-<body><comment>UFI: removed help ids</comment>
-<paragraph role="heading" id="hd_id3155599" xml-lang="en-US" level="1" l10n="U" oldref="1">Helplines While Moving</paragraph>
+
+<body>
+<comment>UFI: removed help ids</comment>
+
+<section id="helplines_while_moving">
+
+<paragraph id="hd_id3155599" role="heading" level="1" xml-lang="en-US">Helplines While Moving</paragraph>
 <embed href="text/shared/optionen/01070100.xhp#verschieb"/>
 <embed href="text/shared/optionen/01070100.xhp#vertext"/>
+
 <section id="syhline">
+
 <table id="tbl_id3147143">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149549" xml-lang="en-US" l10n="E">
-<image id="img_id3149760" src="cmd/sc_helplinesmove.png" width="0.1665inch" height="0.1665inch"><alt id="alt_id3149760" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="U" oldref="4">Helplines While Moving</paragraph>
-</tablecell>
-</tablerow>
+  <tablerow>
+    <tablecell>
+      <paragraph id="par_id3149549" role="paragraph" xml-lang="en-US"> <image id="img_id3149760" src="cmd/sc_helplinesmove.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3149760">Icon</alt></image></paragraph>
+    </tablecell>
+    <tablecell>
+      <paragraph id="par_id3153049" role="paragraph" xml-lang="en-US">Helplines While Moving</paragraph>
+    </tablecell>
+  </tablerow>
 </table>
 
 </section>
+</section>
 </body>
-</helpdocument>
+
+</helpdocument>
\ No newline at end of file
diff --git a/source/text/swriter/main0103.xhp b/source/text/swriter/main0103.xhp
index 1fc5237bed..00e1980317 100644
--- a/source/text/swriter/main0103.xhp
+++ b/source/text/swriter/main0103.xhp
@@ -48,9 +48,6 @@
 
 <paragraph id="hd_id102720150854015048" role="heading" level="2" xml-lang="en-US">Scrollbars</paragraph>
 <paragraph id="par_id102720150854017277" role="paragraph" xml-lang="en-US">Show or hide the horizontal and vertical scroll bars that are used to change the viewable area of a document that doesn't fit within the window.</paragraph>
-
-<paragraph id="hd_id102720150854018740" role="heading" level="2" xml-lang="en-US">Hide Whitespace</paragraph>
-<paragraph id="par_id102720150854012820" role="paragraph" xml-lang="en-US">View documents with the white space found at the end and beginning of pages hidden.</paragraph>
 <embed href="text/swriter/01/03070000.xhp#text_boundaries"/>
 
 <paragraph id="par_idN10613" role="heading" level="2" xml-lang="en-US">Table Boundaries</paragraph>
@@ -62,13 +59,21 @@
 <paragraph id="hd_id102720150854019880" role="heading" level="2" xml-lang="en-US">Comments</paragraph>
 <paragraph id="par_id102720150854014989" role="paragraph" xml-lang="en-US">Show or hide a document's comments and replies to them.</paragraph>
 <embed href="text/swriter/01/03100000.xhp#nonprinting_chars"/>
+<embed href="text/shared/01/grid_and_helplines.xhp#grid_and_help_lines"/>
+
+<paragraph id="hd_id102720150854018740" role="heading" level="2" xml-lang="en-US">Hide Whitespace</paragraph>
+<paragraph id="par_id102720150854012820" role="paragraph" xml-lang="en-US">View documents with the white space found at the end and beginning of pages hidden.</paragraph>
+
+<paragraph id="hd_id03302017034826145" role="heading" level="2" xml-lang="en-US">Track Changes</paragraph>
+<embed href="text/shared/01/02230200.xhp#text"/>
 <embed href="text/swriter/01/03080000.xhp#field_shadings"/>
 <embed href="text/swriter/01/03090000.xhp#field_names"/>
 <embed href="text/swriter/01/03140000.xhp#hidden_paragraphs"/>
+<embed href="text/shared/01/03040000.xhp#ime"/>
 <embed href="text/shared/01/menu_view_sidebar.xhp#sidebar"/>
 <embed href="text/swriter/01/05140000.xhp#styles_and_formatting"/>
 
-<paragraph id="hd_id102720150908397549" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/gallery.xhp">Clip Art Gallery</link></paragraph>
+<paragraph id="hd_id102720150908397549" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/gallery.xhp">Gallery</link></paragraph>
 <embed href="text/shared/01/gallery.xhp#media_gallery_text"/>
 <embed href="text/swriter/01/02110000.xhp#navigator"/>
 <embed href="text/shared/01/04180100.xhp#data_sources"/>