From 0c1a7eba29b4819f15482fa694ed70ab398de74b Mon Sep 17 00:00:00 2001
From: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Date: Thu, 2 May 2019 22:00:06 +0300
Subject: tdf#102265 Decouple some Impress/Draw Slide/Page material

Convenient way to do renames:
find . \( -name '*.xhp' -or -name '*.mk' \) -exec \
sed -i 's/sdraw\/main0104/sdraw\/main_insert/g' {} +

Change-Id: I3a8a59ac57ca3b29219962fc503f1d7ba5230a6d
Reviewed-on: https://gerrit.libreoffice.org/71703
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
---
 AllLangHelp_sdraw.mk                         |  7 +++-
 AllLangHelp_simpress.mk                      |  2 +-
 source/text/sdraw/00/page_menu.xhp           | 52 ++++++++++++++++++++++++
 source/text/sdraw/01/04010000.xhp            | 40 ------------------
 source/text/sdraw/01/new_page.xhp            | 40 ++++++++++++++++++
 source/text/sdraw/01/page_properties.xhp     | 41 +++++++++++++++++++
 source/text/sdraw/main0100.xhp               |  2 +-
 source/text/sdraw/main0104.xhp               | 61 ----------------------------
 source/text/sdraw/main_format.xhp            |  2 -
 source/text/sdraw/main_insert.xhp            | 59 +++++++++++++++++++++++++++
 source/text/sdraw/main_page.xhp              | 43 ++++++++++++++++++++
 source/text/simpress/00/00000404.xhp         |  5 +--
 source/text/simpress/00/slide_menu.xhp       |  8 ++--
 source/text/simpress/01/03070000.xhp         |  4 +-
 source/text/simpress/01/04010000.xhp         | 44 --------------------
 source/text/simpress/01/new_slide.xhp        | 44 ++++++++++++++++++++
 source/text/simpress/01/slide_properties.xhp | 10 ++---
 source/text/simpress/02/10110000.xhp         |  4 +-
 source/text/simpress/main_slide.xhp          |  6 ++-
 19 files changed, 304 insertions(+), 170 deletions(-)
 create mode 100644 source/text/sdraw/00/page_menu.xhp
 delete mode 100644 source/text/sdraw/01/04010000.xhp
 create mode 100644 source/text/sdraw/01/new_page.xhp
 create mode 100644 source/text/sdraw/01/page_properties.xhp
 delete mode 100644 source/text/sdraw/main0104.xhp
 create mode 100644 source/text/sdraw/main_insert.xhp
 create mode 100644 source/text/sdraw/main_page.xhp
 delete mode 100644 source/text/simpress/01/04010000.xhp
 create mode 100644 source/text/simpress/01/new_slide.xhp

diff --git a/AllLangHelp_sdraw.mk b/AllLangHelp_sdraw.mk
index 0b49ed98bb..f8eb539976 100644
--- a/AllLangHelp_sdraw.mk
+++ b/AllLangHelp_sdraw.mk
@@ -16,8 +16,11 @@ $(eval $(call gb_AllLangHelp_use_linked_modules,sdraw,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,sdraw,\
+    helpcontent2/source/text/sdraw/main_page \
     helpcontent2/source/text/sdraw/00/00000004 \
-    helpcontent2/source/text/sdraw/01/04010000 \
+    helpcontent2/source/text/sdraw/00/page_menu \
+    helpcontent2/source/text/sdraw/01/new_page \
+    helpcontent2/source/text/sdraw/01/page_properties \
     helpcontent2/source/text/sdraw/04/01020000 \
     helpcontent2/source/text/sdraw/guide/align_arrange \
     helpcontent2/source/text/sdraw/guide/color_define \
@@ -40,7 +43,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdraw,\
     helpcontent2/source/text/sdraw/main0101 \
     helpcontent2/source/text/sdraw/main_edit \
     helpcontent2/source/text/sdraw/main0103 \
-    helpcontent2/source/text/sdraw/main0104 \
+    helpcontent2/source/text/sdraw/main_insert \
     helpcontent2/source/text/sdraw/main_format \
     helpcontent2/source/text/sdraw/main_tools \
     helpcontent2/source/text/sdraw/main0200 \
diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index 35eed8e684..528db4b55a 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
     helpcontent2/source/text/simpress/01/03151200 \
     helpcontent2/source/text/simpress/01/03152000 \
     helpcontent2/source/text/simpress/01/03180000 \
-    helpcontent2/source/text/simpress/01/04010000 \
+    helpcontent2/source/text/simpress/01/new_slide \
     helpcontent2/source/text/simpress/01/04020000 \
     helpcontent2/source/text/simpress/01/04030000 \
     helpcontent2/source/text/simpress/01/04030000m \
diff --git a/source/text/sdraw/00/page_menu.xhp b/source/text/sdraw/00/page_menu.xhp
new file mode 100644
index 0000000000..5a006d5f2c
--- /dev/null
+++ b/source/text/sdraw/00/page_menu.xhp
@@ -0,0 +1,52 @@
+<?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="textsimpress00pagemenuxml" indexer="exclude" status="PUBLISH">
+      <title id="tit" xml-lang="en-US">Page Menu</title>
+      <filename>/text/simpress/00/page_menu.xhp</filename>
+    </topic>
+  </meta>
+  <body>
+    <paragraph role="paragraph" id="par_id341556823034391" xml-lang="en-US"><variable id="frtite">Choose <emph>Page - Properties</emph>
+    </variable></paragraph>
+    <paragraph role="paragraph" id="par_id561556823042778" xml-lang="en-US"><variable id="frtites">Choose <emph>Page - Properties</emph> and then click the <emph>Page</emph> tab
+    </variable></paragraph>
+    <paragraph role="paragraph" id="par_id321556823043909" xml-lang="en-US"><variable id="frtiteh">Choose <emph>Page - Properties</emph> and then click the <emph>Background</emph> tab
+    </variable></paragraph>
+    <paragraph role="paragraph" id="par_id941556823044342" xml-lang="en-US"><variable id="seitenvorlage">Choose <emph>Page - Master Page</emph>
+    </variable></paragraph>
+    <section id="new_page">
+      <paragraph id="par_id191556823044529" role="paragraph" xml-lang="en-US">Choose <emph>Page - New Page</emph></paragraph>
+      <paragraph id="par_id1001556823044677" role="paragraph" xml-lang="en-US">On the <emph>Insert</emph> bar, click</paragraph>
+      <section id="syseiteeinf">
+        <table id="tab_id501556823072396">
+          <tablerow>
+            <tablecell>
+              <paragraph id="par_id351556823072396" role="paragraph" xml-lang="en-US"> <image id="img_id381556823072396" src="cmd/sc_insertpage.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id381556823072396">Icon</alt></image></paragraph>
+            </tablecell>
+            <tablecell>
+              <paragraph id="par_id831556823072396" role="paragraph" xml-lang="en-US">New Page</paragraph>
+            </tablecell>
+          </tablerow>
+        </table>
+      </section>
+    </section>
+  </body>
+</helpdocument>
diff --git a/source/text/sdraw/01/04010000.xhp b/source/text/sdraw/01/04010000.xhp
deleted file mode 100644
index 58cd1bb73e..0000000000
--- a/source/text/sdraw/01/04010000.xhp
+++ /dev/null
@@ -1,40 +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="textsdraw0104010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Insert Page</title>
-<filename>/text/sdraw/01/04010000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="hd_id3150202" xml-lang="en-US" level="1"><link href="text/sdraw/01/04010000.xhp" name="Insert Page">Insert Page</link></paragraph>
-<paragraph role="paragraph" id="par_id3152988" xml-lang="en-US"><variable id="seitetext">Inserts a blank page after the selected page.
-</variable></paragraph>
-<section id="howtoget">
-  <embed href="text/simpress/00/00000404.xhp#efgste"/>
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/sdraw/01/new_page.xhp b/source/text/sdraw/01/new_page.xhp
new file mode 100644
index 0000000000..cca246717b
--- /dev/null
+++ b/source/text/sdraw/01/new_page.xhp
@@ -0,0 +1,40 @@
+<?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="textsdraw01newpagexml" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">New Page</title>
+<filename>/text/sdraw/01/new_page.xhp</filename>
+</topic>
+<history>
+<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
+</history>
+</meta>
+<body>
+<paragraph role="heading" id="hd_id3150202" xml-lang="en-US" level="1"><link href="text/sdraw/01/new_page.xhp" name="New Page">New Page</link></paragraph>
+<paragraph role="paragraph" id="par_id3152988" xml-lang="en-US"><variable id="seitetext">Inserts a blank page after the selected page.
+</variable></paragraph>
+<section id="howtoget">
+  <embed href="text/sdraw/00/page_menu.xhp#new_page"/>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/sdraw/01/page_properties.xhp b/source/text/sdraw/01/page_properties.xhp
new file mode 100644
index 0000000000..63c0db9b05
--- /dev/null
+++ b/source/text/sdraw/01/page_properties.xhp
@@ -0,0 +1,41 @@
+<?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="textsdraw01page_propertiesxml" indexer="include" status="PUBLISH">
+      <title xml-lang="en-US" id="tit">Page</title>
+      <filename>/text/simpress/01/page_properties.xhp</filename>
+    </topic>
+    <history>
+      <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
+    </history>
+  </meta>
+  <body>
+    <bookmark branch="hid/.uno:PageSetup" xml-lang="en-US" id="bm_id891556823445094" localize="false"/>
+    <paragraph role="heading" level="1" id="hd_id231556821873595" xml-lang="en-US">Page</paragraph>
+    <paragraph role="paragraph" id="par_id571556821811542" xml-lang="en-US"><variable id="seiteeintext"><ahelp hid=".uno:PageSetup" visibility="visible">Sets page orientation, page margins, background and other layout options.</ahelp></variable></paragraph>
+    <section id="howtoget">
+      <embed href="text/sdraw/00/page_menu.xhp#frtite"/>
+    </section>
+    <embed href="text/simpress/guide/background.xhp#background"/>
+    <embed href="text/simpress/01/01180001.xhp#seite"/>
+    <embed href="text/simpress/01/01180002.xhp#hintergr"/>
+    <paragraph xml-lang="en-US" role="tip" id="par_id691556822054550">To change the background of all of the pages in the active file, select a background, click <emph>OK</emph> and click <emph>Yes</emph> in the <emph>Page Setup</emph> dialog.</paragraph>
+  </body>
+</helpdocument>
diff --git a/source/text/sdraw/main0100.xhp b/source/text/sdraw/main0100.xhp
index f791895a6c..efc2f20f68 100644
--- a/source/text/sdraw/main0100.xhp
+++ b/source/text/sdraw/main0100.xhp
@@ -41,7 +41,7 @@
   <embed href="text/sdraw/main0101.xhp#datei"/>
   <embed href="text/sdraw/main_edit.xhp#bearbeiten"/>
   <embed href="text/sdraw/main0103.xhp#ansicht"/>
-  <embed href="text/sdraw/main0104.xhp#einfuegen"/>
+  <embed href="text/sdraw/main_insert.xhp#einfuegen"/>
   <embed href="text/sdraw/main_format.xhp#format"/>
   <embed href="text/sdraw/main_tools.xhp#extras"/>
   <embed href="text/simpress/main0113.xhp#aendern"/>
diff --git a/source/text/sdraw/main0104.xhp b/source/text/sdraw/main0104.xhp
deleted file mode 100644
index a527bdf7f3..0000000000
--- a/source/text/sdraw/main0104.xhp
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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/.
- *
- * 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 .
- -->
- 
-	
-<meta>
-      <topic id="textsdrawmain0104xml" indexer="include" status="PUBLISH">
-         <title xml-lang="en-US" id="tit">Insert</title>
-         <filename>/text/sdraw/main0104.xhp</filename>
-      </topic>
-   </meta>
-   <body>
-      <section id="einfuegen">
-         <paragraph xml-lang="en-US" id="hd_id3148797" role="heading" level="1"><link href="text/sdraw/main0104.xhp" name="Insert">Insert</link></paragraph>
-         <paragraph xml-lang="en-US" id="par_id3153770" role="paragraph">This menu allows you to insert elements, such as graphics and guides, into Draw documents.</paragraph>
-      </section>
-      <paragraph xml-lang="en-US" id="hd_id3154320" role="heading" level="2"><link href="text/sdraw/01/04010000.xhp" name="Slide">Slide</link></paragraph>
-      <embed href="text/sdraw/01/04010000.xhp#seitetext"/>
-      <embed href="text/simpress/01/04120000.xhp#seiteduplizieren"/>
-      <paragraph xml-lang="en-US" id="hd_id3146974" role="heading" level="2"><link href="text/simpress/01/04020000.xhp" name="Layer">Layer</link></paragraph>
-      <embed href="text/simpress/01/04020000.xhp#ebenetext"/>
-      <paragraph xml-lang="en-US" id="hd_id3147397" role="heading" level="2"><link href="text/simpress/01/04030000.xhp" name="Insert Snap Point/Line">Insert Snap Point/Line</link></paragraph>
-      <embed href="text/simpress/01/04030000.xhp#fangtext"/>
-      <embed href="text/simpress/01/04990000.xhp#feldbefehl"/>
-      <paragraph xml-lang="en-US" id="hd_id0915200910361385" role="heading" level="2"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></paragraph>
-      <embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
-      <paragraph xml-lang="en-US" id="hd_id3154018" role="heading" level="2"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></paragraph>
-      <embed href="text/shared/01/04100000.xhp#sonder"/>
-      <embed href="text/shared/01/formatting_mark.xhp#formatting_mark"/>
-      <paragraph xml-lang="en-US" id="hd_id3150749" role="heading" level="2"><link href="text/shared/02/09070000.xhp" name="Hyperlink">Hyperlink</link></paragraph>
-      <embed href="text/shared/02/09070000.xhp#hyperdiatext"/>
-      <paragraph xml-lang="en-US" id="hd_id3156385" role="heading" level="2"><link href="text/simpress/01/04080100.xhp" name="Table">Table</link></paragraph>
-      <embed href="text/simpress/01/04080100.xhp#tabelletext"/>
-      <embed href="text/shared/01/04990000.xhp#grafik"/>
-      <embed href="text/shared/01/moviesound.xhp#moviesound"/>
-      <embed href="text/shared/01/04150000.xhp#objekt"/>
-      <paragraph xml-lang="en-US" id="hd_id3147003" role="heading" level="2"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link></paragraph>
-      <paragraph xml-lang="en-US" id="par_id0302200904020595" role="paragraph">Inserts a chart.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3155111" role="heading" level="2"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></paragraph>
-      <embed href="text/shared/01/04160500.xhp#frameeinfuegentext"/>
-      <paragraph xml-lang="en-US" id="hd_id3157867" role="heading" level="2"><link href="text/simpress/01/04110000.xhp" name="File">File</link></paragraph>
-      <embed href="text/simpress/01/04110000.xhp#dateitext"/>
-   </body>
-</helpdocument>
\ No newline at end of file
diff --git a/source/text/sdraw/main_format.xhp b/source/text/sdraw/main_format.xhp
index 95c60f130e..77251c5e03 100644
--- a/source/text/sdraw/main_format.xhp
+++ b/source/text/sdraw/main_format.xhp
@@ -41,8 +41,6 @@
 <embed href="text/shared/01/05030000.xhp#absatztext"/>
 <paragraph role="heading" id="hd_id3166426" xml-lang="en-US" level="2"><link href="text/shared/01/06050000.xhp" name="Numbering/Bullets">Bullets and Numbering</link></paragraph>
 <embed href="text/shared/01/06050000.xhp#numauftext"/>
-<paragraph role="heading" id="hd_id3155091" xml-lang="en-US" level="2"><link href="text/simpress/01/slide_properties.xhp" name="Page">Page</link></paragraph>
-<embed href="text/simpress/01/slide_properties.xhp#seiteeintext"/>
 <embed href="text/shared/01/05050000.xhp#grossklein"/>
 <paragraph role="heading" id="hd_id3146971" xml-lang="en-US" level="2"><link href="text/shared/01/05230000.xhp" name="Position and Size">Position and Size</link></paragraph>
 <embed href="text/shared/01/05230000.xhp#groessetext"/>
diff --git a/source/text/sdraw/main_insert.xhp b/source/text/sdraw/main_insert.xhp
new file mode 100644
index 0000000000..fc42e390c9
--- /dev/null
+++ b/source/text/sdraw/main_insert.xhp
@@ -0,0 +1,59 @@
+<?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/.
+ *
+ * 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 .
+ -->
+
+
+<meta>
+      <topic id="textsdrawmaininsertxml" indexer="include" status="PUBLISH">
+         <title xml-lang="en-US" id="tit">Insert</title>
+         <filename>/text/sdraw/main_insert.xhp</filename>
+      </topic>
+   </meta>
+   <body>
+      <section id="einfuegen">
+         <paragraph xml-lang="en-US" id="hd_id3148797" role="heading" level="1"><link href="text/sdraw/main_insert.xhp" name="Insert">Insert</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153770" role="paragraph">This menu allows you to insert elements, such as graphics and guides, into Draw documents.</paragraph>
+      </section>
+      <embed href="text/simpress/01/04120000.xhp#seiteduplizieren"/>
+      <paragraph xml-lang="en-US" id="hd_id3146974" role="heading" level="2"><link href="text/simpress/01/04020000.xhp" name="Layer">Layer</link></paragraph>
+      <embed href="text/simpress/01/04020000.xhp#ebenetext"/>
+      <paragraph xml-lang="en-US" id="hd_id3147397" role="heading" level="2"><link href="text/simpress/01/04030000.xhp" name="Insert Snap Point/Line">Insert Snap Point/Line</link></paragraph>
+      <embed href="text/simpress/01/04030000.xhp#fangtext"/>
+      <embed href="text/simpress/01/04990000.xhp#feldbefehl"/>
+      <paragraph xml-lang="en-US" id="hd_id0915200910361385" role="heading" level="2"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></paragraph>
+      <embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
+      <paragraph xml-lang="en-US" id="hd_id3154018" role="heading" level="2"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></paragraph>
+      <embed href="text/shared/01/04100000.xhp#sonder"/>
+      <embed href="text/shared/01/formatting_mark.xhp#formatting_mark"/>
+      <paragraph xml-lang="en-US" id="hd_id3150749" role="heading" level="2"><link href="text/shared/02/09070000.xhp" name="Hyperlink">Hyperlink</link></paragraph>
+      <embed href="text/shared/02/09070000.xhp#hyperdiatext"/>
+      <paragraph xml-lang="en-US" id="hd_id3156385" role="heading" level="2"><link href="text/simpress/01/04080100.xhp" name="Table">Table</link></paragraph>
+      <embed href="text/simpress/01/04080100.xhp#tabelletext"/>
+      <embed href="text/shared/01/04990000.xhp#grafik"/>
+      <embed href="text/shared/01/moviesound.xhp#moviesound"/>
+      <embed href="text/shared/01/04150000.xhp#objekt"/>
+      <paragraph xml-lang="en-US" id="hd_id3147003" role="heading" level="2"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0302200904020595" role="paragraph">Inserts a chart.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3155111" role="heading" level="2"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></paragraph>
+      <embed href="text/shared/01/04160500.xhp#frameeinfuegentext"/>
+      <paragraph xml-lang="en-US" id="hd_id3157867" role="heading" level="2"><link href="text/simpress/01/04110000.xhp" name="File">File</link></paragraph>
+      <embed href="text/simpress/01/04110000.xhp#dateitext"/>
+   </body>
+</helpdocument>
diff --git a/source/text/sdraw/main_page.xhp b/source/text/sdraw/main_page.xhp
new file mode 100644
index 0000000000..d4ff0959a9
--- /dev/null
+++ b/source/text/sdraw/main_page.xhp
@@ -0,0 +1,43 @@
+<?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/.
+ *
+ * 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 .
+-->
+
+<meta>
+  <topic id="textsdrawmainpagexml" indexer="include" status="PUBLISH">
+    <title id="tit" xml-lang="en-US">Page</title>
+    <filename>/text/sdraw/main_page.xhp</filename>
+  </topic>
+</meta>
+
+<body>
+
+
+<section id="page">
+<bookmark xml-lang="en-US" branch="hid/.uno:PageMenu" id="bm_id561556822303590" localize="false"/>
+
+<paragraph id="hd_id41556822227733" role="heading" level="1" xml-lang="en-US"><link href="text/simpress/main_slide.xhp">Page</link></paragraph>
+<paragraph id="par_id771556822318420" role="paragraph" xml-lang="en-US">This menu provides page management and navigation commands.</paragraph>
+</section>
+<paragraph xml-lang="en-US" id="hd_id131556822326832" role="heading" level="2"><link href="text/sdraw/01/new_page.xhp" name="New Page">New Page</link></paragraph>
+<embed href="text/sdraw/01/new_page.xhp#seitetext"/>
+<paragraph role="heading" id="hd_id3155091" xml-lang="en-US" level="2"><link href="text/sdraw/01/page_properties.xhp" name="Properties">Properties</link></paragraph>
+<embed href="text/sdraw/01/page_properties.xhp#seiteeintext"/>
+</body>
+
+</helpdocument>
diff --git a/source/text/simpress/00/00000404.xhp b/source/text/simpress/00/00000404.xhp
index 209d97094b..4e4881aa94 100644
--- a/source/text/simpress/00/00000404.xhp
+++ b/source/text/simpress/00/00000404.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="textsimpress0000000404xml" indexer="exclude" status="PUBLISH">
@@ -31,9 +31,6 @@
 </meta>
 <body>
 <paragraph role="heading" id="hd_id3143219" xml-lang="en-US" level="1">Insert Menu</paragraph>
-<section id="efgste">
-<paragraph role="paragraph" id="par_id3147264" xml-lang="en-US">Choose <emph>Insert - New Page/Slide</emph></paragraph>
-</section>
 <paragraph role="paragraph" id="par_id3155064" xml-lang="en-US"><variable id="seiteduplizieren">Choose <emph>Insert - Duplicate Slide</emph>
 </variable><comment>UFI: will be changed "SO later" to Page (for Draw)</comment></paragraph>
 <paragraph role="paragraph" id="par_id3153711" xml-lang="en-US"><variable id="seitegliederung">Choose <emph>Insert - Expand Slide</emph>
diff --git a/source/text/simpress/00/slide_menu.xhp b/source/text/simpress/00/slide_menu.xhp
index 95c008908a..2b724755e3 100644
--- a/source/text/simpress/00/slide_menu.xhp
+++ b/source/text/simpress/00/slide_menu.xhp
@@ -34,17 +34,17 @@
     </variable></paragraph>
     <paragraph role="paragraph" id="par_id3153012" xml-lang="en-US"><variable id="seitenvorlage">Choose <emph>Slide - Change Slide Master</emph>
     </variable></paragraph>
-    <section id="new_page_slide">
-      <paragraph id="par_id3134264" role="paragraph" xml-lang="en-US">Choose <emph>Slide - New Page/Slide</emph></paragraph>
+    <section id="new_slide">
+      <paragraph id="par_id3134264" role="paragraph" xml-lang="en-US">Choose <emph>Slide - New Slide</emph></paragraph>
       <paragraph id="par_id3177597" role="paragraph" xml-lang="en-US">On the <emph>Presentation</emph> bar, click</paragraph>
       <section id="syseiteeinf">
         <table id="tbl_id3149334">
           <tablerow>
             <tablecell>
-              <paragraph id="par_id3685251" role="paragraph" xml-lang="en-US"> <image id="img_id3183073" src="cmd/sc_insertdoc.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3183073">Icon</alt></image></paragraph>
+              <paragraph id="par_id3685251" role="paragraph" xml-lang="en-US"> <image id="img_id3183073" src="cmd/sc_insertpage.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3183073">Icon</alt></image></paragraph>
             </tablecell>
             <tablecell>
-              <paragraph id="par_id7354512" role="paragraph" xml-lang="en-US">New Page/Slide</paragraph>
+              <paragraph id="par_id7354512" role="paragraph" xml-lang="en-US">New Slide</paragraph>
             </tablecell>
           </tablerow>
         </table>
diff --git a/source/text/simpress/01/03070000.xhp b/source/text/simpress/01/03070000.xhp
index 146d19b803..969968ae0d 100644
--- a/source/text/simpress/01/03070000.xhp
+++ b/source/text/simpress/01/03070000.xhp
@@ -35,8 +35,8 @@
 <section id="howtoget">
   <embed href="text/simpress/00/00000403.xhp#praesentation"/>
 </section>
-<paragraph role="heading" id="hd_id3154018" xml-lang="en-US" level="2"><link href="text/simpress/01/04010000.xhp" name="Slide">Slide</link></paragraph>
-<embed href="text/simpress/01/04010000.xhp#seitetext"/>
+<paragraph role="heading" id="hd_id3154018" xml-lang="en-US" level="2"><link href="text/simpress/01/new_slide.xhp" name="Slide">Slide</link></paragraph>
+<embed href="text/simpress/01/new_slide.xhp#seitetext"/>
 <paragraph role="heading" id="hd_id3154754" xml-lang="en-US" level="2"><link href="text/simpress/01/05130000.xhp" name="Slide Layout">Slide Layout</link></paragraph>
 <embed href="text/simpress/01/05130000.xhp#seite"/>
 <paragraph role="heading" id="hd_id3155960" xml-lang="en-US" level="2"><link href="text/simpress/01/05120000.xhp" name="Slide Design">Slide Design</link></paragraph>
diff --git a/source/text/simpress/01/04010000.xhp b/source/text/simpress/01/04010000.xhp
deleted file mode 100644
index 8c089fc14f..0000000000
--- a/source/text/simpress/01/04010000.xhp
+++ /dev/null
@@ -1,44 +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="textsimpress0104010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">New Page/Slide</title>
-<filename>/text/simpress/01/04010000.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3159155"><bookmark_value>inserting; slides</bookmark_value>
-<bookmark_value>slides; inserting</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertPage" id="bm_id8576712" localize="false"/>
-<paragraph role="heading" id="hd_id3159155" xml-lang="en-US" level="1"><link href="text/simpress/01/04010000.xhp" name="New Page/Slide">New Page/Slide</link></paragraph>
-<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US"><variable id="seitetext"><ahelp hid=".uno:InsertPage"><switchinline select="appl"><caseinline select="IMPRESS">Inserts a slide after the currently selected slide.
-</caseinline><defaultinline>Inserts a page after the currently selected page.</defaultinline></switchinline></ahelp>
-</variable></paragraph>
-<section id="howtoget">
-  <embed href="text/simpress/00/slide_menu.xhp#new_page_slide"/>
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/simpress/01/new_slide.xhp b/source/text/simpress/01/new_slide.xhp
new file mode 100644
index 0000000000..ecbcc9ded8
--- /dev/null
+++ b/source/text/simpress/01/new_slide.xhp
@@ -0,0 +1,44 @@
+<?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="textsimpress01newslidexml" indexer="include" status="PUBLISH">
+<title id="tit" xml-lang="en-US">New Slide</title>
+<filename>/text/simpress/01/new_slide.xhp</filename>
+</topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3159155"><bookmark_value>inserting; slides</bookmark_value>
+<bookmark_value>slides; inserting</bookmark_value>
+</bookmark>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertPage" id="bm_id8576712" localize="false"/>
+<paragraph role="heading" id="hd_id3159155" xml-lang="en-US" level="1"><link href="text/simpress/01/new_slide.xhp" name="New Slide">New Slide</link></paragraph>
+<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US"><variable id="seitetext"><ahelp hid=".uno:InsertPage"><switchinline select="appl"><caseinline select="IMPRESS">Inserts a slide after the currently selected slide.
+</caseinline><defaultinline>Inserts a slide after the currently selected slide.</defaultinline></switchinline></ahelp>
+</variable></paragraph>
+<section id="howtoget">
+  <embed href="text/simpress/00/slide_menu.xhp#new_slide"/>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/simpress/01/slide_properties.xhp b/source/text/simpress/01/slide_properties.xhp
index 095e3b6905..0d8df9c4c7 100644
--- a/source/text/simpress/01/slide_properties.xhp
+++ b/source/text/simpress/01/slide_properties.xhp
@@ -19,7 +19,7 @@
 <helpdocument version="1.0">
   <meta>
     <topic id="textsimpressslide_propertiesxml" indexer="include" status="PUBLISH">
-      <title xml-lang="en-US" id="tit">Page</title>
+      <title xml-lang="en-US" id="tit">Slide</title>
       <filename>/text/simpress/01/slide_properties.xhp</filename>
     </topic>
     <history>
@@ -27,15 +27,15 @@
     </history>
   </meta>
   <body>
-    <bookmark branch="hid/.uno:PageSetup" xml-lang="en-US" id="bm_id3154492" localize="false"/>
-    <paragraph role="heading" level="1" id="hd_id3149379" xml-lang="en-US">Page</paragraph>
-    <paragraph role="paragraph" id="par_id3150717" xml-lang="en-US"><variable id="seiteeintext"><ahelp hid=".uno:PageSetup" visibility="visible">Sets page orientation, page margins, background and other layout options.</ahelp></variable></paragraph>
+    <bookmark branch="hid/.uno:SlideSetup" xml-lang="en-US" id="bm_id3154492" localize="false"/>
+    <paragraph role="heading" level="1" id="hd_id3149379" xml-lang="en-US">Slide</paragraph>
+    <paragraph role="paragraph" id="par_id3150717" xml-lang="en-US"><variable id="seiteeintext"><ahelp hid=".uno:SlideSetup" visibility="visible">Sets slide orientation, slide margins, background and other layout options.</ahelp></variable></paragraph>
     <section id="howtoget">
       <embed href="text/simpress/00/slide_menu.xhp#frtite"/>
     </section>
     <embed href="text/simpress/guide/background.xhp#background"/>
     <embed href="text/simpress/01/01180001.xhp#seite"/>
     <embed href="text/simpress/01/01180002.xhp#hintergr"/>
-    <paragraph xml-lang="en-US" role="tip" id="par_id3145587">To change the background of all of the pages in the active file, select a background, click <emph>OK</emph> and click <emph>Yes</emph> in the <emph>Page Setup</emph> dialog.</paragraph>
+    <paragraph xml-lang="en-US" role="tip" id="par_id3145587">To change the background of all of the slides in the active file, select a background, click <emph>OK</emph> and click <emph>Yes</emph> in the <emph>Page Setup</emph> dialog.</paragraph>
   </body>
 </helpdocument>
diff --git a/source/text/simpress/02/10110000.xhp b/source/text/simpress/02/10110000.xhp
index b7ebea53bc..192decdb5b 100644
--- a/source/text/simpress/02/10110000.xhp
+++ b/source/text/simpress/02/10110000.xhp
@@ -48,8 +48,8 @@
 </table>
 </section>
 <paragraph role="paragraph" id="par_id3147401" xml-lang="en-US"><ahelp hid=".uno:InsertToolbox">Open the <emph>Insert</emph> toolbar, where you can add objects, including charts, spreadsheets, and images, to your document.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3149028" xml-lang="en-US" level="2"><link href="text/simpress/01/04010000.xhp" name="Slide">Slide</link></paragraph>
-<embed href="text/simpress/01/04010000.xhp#seitetext"/>
+<paragraph role="heading" id="hd_id3149028" xml-lang="en-US" level="2"><link href="text/simpress/01/new_slide.xhp" name="Slide">Slide</link></paragraph>
+<embed href="text/simpress/01/new_slide.xhp#seitetext"/>
 <embed href="text/simpress/00/slide_menu.xhp#syseiteeinf"/>
 <paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="2"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></paragraph>
 <embed href="text/shared/01/04160500.xhp#frameeinfuegentext"/>
diff --git a/source/text/simpress/main_slide.xhp b/source/text/simpress/main_slide.xhp
index 86669a1ece..35a6829214 100644
--- a/source/text/simpress/main_slide.xhp
+++ b/source/text/simpress/main_slide.xhp
@@ -34,8 +34,10 @@
 <paragraph id="hd_id0908201507475698" role="heading" level="1" xml-lang="en-US"><link href="text/simpress/main_slide.xhp">Slide</link></paragraph>
 <paragraph id="par_id0908201507482661" role="paragraph" xml-lang="en-US">This menu provides slide management and navigation commands.</paragraph>
 </section>
-<paragraph id="hd_id3145801" role="heading" level="2" xml-lang="en-US"><link href="text/simpress/01/04010000.xhp" name="New Page/Slide">New Page/Slide</link></paragraph>
-<embed href="text/simpress/01/04010000.xhp#seitetext"/>
+<paragraph id="hd_id3145801" role="heading" level="2" xml-lang="en-US"><link href="text/simpress/01/new_slide.xhp" name="New Slide">New Slide</link></paragraph>
+<embed href="text/simpress/01/new_slide.xhp#seitetext"/>
+<paragraph role="heading" id="hd_id551556824896520" xml-lang="en-US" level="2"><link href="text/simpress/01/slide_properties.xhp" name="Properties">Properties</link></paragraph>
+<embed href="text/simpress/01/slide_properties.xhp#seiteeintext"/>
 </body>
 
 </helpdocument>
-- 
cgit v1.2.3