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

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

Change-Id: Ie8ecd21877f960206616489e9113144bd37dd96a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160526
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit 56d67dfd7ef0df8768ad2f4975333ad633cde27f)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/160631

4 files changed, 97 insertions, 51 deletions

diff --git a/source/text/scalc/00/sheet_menu.xhp b/source/text/scalc/00/sheet_menu.xhp
index 866a20541d..e83ae3cf06 100644
--- a/source/text/scalc/00/sheet_menu.xhp
+++ b/source/text/scalc/00/sheet_menu.xhp
@@ -256,13 +256,84 @@
     </table>
 </section>
 
-<paragraph id="par_id160220162106567373" role="paragraph"><variable id="insert_rows_above">Choose <emph>Sheet - Insert Rows - Rows Above</emph>.</variable></paragraph>
-<paragraph id="par_id160220162109048207" role="paragraph"><variable id="insert_rows_below">Choose <emph>Sheet - Insert Rows - Rows Below</emph>.</variable></paragraph>
-<paragraph id="par_id160220162107055028" role="paragraph"><variable id="insert_columns_left">Choose <emph>Sheet - Insert Columns - Columns Before</emph>.</variable></paragraph>
-<paragraph id="par_id160220162109126013" role="paragraph"><variable id="insert_columns_right">Choose <emph>Sheet - Insert Columns - Columns After</emph>.</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149095"><variable id="insert_page_break">Choose <emph>Sheet - Insert Page Break</emph>.</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149398"><variable id="insert_page_break_row">Choose <emph>Sheet - Insert Page Break - Row Break</emph>.</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150084"><variable id="insert_page_break_column">Choose <emph>Sheet - Insert Page Break - Column Break</emph>.</variable></paragraph>
+
+<section id="insert_rows">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id981702136310437">Choose <menuitem>Sheet - Insert Rows</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id631702136321436">Choose <menuitem>Home - Row</menuitem>.</paragraph>
+  <paragraph role="paragraph" id="par_id451702136327775">Choose <menuitem>Layout - Row</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <table id="tab_id581702136089556">
+    <tablerow>
+      <tablecell>
+        <paragraph id="par_id731702136089557" role="paragraph"><image src="cmd/lc_entirerow.svg" id="img_id1001702136089558" width="1cm"  height="1cm"><alt id="alt_id371702136089559">Icon Insert Row</alt></image></paragraph>
+      </tablecell>
+      <tablecell>
+        <paragraph id="par_id741702136089561" role="paragraph">Insert Row</paragraph>
+      </tablecell>
+    </tablerow>
+  </table>
+</section>
+
+<section id="insert_columns">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id171702137212952">Choose <menuitem>Sheet - Insert Columns</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id481702137217464">Choose <menuitem>Home - Column</menuitem>.</paragraph>
+  <paragraph role="paragraph" id="par_id631702137221935">Choose <menuitem>Layout - Column</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <table id="tab_id461702137173243">
+    <tablerow>
+      <tablecell>
+        <paragraph id="par_id921702137173244" role="paragraph"><image src="cmd/lc_entirecolumn.svg" id="img_id611702137173245" width="1cm"  height="1cm"><alt id="alt_id661702137173246">Icon Insert Column</alt></image></paragraph>
+      </tablecell>
+      <tablecell>
+        <paragraph id="par_id881702137173248" role="paragraph">Insert Columns</paragraph>
+      </tablecell>
+    </tablerow>
+  </table>
+</section>
+
+<section id="insert_page_break">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id3149095">Choose <menuitem>Sheet - Insert Page Break</menuitem>.</paragraph>
+</section>
+<section id="insert_page_break_row">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id3149398">Choose <menuitem>Sheet - Insert Page Break - Row Break</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id381702145053612">On the <menuitem>Layout</menuitem> menu of the <menuitem>Layout</menuitem> tab, choose <menuitem>Row Break</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <table id="tab_id201702144996562">
+    <tablerow>
+      <tablecell>
+        <paragraph id="par_id561702144996563" role="paragraph"><image src="cmd/lc_insertrowbreak.svg" id="img_id751702144996564" width="1cm"  height="1cm"><alt id="alt_id551702144996565">Icon Insert Row Break</alt></image></paragraph>
+      </tablecell>
+      <tablecell>
+        <paragraph id="par_id481702144996567" role="paragraph">Insert Row Break</paragraph>
+      </tablecell>
+    </tablerow>
+  </table>
+</section>
+<section id="insert_page_break_column">
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph role="paragraph" id="par_id3150084">Choose <menuitem>Sheet - Insert Page Break - Column Break</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+  <paragraph role="paragraph" id="par_id741702145047953">On the <menuitem>Layout</menuitem> menu of the <menuitem>Layout</menuitem> tab, choose <menuitem>Column Break</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+  <table id="tab_id581702145183777">
+    <tablerow>
+      <tablecell>
+        <paragraph id="par_id211702145183778" role="paragraph"><image src="cmd/lc_insertcolumnbreak.svg" id="img_id681702145183779" width="1cm"  height="1cm"><alt id="alt_id561702145183780">Icon Insert Column Break</alt></image></paragraph>
+      </tablecell>
+      <tablecell>
+        <paragraph id="par_id821702145183781" role="paragraph">Insert Column Break</paragraph>
+      </tablecell>
+    </tablerow>
+  </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>
diff --git a/source/text/scalc/01/04010000.xhp b/source/text/scalc/01/04010000.xhp
index 548818206f..089dca4006 100644
--- a/source/text/scalc/01/04010000.xhp
+++ b/source/text/scalc/01/04010000.xhp
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,11 +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="textscalc0104010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Insert Page Break</title>
+<title id="tit">Insert Page Break</title>
 <filename>/text/scalc/01/04010000.xhp</filename>
 </topic>
 <history>
@@ -31,15 +28,15 @@
 </meta>
 <body>
 <section id="ins_page_break">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153192"><bookmark_value>spreadsheets; inserting breaks in</bookmark_value>
+<bookmark branch="index" id="bm_id3153192"><bookmark_value>spreadsheets; inserting breaks in</bookmark_value>
 <bookmark_value>inserting; breaks</bookmark_value>
 <bookmark_value>page breaks; inserting in spreadsheets</bookmark_value>
 </bookmark><comment>mw changed "page breaks;..."</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertBreakMenu" id="bm_id2778710" localize="false"/>
+<bookmark branch="hid/.uno:InsertBreakMenu" id="bm_id2778710" localize="false"/>
 <h1 id="hd_id3153192"><link href="text/scalc/01/04010000.xhp">Insert Page Break</link></h1>
-<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US"><ahelp hid=".">This command inserts manual row or column breaks to ensure that your data prints properly. You can insert a horizontal page break above, or a vertical page break to the left of, the active cell.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3125864"><ahelp hid=".">This command inserts manual row or column breaks to ensure that your data prints properly. You can insert a horizontal page break above, or a vertical page break to the left of, the active cell.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3155133" xml-lang="en-US">Choose <link href="text/scalc/01/02190000.xhp">Sheet - Delete Page Break</link> to remove breaks created manually.</paragraph>
+<paragraph role="paragraph" id="par_id3155133">Choose <link href="text/scalc/01/02190000.xhp">Sheet - Delete Page Break</link> to remove breaks created manually.</paragraph>
 <section id="howtoget">
   <embed href="text/scalc/00/sheet_menu.xhp#insert_page_break"/>
 </section>
diff --git a/source/text/scalc/01/04030000.xhp b/source/text/scalc/01/04030000.xhp
index c4d8c658d6..649578f9a2 100644
--- a/source/text/scalc/01/04030000.xhp
+++ b/source/text/scalc/01/04030000.xhp
@@ -20,7 +20,7 @@
 
 <meta>
   <topic id="textscalc0104030000xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Insert Rows</title>
+    <title id="tit">Insert Rows</title>
     <filename>/text/scalc/01/04030000.xhp</filename>
   </topic>
 </meta>
@@ -28,31 +28,18 @@
 <body>
 <comment>Marked for deletion later. reworked in shared/ OH</comment>
 
-<bookmark xml-lang="en-US" branch="index" id="bm_id3150541">
+<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" xml-lang="en-US"><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>
-
-<h2 id="hd_id160220162131439740">Rows Above</h2>
-<paragraph id="par_id3150767" role="paragraph" xml-lang="en-US"><ahelp hid=".uno:InsertRowsBefore">Inserts a new row above the active cell.</ahelp></paragraph>
-
+<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="howtoget">
-<embed href="text/scalc/00/sheet_menu.xhp#insert_rows_above"/>
-</section>
-
-
-<h2 id="hd_id160220162133372726">Rows Below</h2>
-<paragraph id="par_id3150768" role="paragraph" xml-lang="en-US"><ahelp hid=".uno:InsertRowsAfter">Inserts a new row below the active cell.</ahelp></paragraph>
-
-<section id="howtoget">
-<embed href="text/scalc/00/sheet_menu.xhp#insert_rows_below"/>
+<embed href="text/scalc/00/sheet_menu.xhp#insert_rows"/>
 </section>
+<embed href="text/shared/01/InsertRowsBefore.xhp#insert_rows_above"/>
+<embed href="text/shared/01/InsertRowsAfter.xhp#insert_rows_below"/>
 </body>
-
 </helpdocument>
diff --git a/source/text/scalc/01/04040000.xhp b/source/text/scalc/01/04040000.xhp
index 13536fe2fc..c5ad8d00e8 100644
--- a/source/text/scalc/01/04040000.xhp
+++ b/source/text/scalc/01/04040000.xhp
@@ -20,7 +20,7 @@
 
 <meta>
   <topic id="textscalc0104040000xml" indexer="include">
-    <title id="tit" xml-lang="en-US">Insert Columns</title>
+    <title id="tit">Insert Columns</title>
     <filename>/text/scalc/01/04040000.xhp</filename>
   </topic>
 </meta>
@@ -28,31 +28,22 @@
 <body>
 <comment>Marked for deletion later. reworked in shared/ OH</comment>
 
-<bookmark xml-lang="en-US" branch="index" id="bm_id3155628">
+<bookmark branch="index" id="bm_id3155628">
   <bookmark_value>spreadsheets; inserting columns</bookmark_value>
   <bookmark_value>inserting; columns</bookmark_value>
   <bookmark_value>columns; inserting</bookmark_value>
 </bookmark>
-
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertColumnsBefore" id="bm_id601010" localize="false"/>
+<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" xml-lang="en-US"><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>
-
-<h2 id="hd_id160220162139258865">Columns Before</h2>
-<paragraph id="par_id3150791" role="paragraph" xml-lang="en-US"><ahelp hid=".uno:InsertColumnsBefore">Inserts a new column before the active cell.</ahelp></paragraph>
-
+<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="howtoget">
-<embed href="text/scalc/00/sheet_menu.xhp#insert_columns_left"/>
+<embed href="text/scalc/00/sheet_menu.xhp#insert_columns"/>
 </section>
 
+<embed href="text/shared/01/InsertColumnsBefore.xhp#insert_columns_before"/>
+<embed href="text/shared/01/InsertColumnsAfter.xhp#insert_columns_after"/>
 
-<h2 id="hd_id160220162139252941">Columns After</h2>
-<paragraph id="par_id160220162138041164" role="paragraph" xml-lang="en-US"><ahelp hid=".uno:InsertColumnsAfter">Inserts a new column after the active cell.</ahelp></paragraph>
-
-<section id="howtoget">
-<embed href="text/scalc/00/sheet_menu.xhp#insert_columns_right"/>
-</section>
 </body>
 
 </helpdocument>