tdf#162607 Remove dup's in hid2file.js, .uno:InsertColumns

+ Deleted simpress/01/04040000m.xhp as it is not linked from any other page.
+ Review Table toolbar page at main0204.xhp (part)
+ Review InsertColumnsAfter / Before
+ Wrap icons to make embed-able in other Help pages
+ left swriter/02/04100000.xhp as unique entry for .uno:InsertColumns command
+ refactor here and there

Change-Id: Ibbfcf7ae5d848161d2e696b1cae14b4073f78a94
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/172395
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

9 files changed, 38 insertions, 91 deletions

diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index 4c89cc8be6..b9f844b61d 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
     helpcontent2/source/text/simpress/01/new_slide \
     helpcontent2/source/text/simpress/01/04030000 \
     helpcontent2/source/text/simpress/01/04030100 \
-    helpcontent2/source/text/simpress/01/04040000m \
     helpcontent2/source/text/simpress/01/04110100 \
     helpcontent2/source/text/simpress/01/04110200 \
     helpcontent2/source/text/simpress/01/04120000 \
diff --git a/source/text/shared/00/00000404.xhp b/source/text/shared/00/00000404.xhp
index 80860dc7da..b13181a05a 100644
--- a/source/text/shared/00/00000404.xhp
+++ b/source/text/shared/00/00000404.xhp
@@ -144,18 +144,18 @@
         </default>
     </switch>
     <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
-
+        <section id="icon_insert_column_before">
         <table id="tab_id51693666125575">
         <tablerow>
             <tablecell>
-                <paragraph id="par_id821693670669999" role="paragraph"><image src="cmd/lc_insertrowsbefore.svg" id="img_id951693666325577" width="1cm"  height="1cm"><alt id="alt_id131693666425578">Icon Insert Columns Before</alt></image></paragraph>
+                <paragraph id="par_id821693670669999" role="paragraph"><image src="cmd/lc_insertcolumnsbefore.svg" id="img_id951693666325577" width="1cm"  height="1cm"><alt id="alt_id131693666425578">Icon Insert Columns Before</alt></image></paragraph>
             </tablecell>
             <tablecell>
                 <paragraph id="par_id961693670681629" role="paragraph">Insert Column Before</paragraph>
             </tablecell>
         </tablerow>
         </table>
-
+        </section>
     <switch select="appl">
         <case select="WRITER">
             <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
@@ -256,7 +256,8 @@
         </default>
     </switch>
     <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
-    <table id="tab_id51693666125545">
+    <section id="icon_insert_column_after">
+        <table id="tab_id51693666125545">
         <tablerow>
             <tablecell>
                 <paragraph id="par_id411693670408184" role="paragraph"><image src="cmd/lc_insertcolumnsafter.svg" id="img_id951693666125577" width="1cm"  height="1cm"><alt id="alt_id131293666125578">Icon Insert Columns After</alt></image></paragraph>
@@ -265,7 +266,8 @@
                 <paragraph id="par_id471693670416847" role="paragraph">Insert Columns After</paragraph>
             </tablecell>
         </tablerow>
-    </table>
+        </table>
+    </section>
     <switch select="appl">
         <case select="WRITER">
             <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
diff --git a/source/text/shared/01/InsertColumnsAfter.xhp b/source/text/shared/01/InsertColumnsAfter.xhp
index 5be283a85c..8672729d89 100644
--- a/source/text/shared/01/InsertColumnsAfter.xhp
+++ b/source/text/shared/01/InsertColumnsAfter.xhp
@@ -23,15 +23,10 @@
     </bookmark>
     <section id="insert_columns_after">
         <h1 id="hd_id901693661066439"><variable id="h1"><link href="text/shared/01/InsertColumnsAfter.xhp">Columns After</link></variable></h1>
-        <paragraph role="paragraph" id="par_id811605976075887">Insert a column after the column where the cursor is currently placed.</paragraph>
+        <paragraph role="paragraph" id="par_id811605976075887">Insert a column after the column where the cursor is currently placed. The number of columns inserted corresponds to the number of columns selected. If no column is selected, one column is inserted. The existing columns are moved to the right</paragraph>
     </section>
     <section id="howtoget">
         <embed href="text/shared/00/00000404.xhp#insert_columns_after"/>
     </section>
-        <switch select="appl">
-        <case select="CALC">
-            <paragraph id="par_id160220162214111932" role="paragraph"><variable id="sheet_insert_columns">Inserts columns to the right of the active cell.</variable> The number of columns inserted corresponds to the number of columns selected. If no column is selected, one column is inserted. The existing columns are moved to the right.</paragraph>
-        </case>
-    </switch>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/InsertColumnsBefore.xhp b/source/text/shared/01/InsertColumnsBefore.xhp
index 08d4b43134..6d2ea3bfca 100644
--- a/source/text/shared/01/InsertColumnsBefore.xhp
+++ b/source/text/shared/01/InsertColumnsBefore.xhp
@@ -23,15 +23,10 @@
     </bookmark>
     <section id="insert_columns_before">
         <h1 id="hd_id901693661066439"><variable id="h1"><link href="text/shared/01/InsertColumnsBefore.xhp">Columns Before</link></variable></h1>
-        <paragraph role="paragraph" id="par_id811605976075887">Insert a column before the column where the cursor is currently placed.</paragraph>
+        <paragraph role="paragraph" id="par_id811605976075887">Insert a column before the column where the cursor is currently placed. The number of columns inserted corresponds to the number of columns selected. If no column is selected, one column is inserted. The existing columns are moved to the right</paragraph>
     </section>
     <section id="howtoget">
         <embed href="text/shared/00/00000404.xhp#insert_columns_before"/>
     </section>
-        <switch select="appl">
-        <case select="CALC">
-            <paragraph id="par_id160220162214111932" role="paragraph"><variable id="sheet_insert_columns">Inserts columns to the left of the active cell.</variable> The number of columns inserted corresponds to the number of columns selected. If no column is selected, one column is inserted. The existing columns are moved to the right.</paragraph>
-        </case>
-    </switch>
 </body>
 </helpdocument>
diff --git a/source/text/shared/main0204.xhp b/source/text/shared/main0204.xhp
index 2f2b67c02c..3d9ee11085 100644
--- a/source/text/shared/main0204.xhp
+++ b/source/text/shared/main0204.xhp
@@ -30,6 +30,22 @@
 <h1 id="hd_id3145587"><link href="text/shared/main0204.xhp">Table Bar</link></h1>
 <paragraph role="paragraph" id="par_id3154252"><ahelp hid=".">The <emph>Table</emph> Bar contains functions you need when working with tables. It appears when you move the cursor into a table.</ahelp></paragraph>
 </section>
+
+<embed href="text/shared/01/InsertRowsAfter.xhp#insert_rows_below"/>
+<embed href="text/shared/00/00000404.xhp#icon_insert_row_below"/>
+<embed href="text/shared/01/InsertRowsBefore.xhp#insert_rows_above"/>
+<embed href="text/shared/00/00000404.xhp#icon_insert_row_above"/>
+
+<embed href="text/shared/01/InsertColumnsAfter.xhp#insert_columns_after"/>
+<embed href="text/shared/00/00000404.xhp#icon_insert_column_after"/>
+<embed href="text/shared/01/InsertColumnsBefore.xhp#insert_columns_before"/>
+<embed href="text/shared/00/00000404.xhp#icon_insert_column_before"/>
+
+<embed href="text/shared/01/DeleteRows.xhp#delete_rows"/>
+<embed href="text/swriter/00/00000405.xhp#sydelete_row"/>
+<embed href="text/shared/01/DeleteColumns.xhp#delete_columns"/>
+<embed href="text/swriter/00/00000405.xhp#sydelete_column"/>
+
 <embed href="text/shared/01/insert_table.xhp#inserttable"/>
 <embed href="text/swriter/00/00000404.xhp#syinsert_table"/>
 <embed href="text/shared/02/03140000.xhp#line_style"/>
@@ -50,19 +66,6 @@
 <embed href="text/shared/01/05100600.xhp#center_vertical"/>
 <embed href="text/shared/01/05100700.xhp#bottom"/>
 
-<embed href="text/shared/01/InsertRowsAfter.xhp#insert_rows_below"/>
-<embed href="text/shared/00/00000404.xhp#icon_insert_row_below"/>
-<embed href="text/shared/01/InsertRowsBefore.xhp#insert_rows_above"/>
-<embed href="text/shared/00/00000404.xhp#icon_insert_row_above"/>
-
-<embed href="text/swriter/02/04100000.xhp#insert_column"/>
-<embed href="text/swriter/02/04100000.xhp#syinsert_column"/>
-<h2 id="hd_id3147820"><link href="text/swriter/01/05110500.xhp">Delete Row</link></h2>
-<embed href="text/swriter/01/05110500.xhp#loeschentext"/>
-<embed href="text/swriter/00/00000405.xhp#sydelete_row"/>
-<h2 id="hd_id3147231"><link href="text/swriter/01/05120500.xhp">Delete Column</link></h2>
-<embed href="text/swriter/01/05120500.xhp#loeschentext"/>
-<embed href="text/swriter/00/00000405.xhp#sydelete_column"/>
 <comment>following only optional, ext.help is available: Select Table Select Column Select Row</comment>
 <bookmark branch="hid/.uno:TableDesign" id="bm_id091620081221536" localize="false"/>
 <h2 id="hd_id3134447820">Table Design</h2>
diff --git a/source/text/simpress/01/04040000m.xhp b/source/text/simpress/01/04040000m.xhp
deleted file mode 100644
index 61a984f12a..0000000000
--- a/source/text/simpress/01/04040000m.xhp
+++ /dev/null
@@ -1,41 +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="textsimpress0104040000mxml" indexer="include">
-<title id="tit" xml-lang="en-US">Columns</title>
-<filename>/text/simpress/01/04040000m.xhp</filename>
-</topic>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id31556284711"><bookmark_value>inserting; columns</bookmark_value>
-<bookmark_value>columns; inserting</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertColumns" id="bm_id601010" localize="false"/>
-<h1 id="hd_id3155628"><link href="text/simpress/01/04040000m.xhp">Columns</link></h1>
-<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US"><ahelp hid=".uno:InsertColumns">Inserts a new column to the left of the active cell. The number of columns inserted correspond to the number of columns selected. The existing columns are moved to the right.</ahelp></paragraph>
-<section id="howtoget">
-<paragraph role="paragraph" id="par_id0916200811234668" xml-lang="en-US">In the context menu of a cell, choose <emph>Insert - Columns</emph>
-</paragraph>
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/simpress/guide/table_insert.xhp b/source/text/simpress/guide/table_insert.xhp
index 53cd57aeea..4741248142 100644
--- a/source/text/simpress/guide/table_insert.xhp
+++ b/source/text/simpress/guide/table_insert.xhp
@@ -73,8 +73,8 @@ Slides</title>
 <paragraph role="paragraph" id="par_id0916200804163092"><ahelp hid="." visibility="hidden">Distributes the width of the selected or all columns to the same size. The width of the table is not changed.</ahelp></paragraph>
 
 <paragraph role="paragraph" id="par_id0916200804163046"><ahelp hid="." visibility="hidden">If currently no cell is selected, all columns will be selected. If currently cells are selected, all columns containing the selected cells will be selected.</ahelp></paragraph>
-<bookmark branch="hid/.uno:InsertColumns" id="bm_id0916200804122650" localize="false"/>
-<paragraph role="paragraph" id="par_id0916200804163128"><ahelp hid="." visibility="hidden">If currently no cell is selected, a new column will be inserted at the right border of the table. If currently cells are selected, as many new columns as the selection has will be inserted right of the selection.</ahelp></paragraph>
+
+<paragraph role="paragraph" id="par_id0916200804163128"><ahelp hid="hid/.uno:InsertColumns" visibility="hidden">If currently no cell is selected, a new column will be inserted at the right border of the table. If currently cells are selected, as many new columns as the selection has will be inserted right of the selection.</ahelp></paragraph>
 
 <paragraph role="paragraph" id="par_id0916200804163127"><ahelp hid="." visibility="hidden">All columns of the current selection will be deleted.</ahelp></paragraph>
 <bookmark branch="hid/.uno:AlignObjectMenu" id="bm_id0916200804143882" localize="false"/><comment>sic</comment>
diff --git a/source/text/swriter/02/04090000.xhp b/source/text/swriter/02/04090000.xhp
index aa3919de2f..cfacdcec3d 100644
--- a/source/text/swriter/02/04090000.xhp
+++ b/source/text/swriter/02/04090000.xhp
@@ -27,11 +27,11 @@
 </history>
 </meta>
 <body>
-<section id="insert_rows">
 <bookmark branch="index" id="bm_id3154838"><bookmark_value>tables; inserting rows</bookmark_value>
 <bookmark_value>rows; inserting in tables, using icon</bookmark_value>
 </bookmark>
 <bookmark branch="hid/.uno:InsertRows" id="bm_id8022206" localize="false"/>
+<section id="insert_rows">
 <h1 id="hd_id3154838"><link href="text/swriter/02/04090000.xhp">Insert Rows</link></h1>
 <paragraph role="paragraph" id="par_id3147407"><ahelp hid=".uno:InsertRows">Inserts one or more rows in the table, below the selection. You can insert more than one row by opening the dialog (choose <emph>Table - Insert - Rows</emph>), or by selecting more than one row before clicking the icon.</ahelp> The second method inserts rows of the same height as the originally selected rows.</paragraph>
 </section>
diff --git a/source/text/swriter/02/04100000.xhp b/source/text/swriter/02/04100000.xhp
index 1ba21fa190..b01ad60d26 100644
--- a/source/text/swriter/02/04100000.xhp
+++ b/source/text/swriter/02/04100000.xhp
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,13 +16,10 @@
  *   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="textswriter0204100000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Insert Column</title>
+<title id="tit">Insert Column</title>
 <filename>/text/swriter/02/04100000.xhp</filename>
 </topic>
 <history>
@@ -32,24 +27,23 @@
 </history>
 </meta>
 <body>
-<section id="insert_column">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3152899"><bookmark_value>tables; inserting columns in</bookmark_value>
+<bookmark branch="index" id="bm_id3152899"><bookmark_value>tables; inserting columns in</bookmark_value>
 <bookmark_value>columns; inserting in tables</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertColumns" id="bm_id2116346" localize="false"/>
+<bookmark branch="hid/.uno:InsertColumns" id="bm_id2116346" localize="false"/>
+<section id="insert_column">
 <h1 id="hd_id3152899"><link href="text/swriter/02/04100000.xhp">Insert Column</link></h1>
-<paragraph role="paragraph" id="par_id3145078" xml-lang="en-US"><ahelp hid=".uno:InsertColumns">Inserts one or more columns into the table, after the selection. You can insert several columns at the same time by opening the dialog (choose <emph>Table - Insert - Columns</emph>), or by selecting several columns before clicking the icon.</ahelp> If the latter method is used, the columns inserted will have the same relative width as the selected columns.</paragraph>
+<paragraph role="paragraph" id="par_id3145078"><ahelp hid=".uno:InsertColumns">Inserts one or more columns into the table, after the selection. You can insert several columns at the same time by opening the dialog (choose <emph>Table - Insert - Columns</emph>), or by selecting several columns before clicking the icon.</ahelp> If the latter method is used, the columns inserted will have the same relative width as the selected columns.</paragraph>
 </section>
+
 <section id="syinsert_column">
 <table id="tbl_id3149804">
 <tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149691" xml-lang="en-US">
-<image id="img_id3155174" src="cmd/sc_insertcolumns.png" width="0.222inch" height="0.222inch"><alt id="alt_id3155174" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
+<tablecell>
+<paragraph role="paragraph" id="par_id3149691"><image id="img_id3155174" src="cmd/lc_insertcolumnsafter.svg" width="1cm" height="1cm"><alt id="alt_id3155174">Icon</alt></image></paragraph>
 </tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US">Insert Column</paragraph>
+<tablecell>
+<paragraph role="paragraph" id="par_id3149669">Insert Column</paragraph>
 </tablecell>
 </tablerow>
 </table>