tdf#102265 - more work on Format menu for Impress

- embed Align and Lists from Writer
- both Align and Lists still need submenus (also in Writer)
- when those are made, then the embeds can change.

- change label from "Position and Size" to "Object and Shape"
- embed Name and Description controls from  Writer
- move "Interaction" in relation to Name and Description

Change-Id: Ied907bc152cf41027b65a52cb47e0191564b6b85
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104670
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Tested-by: Jenkins

2 files changed, 9 insertions, 4 deletions

diff --git a/source/text/simpress/main_format.xhp b/source/text/simpress/main_format.xhp
index 588d29bc88..121187e25f 100644
--- a/source/text/simpress/main_format.xhp
+++ b/source/text/simpress/main_format.xhp
@@ -32,6 +32,7 @@
     </section>
     <embed href="text/shared/submenu_text.xhp#submenu_text"/>
     <embed href="text/shared/submenu_spacing.xhp#submenu_spacing"/>
+    <embed href="text/swriter/main0105.xhp#Align-and-Lists"/><comment>temporary solution, until submenus are made</comment>
     <embed href="text/shared/01/05010000.xhp#standard"/>
 
     <h2 id="hd_id3147401"><link href="text/shared/01/05020000.xhp" name="Character">Character</link></h2>
@@ -43,9 +44,9 @@
     <h2 id="hd_id3147299"><link href="text/shared/01/06050000.xhp" name="Numbering/Bullets">Bullets and Numbering</link></h2>
     <embed href="text/shared/01/06050000.xhp#numauftext"/>
 
-    <h2 id="hd_id3149499"><link href="text/shared/01/05230000.xhp" name="Position and Size">Position and Size</link></h2>
+    <h2 id="hd_id3149499"><link href="text/shared/01/05230000.xhp" name="Position and Size">Object and Shape</link></h2>
     <embed href="text/shared/01/05230000.xhp#groessetext"/>
-
+<comment>The next three "Line", "Area" and "Text" together with "Position and Size" should be in an "Object and Shape" submenu</comment>
     <h2 id="hd_id3154510"><link href="text/shared/01/05200000.xhp" name="Line">Line</link></h2>
     <embed href="text/shared/01/05200000.xhp#linietext"/>
 
@@ -55,14 +56,16 @@
     <h2 id="hd_id3155961"><link href="text/shared/01/05990000.xhp" name="Text">Text</link></h2>
     <embed href="text/shared/01/05990000.xhp#texttext"/>
 
+    <embed href="text/simpress/01/06070000.xhp#interactionh1"/>
+    <embed href="text/shared/01/05190000.xhp#name_head"/>
+    <embed href="text/shared/01/05190100.xhp#description_head"/>
+
     <h2 id="hd_id3156286"><link href="text/simpress/01/05120000.xhp" name="Page Layout...">Slide Design</link></h2>
     <embed href="text/simpress/01/05120000.xhp#seitenvorlagetext"/>
 
     <h2 id="hd_id3163827"><link href="text/simpress/01/05130000.xhp" name="Modify Layout">Slide Layout</link></h2>
     <embed href="text/simpress/01/05130000.xhp#seite"/>
 
-
-    <embed href="text/simpress/01/06070000.xhp#interactionh1"/>
     <embed href="text/shared/01/05290000.xhp#gruppe"/>
   </body>
 
diff --git a/source/text/swriter/main0105.xhp b/source/text/swriter/main0105.xhp
index fa84b2cb6c..d82b6ce3e9 100644
--- a/source/text/swriter/main0105.xhp
+++ b/source/text/swriter/main0105.xhp
@@ -33,10 +33,12 @@
 </section>
 <embed href="text/shared/submenu_text.xhp#submenu_text"/>
 <embed href="text/shared/submenu_spacing.xhp#submenu_spacing"/>
+<section id="Align-and-Lists">
 <h2 id="hd_id551602974854459">Align</h2>
 <paragraph role="paragraph" id="par_id741602974888780">Opens a submenu where you can align text and objects.</paragraph><comment>When a submenu is made for Align, then the heading and text can be replaced with the embed</comment>
 <h2 id="hd_id951602975070826">Lists</h2>
 <paragraph role="paragraph" id="par_id461602975083850">Opens a submenu where you can modify the structure of numbered and bulleted paragraphs.</paragraph><comment>When a submenu is made for Lists, then the heading and text can be replaced with the embed.</comment>
+</section>
 <embed href="text/shared/02/paintbrush.xhp#paintbrush_head"/>
 <embed href="text/shared/01/05010000.xhp#standard"/>
 <h2 id="hd_id3147261"><link href="text/shared/01/05020000.xhp" name="Character">Character</link></h2>