tdf#155875 Tab'd UI cmds Writer/Format in Help(1)

+ refactoring
+ Writer Format menu (part 1)

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

8 files changed, 40 insertions, 37 deletions

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 937ccec6c3..42029f1dff 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -790,14 +790,14 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/main0650 \
     helpcontent2/source/text/shared/main0800 \
     helpcontent2/source/text/shared/mediaplay_toolbar \
-    helpcontent2/source/text/shared/submenu_text \
-    helpcontent2/source/text/shared/submenu_spacing \
     helpcontent2/source/text/shared/menu/forms \
     helpcontent2/source/text/shared/menu/comment_menu \
     helpcontent2/source/text/shared/menu/insert_form_control \
     helpcontent2/source/text/shared/menu/insert_shape \
     helpcontent2/source/text/shared/menu/save_image \
     helpcontent2/source/text/shared/menu/set_image_background \
+    helpcontent2/source/text/shared/menu/submenu_spacing \
+    helpcontent2/source/text/shared/menu/submenu_text \
     helpcontent2/source/text/shared/need_help \
     helpcontent2/source/text/shared/optionen/01000000 \
     helpcontent2/source/text/shared/optionen/01010000 \
diff --git a/source/text/scalc/main0105.xhp b/source/text/scalc/main0105.xhp
index 445e957e37..fbb35245c5 100644
--- a/source/text/scalc/main0105.xhp
+++ b/source/text/scalc/main0105.xhp
@@ -31,7 +31,7 @@
 <h1 id="hd_id3149669"><link href="text/scalc/main0105.xhp">Format</link></h1>
 <paragraph id="par_id3145171" role="paragraph" xml-lang="en-US"><ahelp hid=".">The <emph>Format</emph> menu contains commands for formatting selected cells, <link href="text/shared/00/00000005.xhp#object">objects</link>, and cell contents in your document.</ahelp></paragraph>
 </section>
-<embed href="text/shared/submenu_text.xhp#submenu_text"/>
+<embed href="text/shared/menu/submenu_text.xhp#submenu_text"/>
 <embed href="text/shared/01/05080000.xhp#alignment"/>
 <embed href="text/scalc//01/default_number_formats.xhp#numberformatmenu"/>
 
diff --git a/source/text/sdraw/main_format.xhp b/source/text/sdraw/main_format.xhp
index 8d6211bcfc..1f1ad3ada1 100644
--- a/source/text/sdraw/main_format.xhp
+++ b/source/text/sdraw/main_format.xhp
@@ -31,8 +31,8 @@
 <h1 id="hd_id3153770"><link href="text/sdraw/main_format.xhp">Format</link></h1>
 <paragraph role="paragraph" id="par_id3152578" xml-lang="en-US">Contains commands for formatting the layout and the contents of your document.</paragraph>
 </section>
-<embed href="text/shared/submenu_text.xhp#submenu_text"/>
-<embed href="text/shared/submenu_spacing.xhp#submenu_spacing"/>
+<embed href="text/shared/menu/submenu_text.xhp#submenu_text"/>
+<embed href="text/shared/menu/submenu_spacing.xhp#submenu_spacing"/>
 <embed href="text/shared/01/05010000.xhp#standard"/>
 <h2 id="hd_id3155111"><link href="text/shared/01/05020000.xhp">Character</link></h2>
 <embed href="text/shared/01/05020000.xhp#zeichentext"/>
diff --git a/source/text/shared/00/00040500.xhp b/source/text/shared/00/00040500.xhp
index e02a388e19..bdfed652fa 100644
--- a/source/text/shared/00/00040500.xhp
+++ b/source/text/shared/00/00040500.xhp
@@ -35,11 +35,11 @@
 <section id="OpenOptimizeSize">
   <switch select="appl">
     <case select="WRITER">
-      <paragraph role="paragraph" id="par_id3156426" xml-lang="en-US">Open <link href="text/shared/02/04210000.xhp"><menuitem>Optimize Size</menuitem></link> dropdown menu from <link href="text/swriter/main0204.xhp"><menuitem>Table</menuitem></link> bar, click</paragraph>
+      <paragraph role="paragraph" id="par_id3156426">Open <link href="text/shared/02/04210000.xhp"><menuitem>Optimize Size</menuitem></link> dropdown menu from <link href="text/swriter/main0204.xhp"><menuitem>Table</menuitem></link> bar, click</paragraph>
     </case>
-    <case select="CALC"></case>
+    <case select="CALC"/>
     <default>
-      <paragraph role="paragraph" id="par_id481655731478873" xml-lang="en-US">Open <link href="text/shared/02/04210000.xhp"><menuitem>Optimize Size</menuitem></link> dropdown menu from <menuitem>Table</menuitem> bar, click</paragraph>
+      <paragraph role="paragraph" id="par_id481655731478873">Open <link href="text/shared/02/04210000.xhp"><menuitem>Optimize Size</menuitem></link> dropdown menu from <menuitem>Table</menuitem> bar, click</paragraph>
     </default>
   </switch>
 </section>
@@ -49,7 +49,7 @@
     <case select="WRITER">
       <paragraph role="paragraph" id="par_id271654223353638">Choose <menuitem>Table - Size - Minimal Row Height</menuitem>.</paragraph>
     </case>
-    <case select="CALC"></case>
+    <case select="CALC"/>
     <default>
       <paragraph role="paragraph" id="par_id151655731003155">Choose <menuitem>Format - Table - Minimal Row Height</menuitem>.</paragraph>
     </default>
@@ -73,9 +73,9 @@
 <section id="optimal_row_height">
   <switch select="appl">
     <case select="WRITER">
-      <paragraph xml-lang="en-US" id="par_id3155536" role="paragraph">Choose <menuitem>Table - Size - Optimal Row Height</menuitem>.</paragraph>
+      <paragraph id="par_id3155536" role="paragraph">Choose <menuitem>Table - Size - Optimal Row Height</menuitem>.</paragraph>
       </case>
-    <case select="CALC"></case>
+    <case select="CALC"/>
     <default>
       <paragraph role="paragraph" id="par_id621655731074115">Choose <menuitem>Format - Table - Optimal Row Height</menuitem>.</paragraph>
     </default>
@@ -86,10 +86,10 @@
             <table id="tbl_id3150845">
                <tablerow>
                   <tablecell>
-                     <paragraph xml-lang="en-US" id="par_id3145222" role="paragraph"><image id="img_id3145228" src="cmd/lc_setoptimalrowheight.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3145228">Icon Optimal Row Height</alt></image></paragraph>
+                     <paragraph id="par_id3145222" role="paragraph"><image id="img_id3145228" src="cmd/lc_setoptimalrowheight.svg" width="1cm" height="1cm"><alt id="alt_id3145228">Icon Optimal Row Height</alt></image></paragraph>
                   </tablecell>
                   <tablecell>
-                     <paragraph xml-lang="en-US" id="par_id3153545" role="paragraph">Optimal Row Height</paragraph>
+                     <paragraph id="par_id3153545" role="paragraph">Optimal Row Height</paragraph>
                   </tablecell>
                </tablerow>
             </table>
@@ -99,9 +99,9 @@
 <section id="distribute_rows_evenly">
    <switch select="appl">
      <case select="WRITER">
-       <paragraph xml-lang="en-US" id="par_id3153569" role="paragraph">Choose <menuitem>Table - Size - Distribute Rows Evenly</menuitem>.</paragraph>
+       <paragraph id="par_id3153569" role="paragraph">Choose <menuitem>Table - Size - Distribute Rows Evenly</menuitem>.</paragraph>
      </case>
-     <case select="CALC"></case>
+     <case select="CALC"/>
      <default>
       <paragraph role="paragraph" id="par_id701655731168178">Choose <menuitem>Format - Table - Distribute Rows Evenly</menuitem>.</paragraph>
      </default>
@@ -112,10 +112,10 @@
             <table id="tbl_id3154064">
                <tablerow>
                   <tablecell>
-                     <paragraph xml-lang="en-US" id="par_id3145297" role="paragraph"><image id="img_id3155994" src="cmd/lc_distributerows.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3155994">Icon Distribute Rows Evenly</alt></image></paragraph>
+                     <paragraph id="par_id3145297" role="paragraph"><image id="img_id3155994" src="cmd/lc_distributerows.svg" width="1cm" height="1cm"><alt id="alt_id3155994">Icon Distribute Rows Evenly</alt></image></paragraph>
                   </tablecell>
                   <tablecell>
-                     <paragraph xml-lang="en-US" id="par_id3153206" role="paragraph">Distribute Rows Evenly</paragraph>
+                     <paragraph id="par_id3153206" role="paragraph">Distribute Rows Evenly</paragraph>
                   </tablecell>
                </tablerow>
             </table>
@@ -127,7 +127,7 @@
      <case select="WRITER">
         <paragraph role="paragraph" id="par_id51654220677297">Choose <menuitem>Table - Size - Minimal Column Width</menuitem>.</paragraph>
        </case>
-     <case select="CALC"></case>
+     <case select="CALC"/>
      <default>
      <paragraph role="paragraph" id="par_id691655731247050">Choose <menuitem>Format - Table - Minimal Column Width</menuitem>.</paragraph>
      </default>
@@ -151,9 +151,9 @@
 <section id="optimal_column_width">
   <switch select="appl">
     <case select="WRITER">
-      <paragraph xml-lang="en-US" id="par_id3154752" role="paragraph">Choose <menuitem>Table - Size - Optimal Column Width</menuitem>.</paragraph>
+      <paragraph id="par_id3154752" role="paragraph">Choose <menuitem>Table - Size - Optimal Column Width</menuitem>.</paragraph>
     </case>
-    <case select="CALC"></case>
+    <case select="CALC"/>
     <default>
       <paragraph role="paragraph" id="par_id471655731343905">Choose <menuitem>Format - Table - Optimal Column Width</menuitem>.</paragraph>
     </default>
@@ -164,10 +164,10 @@
             <table id="tbl_id3156030">
                <tablerow>
                   <tablecell>
-                     <paragraph xml-lang="en-US" id="par_id3157881" role="paragraph"><image id="img_id3157888" src="cmd/lc_setoptimalcolumnwidth.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3157888">Icon Optimal Column Width</alt></image></paragraph>
+                     <paragraph id="par_id3157881" role="paragraph"><image id="img_id3157888" src="cmd/lc_setoptimalcolumnwidth.svg" width="1cm" height="1cm"><alt id="alt_id3157888">Icon Optimal Column Width</alt></image></paragraph>
                   </tablecell>
                   <tablecell>
-                     <paragraph xml-lang="en-US" id="par_id3150524" role="paragraph">Optimal Column Width</paragraph>
+                     <paragraph id="par_id3150524" role="paragraph">Optimal Column Width</paragraph>
                   </tablecell>
                </tablerow>
             </table>
@@ -177,9 +177,9 @@
 <section id="distribute_columns_evenly">
   <switch select="appl">
     <case select="WRITER">
-      <paragraph xml-lang="en-US" id="par_id3159219" role="paragraph">Choose <menuitem>Table - Size - Distribute Columns Evenly</menuitem>.</paragraph>
+      <paragraph id="par_id3159219" role="paragraph">Choose <menuitem>Table - Size - Distribute Columns Evenly</menuitem>.</paragraph>
     </case>
-    <case select="CALC"></case>
+    <case select="CALC"/>
     <default>
       <paragraph role="paragraph" id="par_id991655731434331">Choose <menuitem>Format - Table - Distribute Columns Evenly</menuitem>.</paragraph>
     </default>
@@ -190,10 +190,10 @@
             <table id="tbl_id3148462">
                <tablerow>
                   <tablecell>
-                     <paragraph xml-lang="en-US" id="par_id3145179" role="paragraph"><image id="img_id3145186" src="cmd/lc_distributecolumns.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3145186">Icon Distribute Columns Evenly</alt></image></paragraph>
+                     <paragraph id="par_id3145179" role="paragraph"><image id="img_id3145186" src="cmd/lc_distributecolumns.svg" width="1cm" height="1cm"><alt id="alt_id3145186">Icon Distribute Columns Evenly</alt></image></paragraph>
                   </tablecell>
                   <tablecell>
-                     <paragraph xml-lang="en-US" id="par_id3151364" role="paragraph">Distribute Columns Evenly</paragraph>
+                     <paragraph id="par_id3151364" role="paragraph">Distribute Columns Evenly</paragraph>
                   </tablecell>
                </tablerow>
             </table>
@@ -547,13 +547,16 @@
 </switch>
 </section>
 
-
 <section id="submenu_text">
-<paragraph id="par_id3151254" role="paragraph">Choose <menuitem>Format - Text</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph id="par_id3151254" role="paragraph">Choose <menuitem>Format - Text</menuitem>.</paragraph>
 </section>
+
 <section id="submenu_spacing">
-<paragraph id="par_id3151255" role="paragraph">Choose <menuitem>Format - Spacing</menuitem>.</paragraph>
+  <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+  <paragraph id="par_id3151255" role="paragraph">Choose <menuitem>Format - Spacing</menuitem>.</paragraph>
 </section>
+
 <section id="ruby">
 <paragraph id="par_id3153579" role="paragraph">Menu <emph>Format - Asian phonetic guide</emph>.</paragraph>
 </section>
diff --git a/source/text/shared/submenu_spacing.xhp b/source/text/shared/menu/submenu_spacing.xhp
index 9639b2b318..694d0eb950 100644
--- a/source/text/shared/submenu_spacing.xhp
+++ b/source/text/shared/menu/submenu_spacing.xhp
@@ -20,14 +20,14 @@
     <meta>
         <topic id="textsharedsub_spacingxml" indexer="include">
             <title id="tit">Spacing</title>
-            <filename>/text/shared/submenu_spacing.xhp</filename>
+            <filename>/text/shared/menu/submenu_spacing.xhp</filename>
         </topic>
     </meta>
     <body>
         <section id="submenu_spacing">
             <bookmark branch="hid/.uno:FormatSpacingMenu" id="bm_id335519659183789" localize="false"/>
             <h1 id="hd_id411816022675979">
-                <link href="text/shared/submenu_spacing.xhp">Spacing</link>
+                <link href="text/shared/menu/submenu_spacing.xhp">Spacing</link>
             </h1>
             <paragraph role="paragraph" id="par_id398855439580084">
                 <ahelp hid=".">Opens a submenu where you can choose text spacing commands.</ahelp>
diff --git a/source/text/shared/submenu_text.xhp b/source/text/shared/menu/submenu_text.xhp
index 0d87549ad2..d7d8d9ada3 100644
--- a/source/text/shared/submenu_text.xhp
+++ b/source/text/shared/menu/submenu_text.xhp
@@ -20,14 +20,14 @@
     <meta>
         <topic id="textsharedsub_textxml" indexer="include">
             <title id="tit">Text</title>
-            <filename>/text/shared/submenu_text.xhp</filename>
+            <filename>/text/shared/menu/submenu_text.xhp</filename>
         </topic>
     </meta>
     <body>
         <section id="submenu_text">
             <bookmark branch="hid/.uno:FormatTextMenu" id="bm_id335519659183788" localize="false"/>
             <h1 id="hd_id411816022675978">
-                <link href="text/shared/submenu_text.xhp">Text</link>
+                <link href="text/shared/menu/submenu_text.xhp">Text</link>
             </h1>
             <paragraph role="paragraph" id="par_id398855439580083">
                 <ahelp hid=".">Opens a submenu where you can choose text formatting commands.</ahelp>
diff --git a/source/text/simpress/main_format.xhp b/source/text/simpress/main_format.xhp
index d956a80a80..cd4712ff04 100644
--- a/source/text/simpress/main_format.xhp
+++ b/source/text/simpress/main_format.xhp
@@ -30,8 +30,8 @@
       <h1 id="hd_id3152596"><link href="text/simpress/main_format.xhp">Format</link></h1>
       <paragraph id="par_id3145801" role="paragraph" xml-lang="en-US"><ahelp hid=".">Contains commands for formatting the layout and the contents of your document.</ahelp></paragraph>
     </section>
-    <embed href="text/shared/submenu_text.xhp#submenu_text"/>
-    <embed href="text/shared/submenu_spacing.xhp#submenu_spacing"/>
+    <embed href="text/shared/menu/submenu_text.xhp#submenu_text"/>
+    <embed href="text/shared/menu/submenu_spacing.xhp#submenu_spacing"/>
     <embed href="text/swriter/main0105.xhp#Align-and-Lists"/><comment>temporary solution for "Align Text", until submenu is made</comment>
 
     <h2 id="hd_id951602975070826"><link href="text/simpress/format_submenu_lists.xhp">Lists</link></h2>
diff --git a/source/text/swriter/main0105.xhp b/source/text/swriter/main0105.xhp
index 6921ba51c7..e4cebbe703 100644
--- a/source/text/swriter/main0105.xhp
+++ b/source/text/swriter/main0105.xhp
@@ -31,8 +31,8 @@
 <h1 id="hd_id3147820"><link href="text/swriter/main0105.xhp">Format</link></h1>
 <paragraph id="par_id3147218" role="paragraph" xml-lang="en-US"><ahelp hid=".uno:FormatMenu">Contains commands for formatting the layout and the contents of your document.</ahelp></paragraph>
 </section>
-<embed href="text/shared/submenu_text.xhp#submenu_text"/>
-<embed href="text/shared/submenu_spacing.xhp#submenu_spacing"/>
+<embed href="text/shared/menu/submenu_text.xhp#submenu_text"/>
+<embed href="text/shared/menu/submenu_spacing.xhp#submenu_spacing"/>
 <section id="Align-and-Lists">
 <h2 id="hd_id551602974854459">Align Text</h2>
 <paragraph role="paragraph" id="par_id741602974888780">Opens a submenu where you can align text and objects.</paragraph><comment>shared/01/05080000.xhp is the start for a submenu, but it needs to be elaborated and probably needs appl-switches for other modules. Heading and description here can be replaced with an embed to that submenu file. Can also embed submenu in simpress/main_format.xhp, then the section id here can be removed.</comment>