Update Draw menus and Contents tree (part)

Change-Id: I556a2cafdd66fc425aa67f821c1a5b676ef22c81
Reviewed-on: https://gerrit.libreoffice.org/77677
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

5 files changed, 73 insertions, 176 deletions

diff --git a/source/text/simpress/01/02110000.xhp b/source/text/simpress/01/02110000.xhp
index c60ee23843..71f0186357 100644
--- a/source/text/simpress/01/02110000.xhp
+++ b/source/text/simpress/01/02110000.xhp
@@ -46,74 +46,77 @@
 <paragraph role="tip" id="par_id3156448" xml-lang="en-US">Press <item type="keycode">Ctrl+Shift+F5</item> to open the Navigator when you are editing a presentation.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD_HID_SD_NAVIGATOR_TBI_PEN" id="bm_id3150538" localize="false"/><paragraph role="heading" id="hd_id3145235" xml-lang="en-US" level="2">Pointer</paragraph>
 <paragraph role="paragraph" id="par_id3157874" xml-lang="en-US"><ahelp hid="HID_SD_NAVIGATOR_TBI_PEN">Switches the mouse pointer to a pen that you can use to write on slides during a slide show.</ahelp> You cannot change the color of the pen.</paragraph>
+
+
+
 <table id="tbl_id3150651">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3148729" xml-lang="en-US">
-<image id="img_id3153034" src="sd/res/nv02.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153034" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
+<image id="img_id3153034" src="sd/res/nv02.png" width="0.222inch" height="0.222inch"><alt id="alt_id3153034" xml-lang="en-US">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3150862" xml-lang="en-US">Pointer</paragraph>
 </tablecell>
 </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/first" id="bm_id3153110" localize="false"/><paragraph role="heading" id="hd_id3152999" xml-lang="en-US" level="2">First Slide</paragraph>
-<paragraph role="paragraph" id="par_id3153564" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/first">Jumps to the first slide in the slide show.</ahelp></paragraph>
-<table id="tbl_id3154501">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3155925" xml-lang="en-US">
-<image id="img_id3155931" src="cmd/sc_firstrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155931" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145246" xml-lang="en-US">First Page</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/previous" id="bm_id3148390" localize="false"/><paragraph role="heading" id="hd_id3156061" xml-lang="en-US" level="2">Previous Slide</paragraph>
-<paragraph role="paragraph" id="par_id3148768" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/previous">Moves back one slide in the slide show.</ahelp></paragraph>
-<table id="tbl_id3150265">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153045" xml-lang="en-US">
-<image id="img_id3157976" src="cmd/sc_prevrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3157976" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3150473" xml-lang="en-US">Previous Slide</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/next" id="bm_id3155988" localize="false"/><paragraph role="heading" id="hd_id3155369" xml-lang="en-US" level="2">Next Slide</paragraph>
-<paragraph role="paragraph" id="par_id3153920" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/next">Move forward one slide in the slide show.</ahelp></paragraph>
-<table id="tbl_id3155401">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3083279" xml-lang="en-US">
-<image id="img_id3083286" src="cmd/sc_nextrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3083286" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149454" xml-lang="en-US">Next Slide</paragraph>
-</tablecell>
-</tablerow>
-</table>
-<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/last" id="bm_id3145208" localize="false"/><paragraph role="heading" id="hd_id3150762" xml-lang="en-US" level="2">Last Slide</paragraph>
-<paragraph role="paragraph" id="par_id3147564" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/last">Jumps to the last slide in the slide show.</ahelp></paragraph>
-<table id="tbl_id3152935">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3151183" xml-lang="en-US">
-<image id="img_id3156315" src="cmd/sc_lastrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156315" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154055" xml-lang="en-US">Last Slide</paragraph>
-</tablecell>
-</tablerow>
-</table>
+
+<section id="pagenavigation">
+    <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/first" id="bm_id3153110" localize="false"/>
+    <h2 id="hd_id3152999">First <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></h2>
+    <paragraph role="paragraph" id="par_id3153564" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/first">Jumps to the first <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</ahelp></paragraph>
+    <table id="tbl_id3154501">
+        <tablerow>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3155925" xml-lang="en-US"><image id="img_id3155931" src="cmd/sc_firstrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155931" xml-lang="en-US">Icon First Slide</alt></image></paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3145246" xml-lang="en-US">First <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+    <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/previous" id="bm_id3148390" localize="false"/>
+    <h2 id="hd_id3156061">Previous <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></h2>
+    <paragraph role="paragraph" id="par_id3148768" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/previous">Moves back one <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</ahelp></paragraph>
+    <table id="tbl_id3150265">
+        <tablerow>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3153045" xml-lang="en-US"><image id="img_id3157976" src="cmd/sc_prevrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3157976" xml-lang="en-US">Icon Previous Slide</alt></image></paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3150473" xml-lang="en-US">Previous <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+    <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/next" id="bm_id3155988" localize="false"/>
+    <h2 id="hd_id3155369">Next <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></h2>
+    <paragraph role="paragraph" id="par_id3153920" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/next">Move forward one <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</ahelp></paragraph>
+    <table id="tbl_id3155401">
+        <tablerow>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3083279" xml-lang="en-US">
+                    <image id="img_id3083286" src="cmd/sc_nextrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3083286" xml-lang="en-US">Icon Next Slide</alt></image></paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3149454" xml-lang="en-US">Next <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+    <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/last" id="bm_id3145208" localize="false"/>
+    <h2 id="hd_id3150762">Last <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></h2>
+    <paragraph role="paragraph" id="par_id3147564" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/last">Jumps to the last <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</ahelp></paragraph>
+    <table id="tbl_id3152935">
+        <tablerow>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3151183" xml-lang="en-US"><image id="img_id3156315" src="cmd/sc_lastrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3156315" xml-lang="en-US">Icon Last Record</alt></image></paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph role="paragraph" id="par_id3154055" xml-lang="en-US">Last <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline></paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
+</section>
+
 <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/navigatorpanel/dragmode" id="bm_id3150258" localize="false"/><paragraph role="heading" id="hd_id3149979" xml-lang="en-US" level="2">Drag Mode</paragraph>
 <paragraph role="paragraph" id="par_id3150264" xml-lang="en-US"><ahelp hid="modules/simpress/ui/navigatorpanel/dragmode">Drag and drop slides and named objects into the active slide.</ahelp> You can only insert slides and named objects from a saved file. You can only insert named objects as copies.</paragraph>
 <table id="tbl_id3149286">
diff --git a/source/text/simpress/01/04020000.xhp b/source/text/simpress/01/04020000.xhp
deleted file mode 100644
index 158d52802f..0000000000
--- a/source/text/simpress/01/04020000.xhp
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   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="textsimpress0104020000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Insert Layer</title>
-<filename>/text/simpress/01/04020000.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertLayer" id="bm_id5317946" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/InsertLayerDialog" id="bm_id3150716" localize="false"/>
-<paragraph role="heading" id="hd_id3151074" xml-lang="en-US" level="1">Insert Layer</paragraph>
-<paragraph role="paragraph" id="par_id3153415" xml-lang="en-US"><variable id="ebenetext"><ahelp hid=".uno:InsertLayer">Inserts a new layer in the document. Layers are only available in Draw, not in Impress. </ahelp>
-</variable></paragraph>
-<section id="howtoget">
-  <embed href="text/simpress/00/00000404.xhp#efgene"/>
-</section>
-<paragraph role="note" id="par_id3150205" xml-lang="en-US">To select a layer, click the corresponding tab at the bottom of the workspace.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/name" id="bm_id3156449" localize="false"/><paragraph role="heading" id="hd_id3145588" xml-lang="en-US" level="2">Name</paragraph>
-<paragraph role="paragraph" id="par_id3149404" xml-lang="en-US"><ahelp hid="modules/sdraw/ui/insertlayer/name">Enter a name for the new layer.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153820" xml-lang="en-US" level="2">Properties</paragraph>
-<paragraph role="paragraph" id="par_id3151240" xml-lang="en-US">Set the properties for the new layer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/visible" id="bm_id3156017" localize="false"/><paragraph role="heading" id="hd_id3149945" xml-lang="en-US" level="3">Visible</paragraph>
-<paragraph role="paragraph" id="par_id3157980" xml-lang="en-US"><ahelp hid="modules/sdraw/ui/insertlayer/visible">Show or hide the layer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/printable" id="bm_id3150046" localize="false"/><paragraph role="heading" id="hd_id3153246" xml-lang="en-US" level="3">Printable</paragraph>
-<paragraph role="paragraph" id="par_id3154762" xml-lang="en-US"><ahelp hid="modules/sdraw/ui/insertlayer/printable">When printing, print or ignore this particular layer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertlayer/locked" id="bm_id3149870" localize="false"/><paragraph role="heading" id="hd_id3146965" xml-lang="en-US" level="3">Locked</paragraph>
-<paragraph role="paragraph" id="par_id3149876" xml-lang="en-US"><ahelp hid="modules/sdraw/ui/insertlayer/locked">Prevent elements on the layer from being edited.</ahelp></paragraph>
-</body>
-</helpdocument>
diff --git a/source/text/simpress/01/04110000.xhp b/source/text/simpress/01/04110000.xhp
index 771e681855..dc39d1de89 100644
--- a/source/text/simpress/01/04110000.xhp
+++ b/source/text/simpress/01/04110000.xhp
@@ -18,7 +18,7 @@
  *   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="textsimpress0104110000xml" indexer="include" status="PUBLISH">
@@ -35,9 +35,12 @@
 <bookmark_value>HTML; inserting files</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:ImportFromFile" id="bm_id3867585" localize="false"/>
-<paragraph role="heading" id="hd_id3153728" xml-lang="en-US" level="1"><link href="text/simpress/01/04110000.xhp" name="Insert File">Insert File</link></paragraph>
-<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US"><variable id="dateitext"><ahelp hid=".uno:ImportFromFile">Inserts a file into the active slide. You can insert $[officename] Draw or Impress files, or text from an HTML document or a text file.</ahelp>
-</variable> If you have an active internet connection, you can also insert text from a web page by entering its URL in the <emph>File name </emph>box.</paragraph>
+
+<section id="insertfile">
+<h1 id="hd_id3153728"><link href="text/simpress/01/04110000.xhp" name="Insert File">Insert File</link></h1>
+<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US"><variable id="dateitext"><ahelp hid=".uno:ImportFromFile">Inserts a file into the active <switchinline select="appl"><caseinline select="IMPRESS">slide</caseinline><defaultinline>page</defaultinline></switchinline>. You can insert $[officename] Draw or Impress files, or text from an HTML document or a text file.</ahelp></variable> If you have an active internet connection, you can also insert text from a web page by entering its URL in the <emph>File name </emph>box.</paragraph>
+</section>
+
 <section id="howtoget">
 <embed href="text/simpress/00/00000404.xhp#efgdti"/>
 </section>
diff --git a/source/text/simpress/01/04110100.xhp b/source/text/simpress/01/04110100.xhp
index c37ae35fe3..5785442a61 100644
--- a/source/text/simpress/01/04110100.xhp
+++ b/source/text/simpress/01/04110100.xhp
@@ -37,8 +37,10 @@
 <bookmark_value>inserting; slides as links</bookmark_value>
 <bookmark_value>backgrounds; deleting unused</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3146976" xml-lang="en-US" level="1">Insert Slides/Objects</paragraph>
+<section id="insertslidepageobject">
+    <h1 id="hd_id3146976"><link href="text/simpress/01/04110100.xhp" name="Insert page">Insert <switchinline select="appl"><caseinline select="IMPRESS">Slide</caseinline><defaultinline>Page</defaultinline></switchinline>/Objects from File</link></h1>
 <paragraph role="paragraph" id="par_id3151073" xml-lang="en-US">Allows you to insert the entire file or specific elements in the file.</paragraph>
+</section>
 <section id="howtoget">
   <embed href="text/simpress/00/00000404.xhp#efgdti"/>
 </section>
diff --git a/source/text/simpress/01/05140000.xhp b/source/text/simpress/01/05140000.xhp
deleted file mode 100644
index 636c4a554b..0000000000
--- a/source/text/simpress/01/05140000.xhp
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   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="textsimpress0105140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Modify Layer</title>
-<filename>/text/simpress/01/05140000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156329"><bookmark_value>renaming layers</bookmark_value>
-<bookmark_value>layers; renaming</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:ModifyLayer" id="bm_id3156326" localize="false"/>
-<paragraph role="heading" id="hd_id3156329" xml-lang="en-US" level="1">Modify Layer</paragraph>
-<paragraph role="paragraph" id="par_id3147265" xml-lang="en-US"><variable id="ebene"><ahelp hid=".uno:ModifyLayer">Changes the properties of the selected layer.</ahelp>
-</variable></paragraph>
-<section id="howtoget">
-  <embed href="text/simpress/00/00000405.xhp#adnene"/>
-</section>
-<paragraph role="heading" id="hd_id3155603" xml-lang="en-US" level="2">Name</paragraph>
-<paragraph role="paragraph" id="par_id3155738" xml-lang="en-US">Enter a name for the selected layer.</paragraph>
-<paragraph role="note" id="par_id3149126" xml-lang="en-US">You can only change the name of a layer you created.</paragraph>
-<paragraph role="heading" id="hd_id3147345" xml-lang="en-US" level="2">Properties</paragraph>
-<paragraph role="paragraph" id="par_id3148488" xml-lang="en-US">Sets the properties of the selected layer.</paragraph>
-<paragraph role="heading" id="hd_id3166423" xml-lang="en-US" level="3">Visible</paragraph>
-<paragraph role="paragraph" id="par_id3159239" xml-lang="en-US">Shows or hides the contents of the selected layer.</paragraph>
-<paragraph role="heading" id="hd_id3150208" xml-lang="en-US" level="3">Printable</paragraph>
-<paragraph role="paragraph" id="par_id3152993" xml-lang="en-US">Prints the contents of the selected layer.</paragraph>
-<paragraph role="heading" id="hd_id3145585" xml-lang="en-US" level="3">Protected</paragraph>
-<paragraph role="paragraph" id="par_id3159488" xml-lang="en-US">Locks the contents of the selected layer, so that they cannot be edited.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:RenameLayer" id="bm_id3145387" localize="false"/>
-<paragraph role="heading" id="hd_id3156448" xml-lang="en-US" level="2">Rename Layer</paragraph>
-<paragraph role="paragraph" id="par_id3163801" xml-lang="en-US"><ahelp hid=".uno:RenameLayer">Renames the active layer.</ahelp> You can only change the name of a layer you created.</paragraph>
-</body>
-</helpdocument>