[Libreoffice-commits] help.git: AllLangHelp_simpress.mk source/text

Olivier Hallot (via logerrit) logerrit at kemper.freedesktop.org
Thu Oct 31 16:11:15 UTC 2019


 AllLangHelp_simpress.mk                    |    1 
 source/text/sdraw/guide/text_enter.xhp     |   37 +++++++++++----------
 source/text/simpress/00/00000404.xhp       |   18 ++++------
 source/text/simpress/01/04110000.xhp       |   49 -----------------------------
 source/text/simpress/01/04110100.xhp       |   15 ++------
 source/text/simpress/01/04110200.xhp       |    7 +---
 source/text/simpress/02/10110000.xhp       |   28 +++++++---------
 source/text/simpress/guide/html_import.xhp |   19 +++++------
 source/text/simpress/guide/page_copy.xhp   |   18 ++++------
 source/text/simpress/main0104.xhp          |   26 +++++++--------
 10 files changed, 76 insertions(+), 142 deletions(-)

New commits:
commit 9346b90c0f878e6a09e7341a45cf19e65067b6c1
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Thu Oct 31 13:06:25 2019 -0300
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Thu Oct 31 17:10:55 2019 +0100

    Update Impress help pages
    
    (wip)
    refactor pages after menu changes
    remove unused page.
    
    Change-Id: I85caa9ab6cb42cf8da018d8e54e3387397b0e9f6
    Reviewed-on: https://gerrit.libreoffice.org/81859
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index a80deaf34..fd781c4c4 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
     helpcontent2/source/text/simpress/01/04030100 \
     helpcontent2/source/text/simpress/01/04040000m \
     helpcontent2/source/text/simpress/01/04080100 \
-    helpcontent2/source/text/simpress/01/04110000 \
     helpcontent2/source/text/simpress/01/04110100 \
     helpcontent2/source/text/simpress/01/04110200 \
     helpcontent2/source/text/simpress/01/04120000 \
diff --git a/source/text/sdraw/guide/text_enter.xhp b/source/text/sdraw/guide/text_enter.xhp
index 1ecc64b1e..7ca2e7f52 100644
--- a/source/text/sdraw/guide/text_enter.xhp
+++ b/source/text/sdraw/guide/text_enter.xhp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,8 +18,8 @@
  *   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="textsdrawguidetext_enterxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Adding Text</title>
@@ -27,14 +27,15 @@
       </topic>
    </meta>
    <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153144"><bookmark_value>text frames</bookmark_value>
-      <bookmark_value>inserting;text frames</bookmark_value>
-      <bookmark_value>copying;text from other documents</bookmark_value>
-      <bookmark_value>pasting;text from other documents</bookmark_value>
-      <bookmark_value>legends; drawings</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3153144">
+<bookmark_value>text box</bookmark_value>
+<bookmark_value>inserting;text box</bookmark_value>
+<bookmark_value>copying;text from other documents</bookmark_value>
+<bookmark_value>pasting;text from other documents</bookmark_value>
+<bookmark_value>legends; drawings</bookmark_value>
 </bookmark><comment>mw changed "adding;" to "inserting;"</comment>
-<paragraph xml-lang="en-US" id="hd_id3153144" role="heading" level="1"><variable id="text_enter"><link href="text/sdraw/guide/text_enter.xhp" name="Adding Text">Adding Text</link>
-</variable></paragraph>
+<h1 id="hd_id3153144"><variable id="text_enter"><link href="text/sdraw/guide/text_enter.xhp" name="Adding Text">Adding Text</link>
+</variable></h1>
       <paragraph xml-lang="en-US" id="par_id3145750" role="paragraph">There are several types of text you can add to a drawing or presentation: </paragraph>
       <list type="unordered">
          <listitem>
@@ -53,10 +54,10 @@
             <paragraph xml-lang="en-US" id="par_idN10834" role="paragraph">Text that is inserted from a text document or HTML document</paragraph>
          </listitem>
       </list>
-      <paragraph xml-lang="en-US" id="hd_id3150202" role="heading" level="2">Adding a Text Box</paragraph>
+      <h2 id="hd_id3150202">Adding a Text Box</h2>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3155266" role="paragraph">Click the <emph>Text</emph> icon 
+            <paragraph xml-lang="en-US" id="par_id3155266" role="paragraph">Click the <emph>Text</emph> icon
 <image id="img_id3156450" src="cmd/sc_text.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3156450">Icon</alt>
 	</image> and move the mouse pointer to where you want to enter the text box.</paragraph>
          </listitem>
@@ -68,7 +69,7 @@
          </listitem>
       </list>
       <paragraph xml-lang="en-US" id="par_id3145118" role="paragraph">Double-click the text to edit it or to format text properties, such as font size or font color. Click the border of the text box to edit the object properties, such as border color or arranging in front or behind other objects.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3150437" role="heading" level="2">Fitting Text to Frames</paragraph>
+      <h2 id="hd_id3150437">Fitting Text to Frames</h2>
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3146877" role="paragraph">Create a text box as described in the steps above.</paragraph>
@@ -83,12 +84,12 @@
             <paragraph xml-lang="en-US" id="par_id0610200902133994" role="paragraph">Now you can resize the text box to change the size and shape of the text characters.</paragraph>
          </listitem>
       </list>
-      <paragraph xml-lang="en-US" id="hd_id3155955" role="heading" level="2">Text Tied to a Graphic</paragraph>
+      <h2 id="hd_id3155955">Text Tied to a Graphic</h2>
       <paragraph xml-lang="en-US" id="par_idN10917" role="paragraph">You can add text to any graphic after double-clicking the graphic.</paragraph>
       <paragraph xml-lang="en-US" id="par_id1827448" role="paragraph">To determine the position of the text, use the settings in <emph>Format - Text</emph>.<comment>this is the Draw command. In Writer it is Format - Object - Text attributes.</comment></paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3147366" role="paragraph">For example, click the arrow next to the <emph>Callouts</emph> icon 
+            <paragraph xml-lang="en-US" id="par_id3147366" role="paragraph">For example, click the arrow next to the <emph>Callouts</emph> icon
 <image id="img_id3154508" src="cmd/sc_calloutshapes.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154508">Icon</alt>
 	</image> to open the Callouts toolbar.</paragraph>
          </listitem>
@@ -102,7 +103,7 @@
             <paragraph xml-lang="en-US" id="par_id1978514" role="paragraph">Enter the text.</paragraph>
          </listitem>
       </list>
-      <paragraph xml-lang="en-US" id="par_idN1091A" role="heading" level="2">Copying Text</paragraph>
+      <h2 id="par_idN1091A">Copying Text</h2>
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_idN10921" role="paragraph">Select the text in your Writer document.</paragraph>
@@ -118,7 +119,7 @@
             <paragraph xml-lang="en-US" id="par_idN1093C" role="paragraph">Using <emph>Paste special</emph>, you can choose the text format to be pasted. Depending on formats, you can copy different text attributes.<comment>UFI: added an emph tag, see #60923</comment></paragraph>
          </listitem>
       </list>
-      <paragraph xml-lang="en-US" id="par_idN1093F" role="heading" level="2">Importing Text</paragraph>
+      <h2 id="par_idN1093F">Importing Text</h2>
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_idN10946" role="paragraph">Click the page or slide where you want to import the text.</paragraph>
@@ -137,4 +138,4 @@
 </switch>
 </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/simpress/00/00000404.xhp b/source/text/simpress/00/00000404.xhp
index 4e4881aa9..de4601e4a 100644
--- a/source/text/simpress/00/00000404.xhp
+++ b/source/text/simpress/00/00000404.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="textsimpress0000000404xml" indexer="exclude" status="PUBLISH">
@@ -30,7 +27,7 @@
 </history>
 </meta>
 <body>
-<paragraph role="heading" id="hd_id3143219" xml-lang="en-US" level="1">Insert Menu</paragraph>
+<h1 id="hd_id3143219">Insert Menu</h1>
 <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>
@@ -55,12 +52,12 @@
 <section id="sycalc">
 <table id="tbl_id3159208">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3163703" xml-lang="en-US">
 <image id="img_id3145361" src="cmd/sc_grid.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145361" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3146963" xml-lang="en-US">Spreadsheet</paragraph>
 </tablecell>
 </tablerow>
@@ -69,19 +66,18 @@
 </section>
 </section>
 <section id="efgdti">
-<paragraph role="paragraph" id="par_id3153075" xml-lang="en-US">Choose <emph>Insert - File</emph>
-</paragraph>
+    <paragraph role="paragraph" id="par_id3153075" xml-lang="en-US">Choose <switchinline select="appl"><caseinline select="IMPRESS"><menuitem>Slide - Insert Slide from File</menuitem></caseinline><defaultinline><menuitem>Page - Insert Page from File</menuitem></defaultinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3153958" xml-lang="en-US">On the <emph>Insert</emph> toolbar, click</paragraph>
 <section id="syfile">
 <table id="tbl_id3147295">
 <tablerow>
-<tablecell colspan="" rowspan="">
+<tablecell>
 <paragraph role="paragraph" id="par_id3156397" xml-lang="en-US">
 <image id="img_id3145237" src="cmd/sc_inserttoolbox.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145237" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3157900" xml-lang="en-US">File</paragraph>
+<tablecell>
+<paragraph role="paragraph" id="par_id3157900" xml-lang="en-US"><switchinline select="appl"><caseinline select="IMPRESS">Insert Slide from File</caseinline><defaultinline>Insert Page from File</defaultinline></switchinline></paragraph>
 </tablecell>
 </tablerow>
 </table>
diff --git a/source/text/simpress/01/04110000.xhp b/source/text/simpress/01/04110000.xhp
deleted file mode 100644
index dc39d1de8..000000000
--- a/source/text/simpress/01/04110000.xhp
+++ /dev/null
@@ -1,49 +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="textsimpress0104110000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Insert File  </title>
-<filename>/text/simpress/01/04110000.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_id3153728"><bookmark_value>files; inserting</bookmark_value>
-<bookmark_value>inserting; files</bookmark_value>
-<bookmark_value>HTML; inserting files</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:ImportFromFile" id="bm_id3867585" localize="false"/>
-
-<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>
-<paragraph role="paragraph" id="par_id3155446" xml-lang="en-US">You can also choose to only insert specific <link href="text/simpress/01/04110100.xhp" name="slides or objects">slides or objects</link> from $[officename] Draw or Impress files.</paragraph>
-</body>
-</helpdocument>
diff --git a/source/text/simpress/01/04110100.xhp b/source/text/simpress/01/04110100.xhp
index 5785442a6..d50146ec1 100644
--- a/source/text/simpress/01/04110100.xhp
+++ b/source/text/simpress/01/04110100.xhp
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -19,9 +16,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">
+<helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0104110100xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Insert Slides/Objects</title>
@@ -38,13 +33,13 @@
 <bookmark_value>backgrounds; deleting unused</bookmark_value>
 </bookmark>
 <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>
+    <h1 id="hd_id3146976"><variable id="insertobjectfromfile"><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></variable></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>
-<paragraph role="heading" id="hd_id3154016" xml-lang="en-US" level="3">To insert specific elements from a file:</paragraph>
+<h3 id="hd_id3154016">To insert specific elements from a file:</h3>
 <list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3150749" xml-lang="en-US">Click the plus sign next to the file name and select the elements you want to insert. Hold down <switchinline select="sys"><caseinline select="MAC">Command
@@ -60,9 +55,9 @@
 <paragraph role="listitem" id="par_id3159236" xml-lang="en-US">At the prompt, click <emph>Yes </emph>to scale the elements to fit on the slide or <emph>No </emph>to preserve the original size of the elements.</paragraph>
 </listitem>
 </list>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertslidesdialog/links" id="bm_id3152991" localize="false"/><paragraph role="heading" id="hd_id3150207" xml-lang="en-US" level="2">Link</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertslidesdialog/links" id="bm_id3152991" localize="false"/><h2 id="hd_id3150207">Link</h2>
 <paragraph role="paragraph" id="par_id3156448" xml-lang="en-US"><ahelp hid="modules/sdraw/ui/insertslidesdialog/links">Inserts a file or some file elements as a link that is automatically updated when the source file is modified.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertslidesdialog/backgrounds" id="bm_id3151240" localize="false"/><paragraph role="heading" id="hd_id3152898" xml-lang="en-US" level="2">Delete unused backgrounds</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/sdraw/ui/insertslidesdialog/backgrounds" id="bm_id3151240" localize="false"/><h2 id="hd_id3152898">Delete unused backgrounds</h2>
 <paragraph role="paragraph" id="par_id3148868" xml-lang="en-US"><ahelp hid="modules/sdraw/ui/insertslidesdialog/backgrounds">Unused master pages are not inserted.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/simpress/01/04110200.xhp b/source/text/simpress/01/04110200.xhp
index dea9af9fd..1e3f55d9c 100644
--- a/source/text/simpress/01/04110200.xhp
+++ b/source/text/simpress/01/04110200.xhp
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <helpdocument version="1.0">
 	
 <!--
@@ -28,15 +27,15 @@
 </topic>
 </meta>
 <body><comment>mw deleted "text documents;" and moved "inserting;" to the impress guide html_import.xhp</comment>
-<paragraph role="heading" id="hd_id3145252" xml-lang="en-US" level="1">Insert Text</paragraph>
+<h1 id="hd_id3145252">Insert Text</h1>
 <paragraph role="paragraph" id="par_id3150716" xml-lang="en-US">Inserts text from an ASCII, RTF, or HTML file into the active slide.</paragraph>
 <section id="howtoget">
 <embed href="text/simpress/00/00000404.xhp#efgdti"/>
 </section>
 <paragraph role="paragraph" id="par_id3149018" xml-lang="en-US">The inserted text uses the default text formatting of the active slide. If you want, you can drag a text frame in your slide, and then insert the text. The text frame automatically extends downwards for longer text passages.</paragraph>
-<paragraph role="heading" id="hd_id3156382" xml-lang="en-US" level="2">Display list</paragraph>
+<h2 id="hd_id3156382">Display list</h2>
 <paragraph role="paragraph" id="par_id3154702" xml-lang="en-US">Select the text you want to insert from the list.</paragraph>
-<paragraph role="heading" id="hd_id3150200" xml-lang="en-US" level="2">Link</paragraph>
+<h2 id="hd_id3150200">Link</h2>
 <paragraph role="paragraph" id="par_id3155333" xml-lang="en-US">Inserts the text as a link. Links are updated automatically when the source file changes.</paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/simpress/02/10110000.xhp b/source/text/simpress/02/10110000.xhp
index 56e53da7e..d61ef7a3d 100644
--- a/source/text/simpress/02/10110000.xhp
+++ b/source/text/simpress/02/10110000.xhp
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -19,9 +16,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">
+<helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0210110000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Insert</title>
@@ -31,7 +26,7 @@
 <body>
 <section id="einfuegen">
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertToolbox" id="bm_id3192356" localize="false"/>
-<paragraph role="heading" id="hd_id3149945" xml-lang="en-US" level="1"><link href="text/simpress/02/10110000.xhp" name="Insert">Insert</link></paragraph>
+<h1 id="hd_id3149945"><link href="text/simpress/02/10110000.xhp" name="Insert">Insert</link></h1>
 </section>
 <section id="syeinfuegen">
 <table id="tbl_id3153251">
@@ -48,29 +43,30 @@
 </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/new_slide.xhp" name="Slide">Slide</link></paragraph>
+<h2 id="hd_id3149028"><link href="text/simpress/01/new_slide.xhp" name="Slide">Slide</link></h2>
 <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>
+<h2 id="hd_id3154558"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></h2>
 <embed href="text/shared/01/04160500.xhp#frameeinfuegentext"/>
 <embed href="text/shared/00/00000404.xhp#syframe"/>
-<paragraph role="heading" id="hd_id3148386" xml-lang="en-US" level="2"><link href="text/simpress/01/04110000.xhp" name="File">File</link></paragraph>
-<embed href="text/simpress/01/04110000.xhp#dateitext"/>
+
+<embed href="text/simpress/01/04110100.xhp#insertslidepageobject"/>
 <embed href="text/simpress/00/00000404.xhp#syfile"/>
-<paragraph role="heading" id="hd_id3150567" xml-lang="en-US" level="2"><link href="text/simpress/01/04080100.xhp" name="Spreadsheet">Spreadsheet</link></paragraph>
+
+<h2 id="hd_id3150567"><link href="text/simpress/01/04080100.xhp" name="Spreadsheet">Spreadsheet</link></h2>
 <embed href="text/simpress/01/04080100.xhp#tabelletext"/>
 <embed href="text/simpress/00/00000404.xhp#sycalc"/>
-<paragraph role="heading" id="hd_id3155986" xml-lang="en-US" level="2"><link href="text/shared/01/04140000.xhp" name="From File">From File</link></paragraph>
+<h2 id="hd_id3155986"><link href="text/shared/01/04140000.xhp" name="From File">From File</link></h2>
 <embed href="text/shared/01/04140000.xhp#grafiktext"/>
 <embed href="text/shared/00/00000404.xhp#sygrafik"/>
 <embed href="text/shared/01/moviesound.xhp#moviesound"/>
 <embed href="text/shared/00/00000404.xhp#symoviesound"/>
-<paragraph role="heading" id="hd_id3145826" xml-lang="en-US" level="2"><link href="text/shared/01/04160300.xhp" name="Formula">Formula</link></paragraph>
+<h2 id="hd_id3145826"><link href="text/shared/01/04160300.xhp" name="Formula">Formula</link></h2>
 <embed href="text/shared/01/04160300.xhp#starmath"/>
 <embed href="text/shared/00/00000404.xhp#systarmath"/>
-<paragraph role="heading" id="hd_id3157904" xml-lang="en-US" level="2"><link href="text/shared/guide/chart_insert.xhp">Chart</link></paragraph>
+<h2 id="hd_id3157904"><link href="text/shared/guide/chart_insert.xhp">Chart</link></h2>
 <embed href="text/shared/00/00000404.xhp#systarchart"/>
-<paragraph role="heading" id="hd_id3153004" xml-lang="en-US" level="2"><link href="text/shared/01/04150100.xhp" name="OLE Object">OLE Object</link></paragraph>
+<h2 id="hd_id3153004"><link href="text/shared/01/04150100.xhp" name="OLE Object">OLE Object</link></h2>
 <embed href="text/shared/01/04150100.xhp#ole"/>
 <embed href="text/shared/00/00000404.xhp#syole"/>
 </body>
diff --git a/source/text/simpress/guide/html_import.xhp b/source/text/simpress/guide/html_import.xhp
index fce08bab0..51c80e1bb 100644
--- a/source/text/simpress/guide/html_import.xhp
+++ b/source/text/simpress/guide/html_import.xhp
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <helpdocument version="1.0">
-	
+
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -19,8 +18,8 @@
  *   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="textsimpressguidehtml_importxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Importing HTML Pages Into Presentations </title>
@@ -34,13 +33,13 @@
 <bookmark_value>text documents;inserting in slides</bookmark_value>
 <bookmark_value>inserting; text in presentations</bookmark_value>
 </bookmark><comment>mw moved "inserting;" from simpress/01/04110200.xhp</comment>
-<paragraph role="heading" id="hd_id3146121" xml-lang="en-US" level="1"><variable id="html_import"><link href="text/simpress/guide/html_import.xhp" name="Importing HTML Pages Into Presentations ">Importing HTML Pages Into Presentations </link>
-</variable></paragraph>
+<h1 id="hd_id3146121"><variable id="html_import"><link href="text/simpress/guide/html_import.xhp" name="Importing HTML Pages Into Presentations ">Importing HTML Pages Into Presentations </link>
+</variable></h1>
 <paragraph role="paragraph" id="par_id3150750" xml-lang="en-US">You can import any text file, including text in HTML documents, into a slide.</paragraph>
-<paragraph role="heading" id="hd_id3155443" xml-lang="en-US" level="3">To insert text from a file into a slide:</paragraph>
+<h3 id="hd_id3155443">To insert text from a file into a slide:</h3>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3146313" xml-lang="en-US">In the slide where you want to insert the text, choose <emph>Insert - File</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3146313" xml-lang="en-US">In the slide where you want to insert the text, choose <switchinline select="appl"><caseinline select="IMPRESS"><menuitem>Slide - Insert Slide from File</menuitem></caseinline><defaultinline><menuitem>Page - Insert Page from File</menuitem></defaultinline></switchinline>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3150207" xml-lang="en-US">Select "Text" or "HTML Document" as the <emph>File type</emph>.</paragraph>
@@ -55,11 +54,11 @@
 <paragraph role="listitem" id="par_id3149126" xml-lang="en-US">Double-click in the inserted text to enter edit mode.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3143228" xml-lang="en-US">Select all of the text that lies below the visible slide area and press <switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="listitem" id="par_id3143228" xml-lang="en-US">Select all of the text that lies below the visible slide area and press <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+X.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3153811" xml-lang="en-US">Choose <emph>Slide - New Page/Slide</emph>, and then press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V.</paragraph>
+<paragraph role="listitem" id="par_id3153811" xml-lang="en-US">Choose <switchinline select="appl"><caseinline select="IMPRESS"><menuitem>Slide - New Slide</menuitem></caseinline><defaultinline><menuitem>Page - New Page</menuitem></defaultinline></switchinline>, and then press <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+V.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3147297" xml-lang="en-US">Repeat steps 1 to 3 until all of the text is on slides.</paragraph>
diff --git a/source/text/simpress/guide/page_copy.xhp b/source/text/simpress/guide/page_copy.xhp
index 519030ab2..b727ed15b 100644
--- a/source/text/simpress/guide/page_copy.xhp
+++ b/source/text/simpress/guide/page_copy.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="textsimpressguidepage_copyxml" indexer="include" status="PUBLISH">
@@ -36,16 +33,16 @@
 <bookmark_value>inserting; slides from files</bookmark_value>
 <bookmark_value>pasting;slides from other presentations</bookmark_value>
 </bookmark><comment>mw added "pasting;"</comment>
-<paragraph role="heading" id="hd_id3146971" xml-lang="en-US" level="1"><variable id="page_copy"><link href="text/simpress/guide/page_copy.xhp" name="Copying Slides From Other Presentations">Copying Slides From Other Presentations</link>
-</variable></paragraph>
+<h1 id="hd_id3146971"><variable id="page_copy"><link href="text/simpress/guide/page_copy.xhp" name="Copying Slides From Other Presentations">Copying Slides From Other Presentations</link>
+</variable></h1>
 <paragraph role="paragraph" id="par_id3149378" xml-lang="en-US">You can insert slides from another presentation into the current presentation. You can also copy and paste slides between presentations.</paragraph>
-<paragraph role="heading" id="hd_id3153418" xml-lang="en-US" level="3">To insert a slide from another presentation:</paragraph>
+<h3 id="hd_id3153418">To insert a slide from another presentation:</h3>
 <list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3149018" xml-lang="en-US">Open a presentation, and choose <emph>View - Normal</emph>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3154702" xml-lang="en-US">Choose <emph>Insert - File</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3154702" xml-lang="en-US">Choose <switchinline select="appl"><caseinline select="IMPRESS"><menuitem>Slide - Insert Slide from File</menuitem></caseinline><defaultinline><menuitem>Page - Insert Page from File</menuitem></defaultinline></switchinline>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3159238" xml-lang="en-US">Locate the presentation file containing the slide that you want to insert, and click <emph>Insert</emph>.</paragraph>
@@ -57,7 +54,7 @@
 <paragraph role="listitem" id="par_id3148869" xml-lang="en-US">Click <emph>OK</emph>.</paragraph>
 </listitem>
 </list>
-<paragraph role="heading" id="hd_id3154651" xml-lang="en-US" level="3">To copy and paste slides between presentations:</paragraph>
+<h3 id="hd_id3154651">To copy and paste slides between presentations:</h3>
 <list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3153812" xml-lang="en-US">Open the presentations that you want to copy and paste between.</paragraph>
@@ -75,7 +72,8 @@
 <paragraph role="listitem" id="par_id3156401" xml-lang="en-US">Select the slide that you want the copied slide to follow, and then choose <emph>Edit - Paste</emph>.</paragraph>
 </listitem>
 </list>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3150655" xml-lang="en-US"><link href="text/simpress/01/04110000.xhp" name="Insert - File">Insert - File</link></paragraph>
+<section id="relatedtopics">
+    <embed href="text/simpress/01/04110100.xhp#insertobjectfromfile"/>
+</section>
 </body>
 </helpdocument>
diff --git a/source/text/simpress/main0104.xhp b/source/text/simpress/main0104.xhp
index ec121907f..a62d25f85 100644
--- a/source/text/simpress/main0104.xhp
+++ b/source/text/simpress/main0104.xhp
@@ -31,49 +31,49 @@
 <section id="insert">
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertMenu" id="bm_id2743919" localize="false"/>
 
-<paragraph id="hd_id3153726" role="heading" level="1" xml-lang="en-US"><link href="text/simpress/main0104.xhp" name="Insert">Insert</link></paragraph>
+<h1 id="hd_id3153726"><link href="text/simpress/main0104.xhp" name="Insert">Insert</link></h1>
 <paragraph id="par_id3146971" role="paragraph" xml-lang="en-US"><ahelp hid=".">This menu contains the commands that are used to insert new elements into the document, for example, graphics, objects, special characters and other files.</ahelp></paragraph>
 </section>
 
+
+
 <embed href="text/simpress/01/04120000.xhp#seiteduplizieren"/>
 <embed href="text/simpress/01/04130000.xhp#seitegliederung"/>
 <embed href="text/simpress/01/04140000.xhp#uebersicht"/>
 
-<paragraph id="par_idN105C7" role="heading" level="2" xml-lang="en-US"><link href="text/simpress/01/03152000.xhp">Page Number</link></paragraph>
+<h2 id="par_idN105C7"><link href="text/simpress/01/03152000.xhp">Page Number</link></h2>
 <paragraph id="par_idN10609" role="paragraph" xml-lang="en-US">Adds the slide number or the page number.</paragraph>
 
-<paragraph id="par_idN105D7" role="heading" level="2" xml-lang="en-US"><link href="text/simpress/01/03152000.xhp">Date and Time</link></paragraph>
+<h2 id="par_idN105D7"><link href="text/simpress/01/03152000.xhp">Date and Time</link></h2>
 <paragraph id="par_idN10624" role="paragraph" xml-lang="en-US">Adds the date and time as a field.</paragraph>
 <embed href="text/simpress/01/04990000.xhp#feldbefehl"/>
 
-<paragraph id="hd_id0915200910362363" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></paragraph>
+<h2 id="hd_id0915200910362363"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></h2>
 <embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
 
-<paragraph id="hd_id3153964" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></paragraph>
+<h2 id="hd_id3153964"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></h2>
 <embed href="text/shared/01/04100000.xhp#sonder"/>
 <embed href="text/shared/01/formatting_mark.xhp#formatting_mark"/>
 
-<paragraph id="hd_id3145790" role="heading" level="2" xml-lang="en-US"><link href="text/shared/02/09070000.xhp" name="Hyperlink">Hyperlink</link></paragraph>
+<h2 id="hd_id3145790"><link href="text/shared/02/09070000.xhp" name="Hyperlink">Hyperlink</link></h2>
 <embed href="text/shared/02/09070000.xhp#hyperdiatext"/>
 
-<paragraph id="par_idN10651" role="heading" level="2" xml-lang="en-US"><link href="text/simpress/01/06050000.xhp">Animated Image</link><comment>UFI: renamed and moved from main0114, spec "presentation engine for q"</comment></paragraph>
+<h2 id="par_idN10651"><link href="text/simpress/01/06050000.xhp">Animated Image</link><comment>UFI: renamed and moved from main0114, spec "presentation engine for q"</comment></h2>
 <embed href="text/simpress/01/06050000.xhp#animtext"/>
 
-<paragraph id="hd_id3145768" role="heading" level="2" xml-lang="en-US"><link href="text/simpress/01/04080100.xhp" name="Table">Table</link></paragraph>
+<h2 id="hd_id3145768"><link href="text/simpress/01/04080100.xhp" name="Table">Table</link></h2>
 <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 id="hd_id3143232" role="heading" level="2" xml-lang="en-US"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link></paragraph>
+<h2 id="hd_id3143232"><link href="text/schart/01/wiz_chart_type.xhp" name="Chart">Chart</link></h2>
 <paragraph id="par_id0302200904013251" role="paragraph" xml-lang="en-US">Inserts a chart.</paragraph>
 
-<paragraph id="hd_id3153812" role="heading" level="2" xml-lang="en-US"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></paragraph>
+<h2 id="hd_id3153812"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></h2>
 <embed href="text/shared/01/04160500.xhp#frameeinfuegentext"/>
 
-<paragraph id="hd_id3149050" role="heading" level="2" xml-lang="en-US"><link href="text/simpress/01/04110000.xhp" name="File">File</link></paragraph>
-<embed href="text/simpress/01/04110000.xhp#dateitext"/>
 <embed href="text/simpress/01/03152000.xhp#headerandfooter"/>
 </body>
 
-</helpdocument>
\ No newline at end of file
+</helpdocument>


More information about the Libreoffice-commits mailing list