tdf#155876 UI cmds Calc-Sheet menu (28)

+ Sheet menu for Calc, delete row/column/breaks
+ refactoring

Change-Id: I0905cfc84ccb9c2e914b4fdd65d4897e6f6f62f6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160527
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit c487633e84637e8b71bb92001f16a2ff4051c11c)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160632

11 files changed, 161 insertions, 92 deletions

diff --git a/source/text/scalc/00/00000402.xhp b/source/text/scalc/00/00000402.xhp
index 0f09d1dbbe..3c71881376 100644
--- a/source/text/scalc/00/00000402.xhp
+++ b/source/text/scalc/00/00000402.xhp
@@ -20,7 +20,7 @@
 
 <meta>
   <topic id="textscalc0000000402xml" indexer="exclude" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Edit Menu</title>
+    <title id="tit">Edit Menu</title>
     <filename>/text/scalc/00/00000402.xhp</filename>
   </topic>
 </meta>
@@ -33,7 +33,7 @@
   <table id="tab_id121697473927566">
     <tablerow>
       <tablecell>
-        <paragraph id="par_id131697473927567" role="paragraph"><image src="cmd/lc_selecttables.svg" id="img_id501697473927568" width="1cm"  height="1cm"><alt id="alt_id121697473927569">Icon Select</alt></image></paragraph>
+        <paragraph id="par_id131697473927567" role="paragraph"><image src="cmd/lc_selecttables.svg" id="img_id501697473927568" width="1cm" height="1cm"><alt id="alt_id121697473927569">Icon Select</alt></image></paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id611697473927571" role="paragraph">Select</paragraph>
@@ -50,7 +50,7 @@
   <table id="tab_id341697495544816">
     <tablerow>
       <tablecell>
-        <paragraph id="par_id271697495544817" role="paragraph"><image src="cmd/lc_tableselectall.svg" id="img_id321697495544818" width="1cm"  height="1cm"><alt id="alt_id131697495544819">Icon Select all Sheets</alt></image></paragraph>
+        <paragraph id="par_id271697495544817" role="paragraph"><image src="cmd/lc_tableselectall.svg" id="img_id321697495544818" width="1cm" height="1cm"><alt id="alt_id131697495544819">Icon Select all Sheets</alt></image></paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id801697495544821" role="paragraph">Select all Sheets</paragraph>
@@ -66,7 +66,7 @@
   <table id="tab_id321697495708770">
     <tablerow>
       <tablecell>
-        <paragraph id="par_id481697495708771" role="paragraph"><image src="cmd/lc_selecttables.svg" id="img_id751697495708772" width="1cm"  height="1cm"><alt id="alt_id841697495708773">Icon Select Sheets</alt></image></paragraph>
+        <paragraph id="par_id481697495708771" role="paragraph"><image src="cmd/lc_selecttables.svg" id="img_id751697495708772" width="1cm" height="1cm"><alt id="alt_id841697495708773">Icon Select Sheets</alt></image></paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id521697495708775" role="paragraph">Select Sheets</paragraph>
@@ -93,7 +93,7 @@
   <table id="tab_id751697544995896">
     <tablerow>
       <tablecell>
-        <paragraph id="par_id371697544995897" role="paragraph"><image src="cmd/lc_entirerow.svg" id="img_id591697544995898" width="1cm"  height="1cm"><alt id="alt_id411697544995899">Icon Select Row</alt></image></paragraph>
+        <paragraph id="par_id371697544995897" role="paragraph"><image src="cmd/lc_entirerow.svg" id="img_id591697544995898" width="1cm" height="1cm"><alt id="alt_id411697544995899">Icon Select Row</alt></image></paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id451697544995901" role="paragraph">Select Row</paragraph>
@@ -113,7 +113,7 @@
   <table id="tab_id391697545337469">
     <tablerow>
       <tablecell>
-        <paragraph id="par_id171697545337470" role="paragraph"><image src="cmd/lc_entirecolumn.svg" id="img_id821697545337471" width="1cm"  height="1cm"><alt id="alt_id111697545337472">Icon Select Column</alt></image></paragraph>
+        <paragraph id="par_id171697545337470" role="paragraph"><image src="cmd/lc_entirecolumn.svg" id="img_id821697545337471" width="1cm" height="1cm"><alt id="alt_id111697545337472">Icon Select Column</alt></image></paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id341697545337474" role="paragraph">Select Column</paragraph>
@@ -132,7 +132,7 @@
   <table id="tab_id791697547448431">
     <tablerow>
       <tablecell>
-        <paragraph id="par_id611697547448432" role="paragraph"><image src="cmd/lc_selectdb.svg" id="img_id691697547448433" width="1cm"  height="1cm"><alt id="alt_id891697547448434">Icon Select Data Area</alt></image></paragraph>
+        <paragraph id="par_id611697547448432" role="paragraph"><image src="cmd/lc_selectdb.svg" id="img_id691697547448433" width="1cm" height="1cm"><alt id="alt_id891697547448434">Icon Select Data Area</alt></image></paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id581697547448436" role="paragraph">Select Data Area</paragraph>
@@ -161,19 +161,40 @@
   <paragraph role="paragraph" id="par_id131697569897269" localize="false"><keycode>F2</keycode></paragraph>
 </section>
 
-<paragraph id="par_id3150443" role="paragraph" xml-lang="en-US"><variable id="bausfullen">Choose <emph>Sheet - Fill Cells</emph>.</variable></paragraph>
-<paragraph id="par_id3143267" role="paragraph" xml-lang="en-US"><variable id="bausunten">Choose <emph>Sheet - Fill Cells - Down</emph>.</variable></paragraph>
-<paragraph id="par_id3153880" role="paragraph" xml-lang="en-US"><variable id="bausrechts">Choose <emph>Sheet - Fill Cells - Right</emph>.</variable></paragraph>
-<paragraph id="par_id3151245" role="paragraph" xml-lang="en-US"><variable id="bausoben">Choose <emph>Sheet - Fill Cells - Up</emph>.</variable></paragraph>
-<paragraph id="par_id3145068" role="paragraph" xml-lang="en-US"><variable id="bauslinks">Choose <emph>Sheet - Fill Cells - Left</emph>.</variable></paragraph>
-<paragraph id="par_id3150400" role="paragraph" xml-lang="en-US"><variable id="baustab">Choose <emph>Sheet - Fill Cells - Sheets</emph>.</variable></paragraph>
-<paragraph id="par_id3154910" role="paragraph" xml-lang="en-US"><variable id="bausreihe">Choose <emph>Sheet - Fill Cells - Series</emph>.</variable></paragraph>
+<paragraph id="par_id3150443" role="paragraph"><variable id="bausfullen">Choose <emph>Sheet - Fill Cells</emph>.</variable></paragraph>
+<paragraph id="par_id3143267" role="paragraph"><variable id="bausunten">Choose <emph>Sheet - Fill Cells - Down</emph>.</variable></paragraph>
+<paragraph id="par_id3153880" role="paragraph"><variable id="bausrechts">Choose <emph>Sheet - Fill Cells - Right</emph>.</variable></paragraph>
+<paragraph id="par_id3151245" role="paragraph"><variable id="bausoben">Choose <emph>Sheet - Fill Cells - Up</emph>.</variable></paragraph>
+<paragraph id="par_id3145068" role="paragraph"><variable id="bauslinks">Choose <emph>Sheet - Fill Cells - Left</emph>.</variable></paragraph>
+<paragraph id="par_id3150400" role="paragraph"><variable id="baustab">Choose <emph>Sheet - Fill Cells - Sheets</emph>.</variable></paragraph>
+<paragraph id="par_id3154910" role="paragraph"><variable id="bausreihe">Choose <emph>Sheet - Fill Cells - Series</emph>.</variable></paragraph>
 
 <section id="clear_cells">
-<paragraph id="par_id3154123" role="paragraph" xml-lang="en-US">Choose <emph>Sheet - Clear Cells</emph>.</paragraph>
-<paragraph id="par_id3145785" role="paragraph" xml-lang="en-US">Backspace</paragraph>
+<paragraph id="par_id3154123" role="paragraph">Choose <emph>Sheet - Clear Cells</emph>.</paragraph>
+<paragraph id="par_id3145785" role="paragraph">Backspace</paragraph>
+</section>
+
+<section id="delete_cells">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph id="par_id3150011" role="paragraph"><variable id="bzelo">Choose <emph>Sheet - Delete Cells</emph>.</variable></paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_context"/>
+  <paragraph role="paragraph" id="par_id971702164002432">Choose <menuitem>Delete Cells</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id191702164105095">On the <menuitem>Layout</menuitem> menu of the <menuitem>Layout</menuitem> tab, choose <menuitem>Delete</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <table id="tab_id81702164263028">
+    <tablerow>
+      <tablecell>
+        <paragraph id="par_id211702164263029" role="paragraph"><image src="cmd/lc_deletecell.svg" id="img_id711702164263030" width="1cm"  height="1cm"><alt id="alt_id411702164263031">Icon Delete Cells</alt></image></paragraph>
+      </tablecell>
+      <tablecell>
+        <paragraph id="par_id451702164263033" role="paragraph">Delete Cells</paragraph>
+      </tablecell>
+    </tablerow>
+  </table>
+  <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+  <paragraph role="paragraph" id="par_id641702163984154"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode> + "-"</keycode></paragraph>
 </section>
-<paragraph id="par_id3150011" role="paragraph" xml-lang="en-US"><variable id="bzelo">Choose <emph>Sheet - Delete Cells</emph>.</variable></paragraph>
 
 <section id="cellprotection">
     <paragraph role="paragraph" id="par_id831619443265443">Choose <menuitem>Edit - Cell Protection</menuitem> to activate sheet protection with current cell protection settings.</paragraph>
diff --git a/source/text/scalc/00/sheet_menu.xhp b/source/text/scalc/00/sheet_menu.xhp
index e83ae3cf06..01842a167f 100644
--- a/source/text/scalc/00/sheet_menu.xhp
+++ b/source/text/scalc/00/sheet_menu.xhp
@@ -334,9 +334,24 @@
   </table>
 </section>
 
-<paragraph id="par_id3153093" role="paragraph"><variable id="delete_page_break">Choose <emph>Sheet - Delete Page Break</emph>.</variable></paragraph>
-<paragraph id="par_id3153191" role="paragraph"><variable id="delete_page_break_row">Choose <emph>Sheet - Delete Page Break - Row Break</emph>.</variable></paragraph>
-<paragraph id="par_id3145645" role="paragraph"><variable id="delete_page_break_column">Choose <emph>Sheet - Delete Page Break - Column Break</emph>.</variable></paragraph>
+<section id="delete_page_break">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph id="par_id3153093" role="paragraph">Choose <menuitem>Sheet - Delete Page Break</menuitem>.</paragraph>
+</section>
+
+<section id="delete_page_break_row">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph id="par_id3153191" role="paragraph">Choose <menuitem>Sheet - Delete Page Break - Row Break</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id931702166977088">On the <menuitem>Layout</menuitem> menu of the <menuitem>Layout</menuitem> tab, choose <menuitem>Row Break</menuitem>.</paragraph>
+</section>
+
+<section id="delete_page_break_column">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph id="par_id801702167390863" role="paragraph">Choose <menuitem>Sheet - Delete Page Break - Column Break</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id221702167401368">On the <menuitem>Layout</menuitem> menu of the <menuitem>Layout</menuitem> tab, choose <menuitem>Column Break</menuitem>.</paragraph>
+</section>
 
 <paragraph role="paragraph" id="par_id281631903136031"><variable id="edit_comment">Choose <menuitem>Sheet - Cell Comments - Edit Comment</menuitem></variable></paragraph>
 <paragraph role="paragraph" id="par_id641631903140705"><variable id="hide_comment">Choose <menuitem>Sheet - Cell Comments - Hide Comment</menuitem></variable></paragraph>
diff --git a/source/text/scalc/01/02160000.xhp b/source/text/scalc/01/02160000.xhp
index f5e9ddbc84..9a3ca08878 100644
--- a/source/text/scalc/01/02160000.xhp
+++ b/source/text/scalc/01/02160000.xhp
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -19,20 +16,17 @@
  *   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="textscalc0102160000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Delete Cells</title>
+<title id="tit">Delete Cells</title>
 <filename>/text/scalc/01/02160000.xhp</filename>
 </topic>
 </meta>
 <body>
 
-  <section id="del_cells">
 
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153726"><bookmark_value>cells; deleting cells</bookmark_value>
+<bookmark branch="index" id="bm_id3153726"><bookmark_value>cells; deleting cells</bookmark_value>
 <bookmark_value>columns; deleting</bookmark_value>
 <bookmark_value>rows; deleting</bookmark_value>
 <bookmark_value>spreadsheets; deleting cells</bookmark_value>
@@ -40,42 +34,42 @@
 </bookmark>
   <comment>MW made one "deleting;" entry out of 3</comment>
 
-<bookmark xml-lang="en-US" branch="hid/.uno:DeleteCell" id="bm_id3151115" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/deletecells/DeleteCellsDialog" id="bm_id3151116" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/deletecells/@@nowidget@@" id="bm_id3151116" localize="false"/>
-  <h1 id="hd_id3153726">Delete Cells</h1>
-  <paragraph xml-lang="en-US" id="par_id3154490" role="paragraph"><variable id="zellenloeschentext"><ahelp hid=".uno:DeleteCell">Completely deletes selected cells, columns or rows. The cells below or to the right of the deleted cells will fill the space.</ahelp>
-</variable> Note that the selected delete option is stored and reloaded when the dialog is next called.</paragraph>
-  </section>
+<bookmark branch="hid/.uno:DeleteCell" id="bm_id3151115" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/deletecells/DeleteCellsDialog" id="bm_id3151116" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/deletecells/@@nowidget@@" id="bm_id3151116" localize="false"/>
+<section id="del_cells">
+  <h1 id="hd_id3153726"><link href="text/scalc/01/02160000.xhp">Delete Cells</link></h1>
+  <paragraph id="par_id3154490" role="paragraph"><variable id="zellenloeschentext"><ahelp hid=".uno:DeleteCell">Completely deletes selected cells, columns or rows. The cells below or to the right of the deleted cells will fill the space.</ahelp></variable> Note that the selected delete option is stored and reloaded when the dialog is next called.</paragraph>
+</section>
   <section id="howtoget">
-
-   <embed href="text/scalc/00/00000402.xhp#bzelo"/>
-
+ <embed href="text/scalc/00/00000402.xhp#delete_cells"/>
   </section>
-  <paragraph id="par_id082520160232335032" role="paragraph" xml-lang="en-US"><image id="img_id083120161149318932" src="media/screenshots/modules/scalc/ui/deletecells/DeleteCellsDialog.png" width="3.3126in" height="1.5209in"><alt xml-lang="en-US" id="alt_id083120161149318932">Delete cells dialog</alt></image></paragraph>
+
   <h2 id="hd_id3149121">Selection</h2>
-  <paragraph xml-lang="en-US" id="par_id3150751" role="paragraph">This area contains options for specifying how sheets are displayed after deleting cells.</paragraph>
+  <paragraph id="par_id3150751" role="paragraph">This area contains options for specifying how sheets are displayed after deleting cells.</paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/deletecells/up" id="bm_id3154755" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/deletecells/up" id="bm_id3154755" localize="false"/>
   <h3 id="hd_id3155767">Shift cells up</h3>
-  <paragraph xml-lang="en-US" id="par_id3153714" role="paragraph"><ahelp hid="modules/scalc/ui/deletecells/up">Fills the space produced by the deleted cells with the cells underneath it.</ahelp></paragraph>
+  <paragraph id="par_id3153714" role="paragraph"><ahelp hid="modules/scalc/ui/deletecells/up">Fills the space produced by the deleted cells with the cells underneath it.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/deletecells/left" id="bm_id3147346" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/deletecells/left" id="bm_id3147346" localize="false"/>
   <h3 id="hd_id3156382">Shift cells left</h3>
-  <paragraph xml-lang="en-US" id="par_id3154702" role="paragraph"><ahelp hid="modules/scalc/ui/deletecells/left">Fills the resulting space by the cells to the right of the deleted cells.</ahelp></paragraph>
+  <paragraph id="par_id3154702" role="paragraph"><ahelp hid="modules/scalc/ui/deletecells/left">Fills the resulting space by the cells to the right of the deleted cells.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/deletecells/rows" id="bm_id3149566" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DeleteRows" id="bm_id3149565" localize="false"/>
-  <h3 id="hd_id3146918">Delete entire row(s)</h3>
-  <paragraph xml-lang="en-US" id="par_id3148487" role="paragraph"><ahelp hid=".uno:DeleteRows">After selecting at least one cell, deletes the entire row from the sheet.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/deletecells/cols" id="bm_id3150342" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DeleteColumns" id="bm_id3159240" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/deletecells/rows" id="bm_id3149566" localize="false"/>
+<bookmark branch="hid/.uno:DeleteRows" id="bm_id3149565" localize="false"/>
+  <h3 id="hd_id3146918">Delete entire row(s)</h3>
+  <paragraph id="par_id3148487" role="paragraph"><ahelp hid=".uno:DeleteRows">After selecting at least one cell, deletes the entire row from the sheet.</ahelp></paragraph>
+<tip id="par_id581702131982105">This command is equivalent to <embedvar href="text/shared/01/DeleteRows.xhp#h1" markup="ignore"/>.</tip>
+<bookmark branch="hid/modules/scalc/ui/deletecells/cols" id="bm_id3150342" localize="false"/>
+<bookmark branch="hid/.uno:DeleteColumns" id="bm_id3159240" localize="false"/>
   <h3 id="hd_id3155114">Delete entire column(s)</h3>
-  <paragraph xml-lang="en-US" id="par_id3150086" role="paragraph"><ahelp hid=".uno:DeleteColumns">After selecting at least one cell, deletes the entire column from the sheet.</ahelp></paragraph>
+  <paragraph id="par_id3150086" role="paragraph"><ahelp hid=".uno:DeleteColumns">After selecting at least one cell, deletes the entire column from the sheet.</ahelp></paragraph>
+  <tip id="par_id311702131990711">This command is equivalent to <embedvar href="text/shared/01/DeleteColumns.xhp#h1" markup="ignore"/>.</tip>
   <section id="relatedtopics">
 
-   <paragraph xml-lang="en-US" id="par_id3166424" role="paragraph"><link href="text/scalc/01/02150000.xhp">Deleting Contents</link></paragraph>
+   <paragraph id="par_id3166424" role="paragraph"><link href="text/scalc/01/02150000.xhp">Deleting Contents</link></paragraph>
 
   </section>
  </body>
diff --git a/source/text/scalc/01/02190000.xhp b/source/text/scalc/01/02190000.xhp
index 20f3be084e..18e04f8c87 100644
--- a/source/text/scalc/01/02190000.xhp
+++ b/source/text/scalc/01/02190000.xhp
@@ -27,9 +27,8 @@
 
 <body>
 
-<section id="del_page_break">
 <bookmark branch="hid/.uno:DelBreakMenu" id="bm_id8417004" localize="false"/>
-
+<section id="del_page_break">
 <h1 id="hd_id3150541"><link href="text/scalc/01/02190000.xhp">Delete Page Break</link></h1>
 <paragraph id="par_id3154365" role="paragraph"><ahelp hid=".">Choose the type of page break that you want to delete.</ahelp></paragraph>
 </section>
diff --git a/source/text/scalc/01/04020000.xhp b/source/text/scalc/01/04020000.xhp
index 3664649954..05766c6ff7 100644
--- a/source/text/scalc/01/04020000.xhp
+++ b/source/text/scalc/01/04020000.xhp
@@ -30,9 +30,12 @@
 </bookmark>
 <bookmark branch="hid/.uno:InsertCell" id="bm_id6503296" localize="false"/>
 <bookmark branch="hid/modules/scalc/ui/insertcells/InsertCellsDialog" id="bm_id3147264" localize="false"/>
-<h1 id="hd_id3156023"> Insert Cells</h1>
-<paragraph role="paragraph" id="par_id3150542"><variable id="zelleneinfuegentext"><ahelp hid=".uno:InsertCell">Opens the <emph>Insert Cells</emph> dialog, in which you can insert new cells according to the options that you specify.</ahelp>
-</variable> You can delete cells by choosing <link href="text/scalc/01/02160000.xhp"><emph>Edit - Delete Cells</emph></link>.</paragraph>
+
+<section id="insert_cells">
+    <h1 id="hd_id3156023"><variable id="h1"><link href="text/scalc/01/04020000.xhp">Insert Cells</link></variable></h1>
+    <paragraph role="paragraph" id="par_id3150542"><variable id="zelleneinfuegentext"><ahelp hid=".uno:InsertCell">Opens the <emph>Insert Cells</emph> dialog, in which you can insert new cells according to the options that you specify.</ahelp></variable></paragraph>
+</section>
+<paragraph role="paragraph" id="par_id851702164980152">You can delete cells by choosing <link href="text/scalc/01/02160000.xhp"><emph>Edit - Delete Cells</emph></link>.</paragraph>
 <section id="howtoget">
   <embed href="text/scalc/00/00000404.xhp#insert_cells"/>
 </section>
diff --git a/source/text/scalc/01/04030000.xhp b/source/text/scalc/01/04030000.xhp
index 649578f9a2..270c1f933a 100644
--- a/source/text/scalc/01/04030000.xhp
+++ b/source/text/scalc/01/04030000.xhp
@@ -26,16 +26,18 @@
 </meta>
 
 <body>
-<comment>Marked for deletion later. reworked in shared/ OH</comment>
-
 <bookmark branch="index" id="bm_id3150541">
   <bookmark_value>spreadsheets; inserting rows</bookmark_value>
   <bookmark_value>rows; inserting</bookmark_value>
   <bookmark_value>inserting; rows</bookmark_value>
 </bookmark>
 <bookmark branch="hid/.uno:InsertRowsMenu" id="bm_id51702134833791" localize="false"/>
-<h1 id="hd_id3150541"><link href="text/scalc/01/04030000.xhp">Insert Rows</link></h1>
-<paragraph id="par_id160220162210581072" role="paragraph"><variable id="sheet_insert_rows">Insert rows above or below the active cell.</variable> The number of rows inserted corresponds to the number of rows selected. If no row is selected, one row is inserted. The existing rows are moved downward.</paragraph>
+
+<section id="insert_rows">
+  <h1 id="hd_id3150541"><link href="text/scalc/01/04030000.xhp">Insert Rows</link></h1>
+  <paragraph id="par_id160220162210581072" role="paragraph"><variable id="sheet_insert_rows">Insert rows above or below the active cell.</variable> The number of rows inserted corresponds to the number of rows selected. If no row is selected, one row is inserted. The existing rows are moved downward.</paragraph>
+</section>
+
 <section id="howtoget">
 <embed href="text/scalc/00/sheet_menu.xhp#insert_rows"/>
 </section>
diff --git a/source/text/scalc/01/04040000.xhp b/source/text/scalc/01/04040000.xhp
index c5ad8d00e8..2ebdc59881 100644
--- a/source/text/scalc/01/04040000.xhp
+++ b/source/text/scalc/01/04040000.xhp
@@ -26,8 +26,6 @@
 </meta>
 
 <body>
-<comment>Marked for deletion later. reworked in shared/ OH</comment>
-
 <bookmark branch="index" id="bm_id3155628">
   <bookmark_value>spreadsheets; inserting columns</bookmark_value>
   <bookmark_value>inserting; columns</bookmark_value>
@@ -35,8 +33,10 @@
 </bookmark>
 <bookmark branch="hid/.uno:InsertColumnsMenu" id="bm_id871702136786681" localize="false"/>
 
-<h1 id="hd_id3155628"><link href="text/scalc/01/04040000.xhp">Insert Columns</link></h1>
-<paragraph id="par_id160220162214111932" role="paragraph"><variable id="sheet_insert_columns">Inserts columns to the left or 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>
+<section id="insert_columns">
+  <h1 id="hd_id3155628"><link href="text/scalc/01/04040000.xhp">Insert Columns</link></h1>
+  <paragraph id="par_id160220162214111932" role="paragraph"><variable id="sheet_insert_columns">Inserts columns to the left or 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>
+</section>
 <section id="howtoget">
 <embed href="text/scalc/00/sheet_menu.xhp#insert_columns"/>
 </section>
diff --git a/source/text/scalc/main0116.xhp b/source/text/scalc/main0116.xhp
index 8429f13583..a009981faf 100644
--- a/source/text/scalc/main0116.xhp
+++ b/source/text/scalc/main0116.xhp
@@ -36,14 +36,15 @@
 <section id="howtoget">
   <embed href="text/scalc/00/sheet_menu.xhp#sheetmenu"/>
 </section>
-<h2 id="par_id0906201507414191"><link href="text/scalc/01/04030000.xhp">Insert Rows</link></h2>
-<embed href="text/scalc/01/04030000.xhp#sheet_insert_rows"/>
-<h2 id="par_id0906201507414192"><link href="text/scalc/01/04040000.xhp">Insert Columns</link></h2>
-<embed href="text/scalc/01/04040000.xhp#sheet_insert_columns"/>
+<embed href="text/scalc/01/04020000.xhp#insert_cells"/>
+<embed href="text/scalc/01/04030000.xhp#insert_rows"/>
+<embed href="text/scalc/01/04040000.xhp#insert_columns"/>
 <embed href="text/scalc/01/04010000.xhp#ins_page_break"/>
-
 <embed href="text/scalc/01/02160000.xhp#del_cells"/>
+<embed href="text/shared/01/DeleteRows.xhp#delete_rows"/>
+<embed href="text/shared/01/DeleteColumns.xhp#delete_columns"/>
 <embed href="text/scalc/01/02190000.xhp#del_page_break"/>
+
 <embed href="text/scalc/01/02140000.xhp#fill"/>
 <embed href="text/scalc/01/02150000.xhp#del_contents"/>
 
diff --git a/source/text/shared/01/DeleteColumns.xhp b/source/text/shared/01/DeleteColumns.xhp
index 03c0950981..f28a7f4f73 100644
--- a/source/text/shared/01/DeleteColumns.xhp
+++ b/source/text/shared/01/DeleteColumns.xhp
@@ -17,10 +17,10 @@
     </meta>
 <body>
 <bookmark id="bm_id891693687739389" branch="hid/.uno:DeleteColumns" localize="false"/>
-    <section id="delete_columns">
-        <h1 id="hd_id941693687739390"><variable id="h1"><link href="text/shared/01/DeleteColumns.xhp">Columns</link></variable></h1>
-        <paragraph id="par_idN10616" role="paragraph">Deletes the selected columns.</paragraph>
-    </section>
+<section id="delete_columns">
+    <h1 id="hd_id941693687739390"><variable id="h1"><switchinline select="appl"><caseinline select="WRITER"><link href="text/shared/01/DeleteColumns.xhp">Columns</link></caseinline><caseinline select="CALC"><link href="text/shared/01/DeleteColumns.xhp">Delete Columns</link></caseinline></switchinline></variable></h1>
+    <paragraph id="par_idN10616" role="paragraph">Deletes the selected columns.</paragraph>
+</section>
     <section id="howtoget">
         <embed href="text/swriter/00/00000405.xhp#delete_column"/>
     </section>
diff --git a/source/text/shared/01/DeleteRows.xhp b/source/text/shared/01/DeleteRows.xhp
index 68bdc090e0..2075f8e195 100644
--- a/source/text/shared/01/DeleteRows.xhp
+++ b/source/text/shared/01/DeleteRows.xhp
@@ -18,7 +18,7 @@
     <body>
     <bookmark id="bm_id891693687739389" branch="hid/.uno:DeleteRows" localize="false"/>
     <section id="delete_rows">
-        <h1 id="hd_id941693687739390"><variable id="h1"><link href="text/shared/01/DeleteRows.xhp">Rows</link></variable></h1>
+        <h1 id="hd_id941693687739390"><variable id="h1"><switchinline select="appl"><caseinline select="WRITER">                        <link href="text/shared/01/DeleteRows.xhp">Rows</link></caseinline><caseinline select="CALC"><link href="text/shared/01/DeleteRows.xhp">Delete Rows</link></caseinline></switchinline></variable></h1>
         <paragraph id="par_idN10616" role="paragraph">Deletes the selected rows.</paragraph>
     </section>
     <section id="howtoget">
diff --git a/source/text/swriter/00/00000405.xhp b/source/text/swriter/00/00000405.xhp
index 5ba0c91c2c..0a10a3ad8e 100644
--- a/source/text/swriter/00/00000405.xhp
+++ b/source/text/swriter/00/00000405.xhp
@@ -337,12 +337,31 @@
       <paragraph id="par_id3145095" role="paragraph"><variable id="selektierenz">Choose <emph>Table - Select - Row</emph>.</variable></paragraph>
 
       <section id="delete_row">
-         <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
-         <paragraph id="par_id3149573" role="paragraph">Choose <emph>Table - Delete - Rows</emph>.</paragraph>
-         <embed href="text/shared/00/00000004.xhp#from_context"/>
-         <paragraph role="paragraph" id="par_id521693687115685">Choose <menuitem>Delete - Rows</menuitem>.</paragraph>
-         <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
-         <paragraph role="paragraph" id="par_id291693687406969">Choose <menuitem>Table - Delete Rows</menuitem>.</paragraph>
+         <switch select="appl">
+            <case select="WRITER">
+               <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+               <paragraph id="par_id3149573" role="paragraph">Choose <emph>Table - Delete - Rows</emph>.</paragraph>
+               <embed href="text/shared/00/00000004.xhp#from_context"/>
+               <paragraph role="paragraph" id="par_id521693687115685">Choose <menuitem>Delete - Rows</menuitem>.</paragraph>
+               <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+               <paragraph role="paragraph" id="par_id291693687406969">Choose <menuitem>Table - Delete Rows</menuitem>.</paragraph>
+               <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
+               <paragraph role="paragraph" id="par_id451693687256314">Choose <menuitem>Properties - Table - Delete Rows</menuitem>.</paragraph>
+            </case>
+            <case select="CALC">
+               <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+               <paragraph role="paragraph" id="par_id71702162629889">Choose <menuitem>Sheet - Delete Rows</menuitem>.</paragraph>
+               <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+               <paragraph role="paragraph" id="par_id781702162634351">Choose <menuitem>Home - Row - Delete Rows</menuitem>.</paragraph>
+               <paragraph role="paragraph" id="par_id451702162638494">Choose <menuitem>Layout - Row - Delete Rows</menuitem>.</paragraph>
+            </case>
+            <case select="IMPRESS">
+            </case>
+            <case select="DRAW">
+            </case>
+            <default>
+            </default>
+         </switch>
          <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
          <section id="sydelete_row">
             <table id="tbl_id3146892">
@@ -356,8 +375,6 @@
                </tablerow>
             </table>
          </section>
-         <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
-         <paragraph role="paragraph" id="par_id451693687256314">Choose <menuitem>Properties - Table - Delete Rows</menuitem>.</paragraph>
       </section>
 
       <paragraph id="par_id3149383" role="paragraph"><variable id="spalte">In the context menu of a cell, choose <emph>Column</emph>.</variable></paragraph>
@@ -377,12 +394,31 @@
       </section>
 
       <section id="delete_column">
-         <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
-         <paragraph id="par_id3155310" role="paragraph">Choose <emph>Table - Delete - Columns</emph>.</paragraph>
-         <embed href="text/shared/00/00000004.xhp#from_context"/>
-         <paragraph role="paragraph" id="par_id681693688270842">choose <menuitem>Delete - Columns</menuitem>.</paragraph>
-         <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
-         <paragraph role="paragraph" id="par_id361693688303638">Choose <menuitem>Table - Delete Columns</menuitem>.</paragraph>
+         <switch select="appl">
+            <case select="WRITER">
+               <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+               <paragraph id="par_id3155310" role="paragraph">Choose <emph>Table - Delete - Columns</emph>.</paragraph>
+               <embed href="text/shared/00/00000004.xhp#from_context"/>
+               <paragraph role="paragraph" id="par_id681693688270842">choose <menuitem>Delete - Columns</menuitem>.</paragraph>
+               <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+               <paragraph role="paragraph" id="par_id361693688303638">Choose <menuitem>Table - Delete Columns</menuitem>.</paragraph>
+               <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
+               <paragraph role="paragraph" id="par_id361693688361224">Choose <menuitem>Properties - Table - Delete Columns</menuitem>.</paragraph>
+            </case>
+            <case select="CALC">
+               <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+               <paragraph role="paragraph" id="par_id241702162857457">Choose <menuitem>Sheet - Delete Columns</menuitem>.</paragraph>
+               <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+               <paragraph role="paragraph" id="par_id281702162862870">Choose <menuitem>Home - Column - Delete Columns</menuitem>.</paragraph>
+               <paragraph role="paragraph" id="par_id771702162866448">Choose <menuitem>Layout - Column - Delete Columns</menuitem>.</paragraph>
+            </case>
+            <case select="IMPRESS">
+            </case>
+            <case select="DRAW">
+            </case>
+            <default>
+            </default>
+         </switch>
          <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
          <section id="sydelete_column">
             <table id="tbl_id3150954">
@@ -396,8 +432,6 @@
                </tablerow>
             </table>
          </section>
-         <embed href="text/shared/00/00000004.xhp#from_sidebar"/>
-         <paragraph role="paragraph" id="par_id361693688361224">Choose <menuitem>Properties - Table - Delete Columns</menuitem>.</paragraph>
       </section>
       <section id="select_cell">
          <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>