Revisit Insert Image help page

Updates on menus and instructions

Change-Id: I45bbc4709baf550d0caad5700754e7f168c64ba3
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135423
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

4 files changed, 59 insertions, 67 deletions

diff --git a/source/text/sdraw/main_insert.xhp b/source/text/sdraw/main_insert.xhp
index 3d6440e790..bcee2b629b 100644
--- a/source/text/sdraw/main_insert.xhp
+++ b/source/text/sdraw/main_insert.xhp
@@ -32,8 +32,7 @@
          <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>
 
-      <h2 id="hd_id591566076088696"><link href="text/sdraw/guide/graphic_insert.xhp" name="linkname">Image</link></h2>
-      <paragraph role="paragraph" id="par_id91566076127444">Insert an image</paragraph>
+      <embed href="text/shared/01/04140000.xhp#insertimageh1"/>
       <embed href="text/shared/menu/insert_chart.xhp#chart"/>
       <h2 id="hd_id3156385"><link href="text/simpress/01/04080100.xhp" name="Table">Table</link></h2>
       <embed href="text/simpress/01/04080100.xhp#tabelletext"/>
diff --git a/source/text/shared/01/04140000.xhp b/source/text/shared/01/04140000.xhp
index 021fb21c6c..27f19fea92 100644
--- a/source/text/shared/01/04140000.xhp
+++ b/source/text/shared/01/04140000.xhp
@@ -29,19 +29,24 @@
 
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertGraphic" id="bm_id3150278" localize="false"/>
 <section id="insertimageh1">
-<h1 id="hd_id3154350"><link href="text/shared/01/04140000.xhp" name="Inserting Images">Inserting Images</link></h1>
-<paragraph id="par_id3159411" role="paragraph" xml-lang="en-US"><variable id="image_text"><variable id="grafiktext"><ahelp hid=".uno:InsertGraphic">Inserts an image into the current document <switchinline select="appl"><caseinline select="WRITER">with optimal page wrapping and centered on the line
-</caseinline><caseinline select="CALC">at the current cell position
-</caseinline><defaultinline>centered on the page or slide</defaultinline></switchinline>.</ahelp></variable></variable></paragraph>
+<h1 id="hd_id3154350"><link href="text/shared/01/04140000.xhp" name="Inserting Images">Image</link></h1>
+<paragraph id="par_id3159411" role="paragraph" xml-lang="en-US"><variable id="image_text"><variable id="grafiktext"><ahelp hid=".uno:InsertGraphic">Opens a file selection dialog to insert an image into the current document.</ahelp></variable></variable></paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/shared/00/00000404.xhp#image"/>
 </section>
 <embed href="text/shared/guide/insert_bitmap.xhp#insert_bitmap"/>
 <bookmark xml-lang="en-US" branch="hid/SVT_HID_FILEOPEN_IMAGE_TEMPLATE" id="bm_id3150902" localize="false"/>
-
-<h2 id="hd_id3149760">Frame Style</h2>
+<switch select="appl">
+<case select="WRITER">
+<h2 id="hd_id3149760">Style</h2>
 <paragraph id="par_id3154398" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FILEOPEN_IMAGE_TEMPLATE">Select the frame style for the graphic.</ahelp></paragraph>
+</case>
+<case select="CALC">
+  <h2 id="hd_id721654336786322">Anchor</h2>
+  <paragraph role="paragraph" id="par_id501654336810460">Select the anchor type for the image at the current cell position.</paragraph>
+  </case>
+</switch>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_OFA_HYPERLINK_URL_TXT" id="bm_id3157991" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SVT_HID_FILEDLG_LINK_CB" id="bm_id3152542" localize="false"/>
 
diff --git a/source/text/shared/guide/insert_bitmap.xhp b/source/text/shared/guide/insert_bitmap.xhp
index e6530fcf0f..d40579549e 100644
--- a/source/text/shared/guide/insert_bitmap.xhp
+++ b/source/text/shared/guide/insert_bitmap.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="textsharedguideinsert_bitmapxml" indexer="include">
 <title id="tit" xml-lang="en-US">Inserting, Editing, Saving Bitmaps</title>
@@ -50,18 +50,23 @@
 <bookmark_value>pictures;filters</bookmark_value>
 <bookmark_value>filters;pictures</bookmark_value>
 </bookmark><comment>mw made "illustrations,..." a see-reference</comment>
-<paragraph role="heading" id="hd_id3154136" xml-lang="en-US" level="1"><variable id="insert_bitmap"><link href="text/shared/guide/insert_bitmap.xhp" name="Inserting, Editing, Saving Bitmaps">Inserting, Editing, Saving Bitmaps</link>
-</variable></paragraph>
-<paragraph role="heading" id="hd_id3149811" xml-lang="en-US" level="2">Inserting Bitmaps</paragraph>
+<h1 id="hd_id3154136"><variable id="insert_bitmap"><link href="text/shared/guide/insert_bitmap.xhp" name="Inserting, Editing, Saving Bitmaps">Inserting, Editing, Saving Bitmaps Images</link>
+</variable></h1>
+<h2 id="hd_id3149811">Inserting Bitmaps</h2>
 <paragraph role="paragraph" id="par_id3153031" xml-lang="en-US">A bitmap image can be inserted in $[officename] Writer, $[officename] Calc, $[officename] Draw and $[officename] Impress documents.</paragraph>
+
+<section id="insertgraphicsequence">
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3147209" xml-lang="en-US">Choose <emph>Insert - Image - From File</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3147209" xml-lang="en-US">Choose <emph>Insert - Image</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3149236" xml-lang="en-US">Select the file. In the <emph>File type</emph> box you can restrict the selection to certain file types.</paragraph>
 </listitem>
 <listitem>
+<paragraph role="paragraph" id="par_id361654339227514"><switchinline select="appl"><caseinline select="WRITER">Select the frame style for the image.</caseinline><caseinline select="CALC">Select the anchor type for the image at the current cell position.</caseinline><defaultinline>Check below.</defaultinline></switchinline></paragraph>
+</listitem>
+<listitem>
 <paragraph role="listitem" id="par_id3153126" xml-lang="en-US">Click the <emph>Link</emph> box if you want a link to the original file.</paragraph>
 <paragraph role="listitem" id="par_id3154306" xml-lang="en-US">If the <emph>Link</emph> box is marked, whenever the document is updated and loaded the bitmap image is reloaded. The editing steps that you have carried out in the local copy of the image in the document are re-applied and the image is displayed.</paragraph>
 <paragraph role="listitem" id="par_id3147336" xml-lang="en-US">If the <emph>Link</emph> box is not marked, you are always working with the copy created when the graphic was first inserted.</paragraph>
@@ -71,15 +76,16 @@
 <paragraph role="listitem" id="par_id3151384" xml-lang="en-US">Click <emph>Open</emph> to insert the image.</paragraph>
 </listitem>
 </list>
-<paragraph role="heading" id="hd_id3147303" xml-lang="en-US" level="2">Editing Bitmaps</paragraph>
-<paragraph role="heading" id="hd_id187078" xml-lang="en-US" level="3">Icons on the Image bar</paragraph>
+</section>
+<h2 id="hd_id3147303">Editing Bitmaps</h2>
+<h3 id="hd_id187078">Icons on the Image bar</h3>
 <paragraph role="paragraph" id="par_id3148552" xml-lang="en-US">When you select the bitmap image, the <emph>Image</emph> Bar offers you the tools for editing the image. Only a local copy is edited in the document, even if you have inserted an image as a link.</paragraph>
-<paragraph role="note" id="par_id3159413" xml-lang="en-US">The <emph>Image</emph> Bar may look slightly different depending to the module you are using.</paragraph>
+<note id="par_id3159413">The <emph>Image</emph> Bar may look slightly different depending to the module you are using.</note>
 <paragraph role="paragraph" id="par_id3154124" xml-lang="en-US">A number of filters are located on the <link href="text/shared/02/24010000.xhp" name="Image Filter"><emph>Image Filter</emph></link> toolbar, which you can open with the icon on the <emph>Image</emph> Bar. </paragraph>
 <paragraph role="paragraph" id="par_id7055574" xml-lang="en-US">The original image file will not be changed by the filters. Filters are applied to an image only inside the document. </paragraph>
 <paragraph role="paragraph" id="par_id3145273" xml-lang="en-US">Some of the filters open a dialog, which you can use to select, for example, the intensity of the filter. Most filters can be applied multiple times to increase the filter effect.</paragraph>
-<paragraph role="note" id="par_id3150105" xml-lang="en-US">In $[officename] Draw and $[officename] Impress, you can add text and graphics, select these objects together with the bitmap, and export the selection as a new bitmap image.</paragraph>
-<paragraph role="heading" id="hd_id2572405" xml-lang="en-US" level="3">The Image dialog</paragraph>
+<note id="par_id3150105">In $[officename] Draw and $[officename] Impress, you can add text and graphics, select these objects together with the bitmap, and export the selection as a new bitmap image.</note>
+<h3 id="hd_id2572405">The Image dialog</h3>
 <list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id6457411" xml-lang="en-US">Right-click the image and choose <emph>Image</emph> from the submenu to open a properties dialog.</paragraph>
@@ -88,7 +94,7 @@
 <paragraph role="paragraph" id="par_id7991882" xml-lang="en-US">Change the properties of the selected image, then click OK.</paragraph>
 </listitem>
 </list>
-<paragraph role="heading" id="hd_id3153574" xml-lang="en-US" level="2">Saving Bitmaps</paragraph>
+<h2 id="hd_id3153574">Saving Bitmaps</h2>
 <paragraph role="paragraph" id="par_id3152576" xml-lang="en-US">If you want to save in a format such as GIF, JPEG or TIFF, you must select and export the bitmap image.</paragraph>
 <paragraph role="paragraph" id="par_id0801200803544667" xml-lang="en-US">To export a bitmap in Draw or Impress:</paragraph>
 <list type="ordered">
@@ -112,29 +118,20 @@
 </list>
 <bookmark xml-lang="en-US" branch="hid/.uno:SaveGraphic" id="bm_id0801200803523126" localize="false"/>
 <paragraph role="paragraph" id="par_id0801200803525078" xml-lang="en-US"><ahelp hid=".">To export a bitmap in Writer: Right-click the bitmap, choose Save Graphics. You see the Image Export dialog. Enter a file name and select a file type.</ahelp></paragraph>
+<section id="relatedtopics">
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/shared/guide/dragdrop.xhp#dragdrop"/>
 <embed href="text/shared/guide/imagemap.xhp#imagemap"/>
 <paragraph role="paragraph" id="par_id1033051" xml-lang="en-US"><link href="text/shared/02/24010000.xhp">Image Filter Bar from the Image Bar</link></paragraph>
 <switch select="appl">
-<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
-</case>
-</switch>
-<switch select="appl">
-<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
-</case>
-</switch>
-<switch select="appl">
-<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
-</case>
-</switch>
-<switch select="appl">
-<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
-</case>
-</switch>
-<switch select="appl">
-<case select="WRITER"><embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
+<case select="WRITER">
+<embed href="text/swriter/guide/insert_graphic_dialog.xhp#insert_graphic_dialog"/>
+<embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
+<embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
+<embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
+<embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
 </case>
 </switch>
+</section>
 </body>
 </helpdocument>
diff --git a/source/text/swriter/guide/insert_graphic_dialog.xhp b/source/text/swriter/guide/insert_graphic_dialog.xhp
index 7adabb171c..5778d23aa4 100644
--- a/source/text/swriter/guide/insert_graphic_dialog.xhp
+++ b/source/text/swriter/guide/insert_graphic_dialog.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,38 +18,29 @@
  *   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="textswriterguideinsert_graphic_dialogxml" indexer="include"
-             status="PUBLISH">
+      <topic id="textswriterguideinsert_graphic_dialogxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Inserting a Graphic From a File</title>
          <filename>/text/swriter/guide/insert_graphic_dialog.xhp</filename>
       </topic>
    </meta>
    <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154896"><bookmark_value>pictures; inserting by dialog</bookmark_value>
-      <bookmark_value>inserting; pictures, by dialog</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3154896">
+<bookmark_value>pictures; inserting by dialog</bookmark_value>
+<bookmark_value>inserting; pictures, by dialog</bookmark_value>
 </bookmark>
-<paragraph xml-lang="en-US" id="hd_id3154896" role="heading" level="1"><variable id="insert_graphic_dialog"><link href="text/swriter/guide/insert_graphic_dialog.xhp" name="Inserting a Graphic From a File">Inserting a Graphic From a File</link>
-</variable></paragraph>
-      <list type="ordered">
-         <listitem>
-            <paragraph xml-lang="en-US" id="par_id3155914" role="listitem">Click in the document where you want to insert the graphic.</paragraph>
-         </listitem>
-         <listitem>
-            <paragraph xml-lang="en-US" id="par_id3155864" role="listitem">Choose <link href="text/shared/01/04140000.xhp" name="Insert - Image - From File"><emph>Insert - Image - From File</emph></link>.</paragraph>
-         </listitem>
-         <listitem>
-            <paragraph xml-lang="en-US" id="par_id3156021" role="listitem">Locate the graphic file that you want to insert, and then click <emph>Open</emph>.</paragraph>
-         </listitem>
-      </list>
-      <paragraph xml-lang="en-US" id="par_id3153396" role="paragraph">By default, the inserted graphic is centered above the paragraph that you clicked in.</paragraph>
-      <embed href="text/shared/00/00000004.xhp#related"/>
-      <embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
-      <embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
-      <embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
-      <embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
-      <embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
-   </body>
-</helpdocument>
\ No newline at end of file
+<h1 id="hd_id3154896"><variable id="insert_graphic_dialog"><link href="text/swriter/guide/insert_graphic_dialog.xhp" name="Inserting a Graphic From a File">Inserting a Graphic From a File</link>
+</variable></h1>
+<embed href="text/shared/guide/insert_bitmap.xhp#insertgraphicsequence"/>
+<paragraph xml-lang="en-US" id="par_id3153396" role="paragraph">By default, the inserted graphic is centered above the paragraph that you clicked in.</paragraph>
+<section id="relatedtopics">
+<embed href="text/swriter/guide/insert_graphic.xhp#insert_graphic"/>
+<embed href="text/swriter/guide/insert_graphic_gallery.xhp#insert_graphic_gallery"/>
+<embed href="text/swriter/guide/insert_graphic_scan.xhp#insert_graphic_scan"/>
+<embed href="text/swriter/guide/insert_graphic_fromdraw.xhp#insert_graphic_fromdraw"/>
+<embed href="text/swriter/guide/insert_graphic_fromchart.xhp#insert_graphic_fromchart"/>
+</section>
+</body>
+</helpdocument>