tdf#149301 Update Navigator terminology

+ Refactor, simplification of <switch>
+ Removed duplicated hid bookmark for Contents
+ Update icons and <alt> text
+ added some of the comments of tdf#178755

Change-Id: Ifaba80d212828e47d99275a9b0a1681eb3bc3430
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136105
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 41e784bd1c10bec247cb35db1cb86ec657cdff77)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136123

4 files changed, 59 insertions, 86 deletions

diff --git a/source/text/scalc/01/02110000.xhp b/source/text/scalc/01/02110000.xhp
index 10775b4329..f566781ee6 100644
--- a/source/text/scalc/01/02110000.xhp
+++ b/source/text/scalc/01/02110000.xhp
@@ -35,7 +35,7 @@
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/navigatorpanel/NavigatorPanel" id="bm_id3904654" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/navigatorpanel/@@nowidget@@" id="bm_id3904654" localize="false"/>
 
-<paragraph role="heading" id="hd_id3150791" xml-lang="en-US" level="1"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link></paragraph>
+<h1 id="hd_id3150791"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link></h1>
 <paragraph role="paragraph" id="par_id3156422" xml-lang="en-US"><ahelp hid=".uno:Navigator">Activates and deactivates the Navigator.</ahelp> The Navigator is a <link href="text/shared/00/00000005.xhp#docking" name="dockable window">dockable window</link>.</paragraph>
 </section>
 <section id="howtoget">
@@ -44,19 +44,19 @@
 <embed href="text/shared/guide/navigator.xhp#navigator"/>
 <paragraph role="paragraph" id="par_id3145271" xml-lang="en-US">Choose <emph>View - Navigator</emph> to display the Navigator.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/navigatorpanel/column" id="bm_id3163713" localize="false"/>
-<paragraph role="heading" id="hd_id3159155" xml-lang="en-US" level="2">Column</paragraph>
+<h2 id="hd_id3159155">Column</h2>
 <paragraph role="paragraph" id="par_id3146984" xml-lang="en-US"><ahelp hid="modules/scalc/ui/navigatorpanel/column">Enter the column letter. Press Enter to reposition the cell cursor to the specified column in the same row.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/navigatorpanel/row" id="bm_id3156286" localize="false"/>
-<paragraph role="heading" id="hd_id3147126" xml-lang="en-US" level="2">Row</paragraph>
+<h2 id="hd_id3147126">Row</h2>
 <paragraph role="paragraph" id="par_id3149958" xml-lang="en-US"><ahelp hid="modules/scalc/ui/navigatorpanel/row">Enter a row number. Press Enter to reposition the cell cursor to the specified row in the same column.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/navigatorpanel/datarange" id="bm_id3149123" localize="false"/>
-<paragraph role="heading" id="hd_id3150717" xml-lang="en-US" level="2">Data Range</paragraph>
+<h2 id="hd_id3150717">Data Range</h2>
 <paragraph role="paragraph" id="par_id3150752" xml-lang="en-US"><ahelp hid="modules/scalc/ui/navigatorpanel/datarange">Specifies the current data range denoted by the position of the cell cursor.</ahelp></paragraph>
 <table id="tbl_id3154754">
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159264" xml-lang="en-US">
-<image id="img_id3147338" src="cmd/sc_grid.png" width="0.2228in" height="0.2228in"><alt id="alt_id3147338" xml-lang="en-US">Icon</alt>
+<image id="img_id3147338" src="cmd/lc_dataranges.svg" width="1cm" height="1cm"><alt id="alt_id3147338" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -66,13 +66,13 @@
 </table>
 
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/navigatorpanel/start" id="bm_id3155111" localize="false"/>
-<paragraph role="heading" id="hd_id3148488" xml-lang="en-US" level="2">Start</paragraph>
+<h2 id="hd_id3148488">Start</h2>
 <paragraph role="paragraph" id="par_id3150086" xml-lang="en-US"><ahelp hid="modules/scalc/ui/navigatorpanel/start">Moves to the cell at the beginning of the current data range, which you can highlight using the <emph>Data Range</emph> button.</ahelp></paragraph>
 <table id="tbl_id3150306">
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3152994" xml-lang="en-US">
-<image id="img_id3150515" src="sw/res/sc20186.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150515" xml-lang="en-US">Icon</alt>
+<image id="img_id3150515" src="cmd/lc_prevrecord.svg" width="1cm" height="1cm"><alt id="alt_id3150515" xml-lang="en-US">Icon Start</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -82,14 +82,13 @@
 </table>
 
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/navigatorpanel/end" id="bm_id3156449" localize="false"/>
-<paragraph role="heading" id="hd_id3146982" xml-lang="en-US" level="2">End</paragraph>
+<h2 id="hd_id3146982">End</h2>
 <paragraph role="paragraph" id="par_id3152985" xml-lang="en-US"><ahelp hid="modules/scalc/ui/navigatorpanel/end">Moves to the cell at the end of the current data range, which you can highlight using the <emph>Data Range</emph> button.</ahelp></paragraph>
 <table id="tbl_id3152901">
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159170" xml-lang="en-US">
-<image id="img_id3148871" src="sw/res/sc20175.png" width="0.2228in" height="0.2228in"><alt id="alt_id3148871" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
+<image id="img_id3148871" src="cmd/lc_nextrecord.svg" width="1cm" height="1cm"><alt id="alt_id3148871" xml-lang="en-US">Icon End</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id3147072" xml-lang="en-US">End</paragraph>
@@ -97,15 +96,13 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/navigatorpanel/datarange" id="bm_id3155269" localize="false"/>
-<paragraph role="heading" id="hd_id3150107" xml-lang="en-US" level="2">Toggle</paragraph>
-<paragraph role="paragraph" id="par_id3159098" xml-lang="en-US"><ahelp hid="modules/scalc/ui/navigatorpanel/datarange">Toggles the content view. Only the selected Navigator element and its subelements are displayed.</ahelp> Click the icon again to restore all elements for viewing.</paragraph>
+<h2 id="hd_id3150107">Toggle</h2>
+<paragraph role="paragraph" id="par_id3159098" xml-lang="en-US">Toggles the content view. Only the selected Navigator element and its subelements are displayed. Click the icon again to restore all elements for viewing.</paragraph>
 <table id="tbl_id3153973">
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3152869" xml-lang="en-US">
-<image id="img_id3149126" src="sw/res/sc20244.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149126" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
+<image id="img_id3149126" src="sw/res/sc20244.svg" width="1cm" height="1cm"><alt id="alt_id3149126" xml-lang="en-US">Icon Toggle</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id3159229" xml-lang="en-US">Toggle</paragraph>
@@ -113,31 +110,14 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/navigatorpanel/toggle" id="bm_id3154654" localize="false"/>
-<paragraph role="heading" id="hd_id3149381" xml-lang="en-US" level="2">Contents</paragraph>
-<paragraph role="paragraph" id="par_id3150051" xml-lang="en-US"><ahelp hid="modules/scalc/ui/navigatorpanel/toggle">Allows you to hide/show the contents.</ahelp></paragraph>
-<table id="tbl_id3153811">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155597" xml-lang="en-US">
-<image id="img_id3154738" src="sw/res/sc20233.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154738" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150955" xml-lang="en-US">Contents</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/navigatorpanel/scenarios" id="bm_id3145115" localize="false"/>
-<paragraph role="heading" id="hd_id3147244" xml-lang="en-US" level="2">Scenarios</paragraph>
+<h2 id="hd_id3147244">Scenarios</h2>
 <paragraph role="paragraph" id="par_id3153955" xml-lang="en-US"><ahelp hid="modules/scalc/ui/navigatorpanel/scenarios">Displays all available scenarios. Double-click a name to apply that scenario.</ahelp> The result is shown in the sheet. For more information, choose <link href="text/scalc/01/06050000.xhp" name="Tools - Scenarios"><emph>Tools - Scenarios</emph></link>.</paragraph>
 <table id="tbl_id3147405">
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3148745" xml-lang="en-US">
-<image id="img_id3159256" src="sc/res/na07.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159256" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
+<image id="img_id3159256" src="cmd/sc_thesaurus.svg" width="1cm" height="1cm"><alt id="alt_id3159256" xml-lang="en-US">Icon Scenarios</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id3166466" xml-lang="en-US">Scenarios</paragraph>
@@ -147,20 +127,19 @@
 
 <paragraph role="paragraph" id="par_idN10A6C" xml-lang="en-US">If the Navigator displays scenarios, you can access the following commands when you right-click a scenario entry:</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/scenariomenu/delete" id="bm_id1900997" localize="false"/>
-<paragraph role="heading" id="par_idN10A77" xml-lang="en-US" level="3">Delete</paragraph>
+<h3 id="par_idN10A77">Delete</h3>
 <paragraph role="paragraph" id="par_idN10A7B" xml-lang="en-US"><ahelp hid="modules/scalc/ui/scenariomenu/delete">Deletes the selected scenario.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/scenariomenu/edit" id="bm_id4495376" localize="false"/>
-<paragraph role="heading" id="par_idN10A92" xml-lang="en-US" level="3">Properties</paragraph>
+<h3 id="par_idN10A92">Properties</h3>
 <paragraph role="paragraph" id="par_idN10A96" xml-lang="en-US"><ahelp hid="modules/scalc/ui/scenariomenu/edit">Opens the <link href="text/scalc/01/06050000.xhp">Edit scenario</link> dialog, where you can edit the scenario properties.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/navigatorpanel/dragmode" id="bm_id3157871" localize="false"/>
-<paragraph role="heading" id="hd_id3150037" xml-lang="en-US" level="2">Drag Mode</paragraph>
+<h2 id="hd_id3150037">Drag Mode</h2>
 <paragraph role="paragraph" id="par_id3157876" xml-lang="en-US"><ahelp hid="modules/scalc/ui/navigatorpanel/dragmode">Opens a submenu for selecting the drag mode. You decide which action is performed when dragging and dropping an object from the Navigator into a document. Depending on the mode you select, the icon indicates whether a hyperlink, link or a copy is created.</ahelp></paragraph>
 <table id="tbl_id3153118">
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3149947" xml-lang="en-US">
-<image id="img_id3159119" src="cmd/sc_chainframes.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159119" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
+<image id="img_id3159119" src="cmd/lc_chainframes.svg" width="1cm" height="1cm"><alt id="alt_id3159119" xml-lang="en-US">Icon Drag Mode</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150656" xml-lang="en-US">Drag Mode</paragraph>
@@ -169,20 +148,20 @@
 </table>
 
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/dropmenu/hyperlink" id="bm_id3146876" localize="false"/>
-<paragraph role="heading" id="hd_id3149009" xml-lang="en-US" level="3">Insert as Hyperlink</paragraph>
+<h3 id="hd_id3149009">Insert as Hyperlink</h3>
 <paragraph role="paragraph" id="par_id3146938" xml-lang="en-US"><ahelp hid="modules/scalc/ui/dropmenu/hyperlink">Inserts a hyperlink when you drag-and-drop an object from the Navigator into a document.</ahelp> You can later click the created hyperlink to set the cursor and the view to the respective object. </paragraph>
-<paragraph role="note" id="par_id3880733" xml-lang="en-US">If you insert a hyperlink that links to an open document, you need to save the document before you can use the hyperlink.<comment>UFI: fixes bugtraq 5009354</comment></paragraph>
+<note id="par_id3880733">If you insert a hyperlink that links to an open document, you need to save the document before you can use the hyperlink.</note>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/dropmenu/link" id="bm_id3150740" localize="false"/>
-<paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="3">Insert as Link</paragraph>
+<h3 id="hd_id3154682">Insert as Link</h3>
 <paragraph role="paragraph" id="par_id3150746" xml-lang="en-US"><ahelp hid="modules/scalc/ui/dropmenu/link">Creates a link when you drag-and-drop an object from the Navigator into a document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/dropmenu/copy" id="bm_id3154846" localize="false"/>
-<paragraph role="heading" id="hd_id3145824" xml-lang="en-US" level="3">Insert as Copy</paragraph>
+<h3 id="hd_id3145824">Insert as Copy</h3>
 <paragraph role="paragraph" id="par_id3147471" xml-lang="en-US"><ahelp hid="modules/scalc/ui/dropmenu/copy">Generates a copy when you drag-and-drop an object from the Navigator into a document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/navigatorpanel/contentbox" id="bm_id3150695" localize="false"/>
-<paragraph role="heading" id="hd_id3147423" xml-lang="en-US" level="2">Objects</paragraph>
+<h2 id="hd_id3147423">Objects</h2>
 <paragraph role="paragraph" id="par_id3150700" xml-lang="en-US"><ahelp hid="modules/scalc/ui/navigatorpanel/contentbox">Displays all objects in your document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/navigatorpanel/documents" id="bm_id3152785" localize="false"/>
-<paragraph role="heading" id="hd_id3150860" xml-lang="en-US" level="2">Documents</paragraph>
+<h2 id="hd_id3150860">Documents</h2>
 <paragraph role="paragraph" id="par_id3153929" xml-lang="en-US"><ahelp hid="modules/scalc/ui/navigatorpanel/documents">Displays the names of all open documents.</ahelp> To switch to another open document in the Navigator, click the document name. The status (active, inactive) of the document is shown in brackets after the name. You can switch the active document in the <emph>Window</emph> menu.</paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/guide/navigator.xhp b/source/text/shared/guide/navigator.xhp
index 5052e74435..467dd52b14 100644
--- a/source/text/shared/guide/navigator.xhp
+++ b/source/text/shared/guide/navigator.xhp
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,7 +16,6 @@
  *   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="textsharedguidenavigatorxml" indexer="include" status="PUBLISH">
@@ -33,30 +30,25 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147008"><bookmark_value>documents; contents as lists</bookmark_value>
 <bookmark_value>Navigator; contents as lists</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="1"><variable id="navigator"><link href="text/shared/guide/navigator.xhp" name="Navigator for Document Overview">Navigator for Document Overview</link>
-</variable></paragraph>
+<h1 id="hd_id3147008"><variable id="navigator"><link href="text/shared/guide/navigator.xhp" name="Navigator for Document Overview">Navigator for Document Overview</link>
+</variable></h1>
 <paragraph role="paragraph" id="par_id3154823" xml-lang="en-US">All contents of the Navigator window are referred to here as "categories," whether headings, sheets, tables, frames, graphics, OLE objects, sections, hyperlinks, references, indexes, comments, or drawing objects.</paragraph>
 <paragraph role="paragraph" id="par_id3153662" xml-lang="en-US">The Navigator displays types of objects contained in a document. If a plus sign appears next to a category, this indicates that at least one object of this kind exists. If you rest the mouse pointer on the category name, the number of objects is displayed in an extended tip.</paragraph>
-<paragraph role="paragraph" id="par_id3146797" xml-lang="en-US">Open a category by clicking on the plus sign. If you only want to view the entries in a certain category, select the category and click the <emph>Content View</emph> icon. Until you click the icon again, only the objects of this category will be displayed.</paragraph>
+<paragraph role="paragraph" id="par_id3146797" xml-lang="en-US">Open a category by clicking on the plus sign. If you only want to view the entries in a certain category, select the category and click the <emph>Content Navigation View</emph> icon. Until you click the icon again, only the objects of this category will be displayed.</paragraph>
 <paragraph role="paragraph" id="par_id3166461" xml-lang="en-US">You may dock the Navigator to any document border or turn it back into a free window (double click on the gray area). You can change the size of the Navigator when it is a free window.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
+<section id="relatedtopics">
 <embed href="text/shared/guide/navigator_setcursor.xhp#navigator_setcursor"/>
 <embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
 <switch select="appl">
-<case select="CALC"><embed href="text/scalc/guide/format_table.xhp#format_table"/>
-</case>
-</switch>
-<switch select="appl">
-<case select="WRITER"><embed href="text/swriter/guide/arrange_chapters.xhp#arrange_chapters"/>
-</case>
-</switch>
-<switch select="appl">
-<case select="WRITER"><embed href="text/swriter/guide/hyperlinks.xhp#hyperlinks"/>
-</case>
-</switch>
-<switch select="appl">
-<case select="WRITER"><embed href="text/swriter/guide/navigator.xhp#navigator"/>
-</case>
+    <case select="CALC">
+        <embed href="text/scalc/guide/format_table.xhp#format_table"/>
+    </case>
+    <case select="WRITER">
+        <embed href="text/swriter/guide/arrange_chapters.xhp#arrange_chapters"/>
+        <embed href="text/swriter/guide/hyperlinks.xhp#hyperlinks"/>
+        <embed href="text/swriter/guide/navigator.xhp#navigator"/>
+    </case>
 </switch>
+</section>
 </body>
 </helpdocument>
diff --git a/source/text/swriter/01/02110000.xhp b/source/text/swriter/01/02110000.xhp
index 0cc884faf7..ce0153ae9b 100644
--- a/source/text/swriter/01/02110000.xhp
+++ b/source/text/swriter/01/02110000.xhp
@@ -39,9 +39,11 @@
 <embed href="text/shared/00/edit_menu.xhp#navigator"/>
 </section>
 <paragraph id="par_id3154475" role="paragraph" xml-lang="en-US">To open the Navigator, choose <menuitem>View - Navigator</menuitem> (<keycode>F5</keycode>). To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left, right or bottom edge of the workspace. To undock the Navigator, hold down the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> key and double-click on a grey area of the Navigator.</paragraph>
-<paragraph id="par_id3149490" role="paragraph" xml-lang="en-US">Click the plus sign (<widget>+</widget>) (or arrow) next to a category in the Navigator to view the items in the category. To view the number of items in a category, rest your mouse pointer over the category in the Navigator. To jump to an item in the document, double-click the item in the Navigator.</paragraph>
+<paragraph id="par_id3149490" role="paragraph" xml-lang="en-US">Click the expander icon next to a category in the Navigator to view the items in the category. To view the number of items in a category, rest your mouse pointer over the category in the Navigator. To jump to an item in the document, double-click the item in the Navigator.</paragraph>
 <paragraph id="par_id3149106" role="paragraph" xml-lang="en-US">To jump to the next or previous item in a document, use the <emph>Navigate by</emph> box to select the item category, and then click the up or down arrows.</paragraph>
 
+<paragraph role="paragraph" id="par_id571655653825780">The navigator shows what corresponds to the editing location in the navigator view. This can be according to different categories: Headings, Tables, Hyperlinks and so on. When the "Content Navigation View" button is pressed and headings are selected, the heading belonging to the current editing position is displayed and highlighted in the Navigator. When tables are selected, the associated table is displayed, and so on. If the element is located in a collapsed layer, the required layers above it are automatically expanded and remain expanded afterwards.</paragraph>
+
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/navigatorpanel/contenttoggle" id="bm_id3155911" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/navigatorpanel/globaltoggle" id="bm_id3155912" localize="false"/>
 
@@ -52,12 +54,12 @@
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/navigatorpanel/back" id="bm_id3148779" localize="false"/>
 
 <h2 id="hd_id3150096">Previous</h2>
-<paragraph id="par_id3148784" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Jumps to the previous item in the document. To specify the type of item to jump to, click the <emph>Navigation</emph> icon, and then click an item category - for example, "Images".</ahelp> Jump to the previous item in the document, as specified in <emph>Navigate By</emph>.</paragraph>
+<paragraph id="par_id3148784" role="paragraph" xml-lang="en-US">Jumps to the previous item in the document. To specify the type of item to jump to, click the <emph>Navigate By</emph> list, and then click an item category - for example, "Images".</paragraph>
 
 <table id="tbl_id3150044">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3154616" role="paragraph" xml-lang="en-US"> <image id="img_id3154622" src="cmd/sc_upsearch.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3154622">Icon Previous Object</alt></image></paragraph>
+      <paragraph id="par_id3154616" role="paragraph" xml-lang="en-US"> <image id="img_id3154622" src="cmd/lc_upsearch.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3154622">Icon Previous Object</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3150659" role="paragraph" xml-lang="en-US">Previous Item</paragraph>
@@ -68,12 +70,12 @@
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/navigatorpanel/forward" id="bm_id3154022" localize="false"/>
 
 <h2 id="hd_id3150675">Next</h2>
-<paragraph id="par_id3154028" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Jumps to the next item in the document. To specify the type of item to jump to, click the <link href="text/swriter/01/02110100.xhp" name="Navigation"><emph>Navigation</emph></link> icon, and then click an item category - for example, "Images".</ahelp> Jump to the next item in the document, as specified in <emph>Navigate By</emph>.</paragraph>
+<paragraph id="par_id3154028" role="paragraph" xml-lang="en-US">Jumps to the next item in the document. To specify the type of item to jump to, click the <emph>Navigate By</emph> list, and then click an item category - for example, "Images".</paragraph>
 
 <table id="tbl_id3149971">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3150767" role="paragraph" xml-lang="en-US"> <image id="img_id3150773" src="cmd/sc_downsearch.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3150773">Icon Next Object</alt></image></paragraph>
+      <paragraph id="par_id3150767" role="paragraph" xml-lang="en-US"> <image id="img_id3150773" src="cmd/lc_downsearch.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3150773">Icon Next Object</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3155359" role="paragraph" xml-lang="en-US">Next Item</paragraph>
@@ -85,16 +87,16 @@
 <h2 id="hd_id3148715">Page number</h2>
 <paragraph id="par_id3155548" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/navigatorpanel/numericfield">Type the number of the page that you want to jump to, and then press Enter. Use the spin buttons to navigate.</ahelp></paragraph>
 
-<h2 id="hd_id3146891">Content View</h2>
+<h2 id="hd_id3146891">Content Navigation View</h2>
 <paragraph id="par_id3145596" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/navigatorpanel/root">Switches between the display of all categories in the Navigator and the selected category.</ahelp></paragraph>
 <paragraph id="par_id471603110016087" role="paragraph">Context menus use a selection of commands found on this help page. The commands in a context menu change, depending on which category or item is selected.</paragraph>
 <table id="tbl_id3145616">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3154133" role="paragraph" xml-lang="en-US"> <image id="img_id3154140" src="sw/res/sc20244.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3154140">Icon Switch Content View</alt></image></paragraph>
+      <paragraph id="par_id3154133" role="paragraph" xml-lang="en-US"> <image id="img_id3154140" src="sw/res/sc20244.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3154140">Icon Switch Content Navigation View</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph id="par_id3156067" role="paragraph" xml-lang="en-US">Switch Content View</paragraph>
+      <paragraph id="par_id3156067" role="paragraph" xml-lang="en-US">Switch Content Navigation View</paragraph>
     </tablecell>
   </tablerow>
 </table>
@@ -113,7 +115,7 @@
       </tablerow>
       <tablerow>
       <tablecell>
-        <paragraph role="image" id="par_id721603290925895"><image src="sw/res/nc20000.png" id="img_id1001603290925895" width="1cm" height="1cm"><alt id="alt_id591603290925895">Headings Icon</alt></image></paragraph>
+        <paragraph role="image" id="par_id721603290925895"><image src="sw/res/nc20000.svg" id="img_id1001603290925895" width="1cm" height="1cm"><alt id="alt_id591603290925895">Headings Icon</alt></image></paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id581603287134620" role="tablecontent">Headings</paragraph>
@@ -287,7 +289,7 @@
       <tablerow>
       <tablecell>
         <paragraph role="paragraph" id="par_id951603571856944">
-<image src="cmd/sc_insertdraw.png" id="img_id221603571856944" width="1cm" height="1cm"><alt id="alt_id751603571856944">Drawing objects Icon</alt></image></paragraph>
+<image src="cmd/lc_insertdraw.svg" id="img_id221603571856944" width="1cm" height="1cm"><alt id="alt_id751603571856944">Drawing objects Icon</alt></image></paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id351603571856944" role="tablecontent">Drawing objects</paragraph>
@@ -320,7 +322,7 @@
 <table id="tbl_id3155861">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3150689" role="paragraph" xml-lang="en-US"> <image id="img_id3150695" src="sw/res/sc20244.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3150695">Icon Toggle Master View</alt></image></paragraph>
+      <paragraph id="par_id3150689" role="paragraph" xml-lang="en-US"> <image id="img_id3150695" src="sw/res/sc20244.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3150695">Icon Toggle Master View</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3149568" role="paragraph" xml-lang="en-US">Toggle Master View</paragraph>
@@ -399,7 +401,7 @@
 <table id="tbl_id3147535">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3153588" role="paragraph" xml-lang="en-US"> <image id="img_id3153595" src="sw/res/sc20236.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3153595">Icon Outline level</alt></image></paragraph>
+      <paragraph id="par_id3153588" role="paragraph" xml-lang="en-US"> <image id="img_id3153595" src="sw/res/sc20236.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3153595">Icon Outline level</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3145554" role="paragraph" xml-lang="en-US">Outline level</paragraph>
@@ -437,7 +439,7 @@
 <table id="tbl_id3148898">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3155414" role="paragraph" xml-lang="en-US"> <image id="img_id3155420" src="sw/res/sc20172.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3155420">Icon Promote level</alt></image></paragraph>
+      <paragraph id="par_id3155414" role="paragraph" xml-lang="en-US"> <image id="img_id3155420" src="sw/res/sc20172.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3155420">Icon Promote level</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3153697" role="paragraph" xml-lang="en-US">Promote level</paragraph>
@@ -453,7 +455,7 @@
 <table id="tbl_id3150746">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3148414" role="paragraph" xml-lang="en-US"> <image id="img_id3148420" src="sw/res/sc20173.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3148420">Icon Demote level</alt></image></paragraph>
+      <paragraph id="par_id3148414" role="paragraph" xml-lang="en-US"> <image id="img_id3148420" src="sw/res/sc20173.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3148420">Icon Demote level</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3147324" role="paragraph" xml-lang="en-US">Demote level</paragraph>
@@ -469,7 +471,7 @@
 <table id="tbl_id3151301">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3153268" role="paragraph" xml-lang="en-US"> <image id="img_id3153275" src="cmd/sc_upsearch.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3153275">Icon Chapter Up</alt></image></paragraph>
+      <paragraph id="par_id3153268" role="paragraph" xml-lang="en-US"> <image id="img_id3153275" src="cmd/lc_upsearch.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3153275">Icon Chapter Up</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3149147" role="paragraph" xml-lang="en-US">Chapter Up</paragraph>
@@ -485,7 +487,7 @@
 <table id="tbl_id3153737">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3153768" role="paragraph" xml-lang="en-US"> <image id="img_id3150828" src="cmd/sc_downsearch.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3150828">Icon Chapter down</alt></image></paragraph>
+      <paragraph id="par_id3153768" role="paragraph" xml-lang="en-US"> <image id="img_id3150828" src="cmd/lc_downsearch.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3150828">Icon Chapter down</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3150870" role="paragraph" xml-lang="en-US">Chapter down</paragraph>
diff --git a/source/text/swriter/guide/arrange_chapters.xhp b/source/text/swriter/guide/arrange_chapters.xhp
index 33d20a21cd..839cf20b99 100644
--- a/source/text/swriter/guide/arrange_chapters.xhp
+++ b/source/text/swriter/guide/arrange_chapters.xhp
@@ -48,10 +48,10 @@
 
 <list type="ordered">
   <listitem>
-    <paragraph id="par_id3151206" role="listitem" xml-lang="en-US">On the <emph>Standard Bar</emph>, click the <emph>Navigator</emph> icon <image id="img_id5211883" src="cmd/sc_navigator.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id5211883">Icon navigator</alt></image> to open the <emph>Navigator</emph>.</paragraph>
+    <paragraph id="par_id3151206" role="listitem" xml-lang="en-US">On the <emph>Standard Bar</emph>, click the <emph>Navigator</emph> icon <image id="img_id5211883" src="cmd/sc_navigator.svg" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id5211883">Icon navigator</alt></image> to open the <emph>Navigator</emph>.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3151238" role="listitem" xml-lang="en-US">On the <emph>Navigator</emph>, click the <emph>Content View</emph> icon <image id="img_id3156338" src="sw/res/sc20244.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3156338">Icon content view</alt></image>.</paragraph>
+    <paragraph id="par_id3151238" role="listitem" xml-lang="en-US">On the <emph>Navigator</emph>, click the <emph>Content Navigation View</emph> icon <image id="img_id3156338" src="sw/res/sc20244.svg" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3156338">Icon Content Navigation View</alt></image>.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id3155089" role="listitem" xml-lang="en-US">Do one of the following:</paragraph>
@@ -63,7 +63,7 @@
     <paragraph id="par_id3155114" role="listitem" xml-lang="en-US">Drag a heading to a new location in the <emph>Navigator</emph> list.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3155139" role="listitem" xml-lang="en-US">Click a heading in the <emph>Navigator</emph> list, and then click the <emph>Promote Chapter</emph> <image id="img_id4217546" src="sw/res/sc20174.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id4217546">Icon promote</alt></image> or <emph>Demote Chapter</emph> icon <image id="img_id6505788" src="sw/res/sc20171.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id6505788">Icon demote</alt></image>.</paragraph>
+    <paragraph id="par_id3155139" role="listitem" xml-lang="en-US">Click a heading in the <emph>Navigator</emph> list, and then click the <emph>Promote Chapter</emph> <image id="img_id4217546" src="sw/res/sc20174.svg" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id4217546">Icon promote</alt></image> or <emph>Demote Chapter</emph> icon <image id="img_id6505788" src="sw/res/sc20171.svg" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id6505788">Icon demote</alt></image>.</paragraph>
   </listitem>
 </list>
 <note id="par_id3145758">To move the heading without the subordinate text, hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you drag or click the <emph>Promote Chapter</emph> or <emph>Demote Chapter</emph> icons.</note>
@@ -75,7 +75,7 @@
     <paragraph id="par_id3155424" role="listitem" xml-lang="en-US">Select the heading in the <emph>Navigator</emph> list.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_idN1081C" role="listitem" xml-lang="en-US">Click the <emph>Promote Level</emph> <image id="img_id5564488" src="sw/res/sc20172.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id5564488">Icon promote level</alt></image> or <emph>Demote Level</emph> icon <image id="img_id3159363" src="sw/res/sc20173.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3159363">Icon demote level</alt></image>.</paragraph>
+    <paragraph id="par_idN1081C" role="listitem" xml-lang="en-US">Click the <emph>Promote Level</emph> <image id="img_id5564488" src="sw/res/sc20172.svg" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id5564488">Icon promote level</alt></image> or <emph>Demote Level</emph> icon <image id="img_id3159363" src="sw/res/sc20173.svg" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3159363">Icon demote level</alt></image>.</paragraph>
   </listitem>
 </list>