More updates on Drawing bars

+ some refactors

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

5 files changed, 79 insertions, 95 deletions

diff --git a/source/text/sdraw/01/3dsettings_toolbar.xhp b/source/text/sdraw/01/3dsettings_toolbar.xhp
index 521e2a5f01..7a82463d4a 100644
--- a/source/text/sdraw/01/3dsettings_toolbar.xhp
+++ b/source/text/sdraw/01/3dsettings_toolbar.xhp
@@ -29,21 +29,26 @@
 <h1 id="par_idN1055A"><variable id="3dtoolbar"><link href="text/sdraw/01/3dsettings_toolbar.xhp">3D Settings</link></variable></h1>
   <paragraph xml-lang="en-US" id="par_idN1056A" role="paragraph"><ahelp hid=".">The <emph>3D Settings</emph> toolbar controls properties of selected 3D objects.</ahelp></paragraph>
 </section>
+
+<section id="extrusiononoff">
 <bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionToggle" id="bm_id9720450" localize="false"/>
-<h2 id="par_idN10575">Extrusion On/Off</h2>
+<h2 id="par_idN10575"><link href="text/sdraw/01/3dsettings_toolbar.xhp">Extrusion On/Off</link></h2>
   <paragraph xml-lang="en-US" id="par_idN10579" role="paragraph"><ahelp hid=".">Switches the 3D effects on and off for the selected objects.</ahelp></paragraph>
-  <table id="tab_id271592603243550">
+    <section id="syextrusiononoff">
+        <table id="tab_id271592603243550">
       <tablerow>
           <tablecell>
               <paragraph id="par_id891592603243551" role="paragraph">
-                  <image src="cmd/lc_extrusiontoggle.png" id="img_id681592603243552" width="1cm"  height="1cm"><alt xml-lang="en-US" id="alt_id241592603243553">Icon Extrusion On/Off</alt></image>
+                  <image src="cmd/lc_convertinto3d.svg" id="img_id681592603243552" width="1cm"  height="1cm"><alt xml-lang="en-US" id="alt_id241592603243553">Icon Extrusion On/Off</alt></image>
               </paragraph>
           </tablecell>
           <tablecell>
               <paragraph id="par_id241592603243554" role="paragraph" xml-lang="en-US">Extrusion On/Off</paragraph>
           </tablecell>
       </tablerow>
-    </table>
+      </table>
+  </section>
+  </section>
 <bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltDown" id="bm_id4860377" localize="false"/>
 <h2 id="par_idN10590">Tilt Down</h2>
   <paragraph xml-lang="en-US" id="par_idN10594" role="paragraph"><ahelp hid=".">Tilts the selected object downwards by five degrees.</ahelp></paragraph>
diff --git a/source/text/shared/00/00040502.xhp b/source/text/shared/00/00040502.xhp
index c7369f0886..04d2eb5886 100644
--- a/source/text/shared/00/00040502.xhp
+++ b/source/text/shared/00/00040502.xhp
@@ -285,7 +285,8 @@
         <paragraph id="par_id3145642" role="paragraph"><switchinline select="appl"><caseinline select="DRAW">Open context menu - choose <menuitem>Edit Points</menuitem>.
                     </caseinline></switchinline><switchinline select="appl"><caseinline select="IMPRESS">Open context menu - choose <menuitem>Edit Points</menuitem>.</caseinline></switchinline></paragraph>
         <paragraph id="par_id3149019" role="paragraph"><switchinline select="appl"><caseinline select="DRAW"><keycode>F8</keycode> key</caseinline><caseinline select="IMPRESS"><keycode>F8</keycode> key</caseinline></switchinline></paragraph>
-            <table id="tbl_id3145618">
+            <section id="syedit_points">
+                <table id="tbl_id3145618">
                 <tablerow>
                     <tablecell>
                         <paragraph id="par_id3150044" role="paragraph"><image id="img_id3147100" src="cmd/sc_toggleobjectbeziermode.svg" width="1cm" height="1cm"><alt id="alt_id3147100">Icon Edit Points</alt></image></paragraph>
@@ -294,7 +295,8 @@
                         <paragraph id="par_id3153966" role="paragraph">Edit Points</paragraph>
                     </tablecell>
                 </tablerow>
-            </table>
+                </table>
+            </section>
     </section>
     <section id="character">
         <paragraph id="par_id3151248" role="paragraph">Choose <menuitem>Format - Character</menuitem> (drawing functions).</paragraph>
diff --git a/source/text/shared/02/01140000.xhp b/source/text/shared/02/01140000.xhp
index 4f68f75da9..5526e81671 100644
--- a/source/text/shared/02/01140000.xhp
+++ b/source/text/shared/02/01140000.xhp
@@ -20,12 +20,12 @@
 
 <meta>
   <topic id="textshared0201140000xml" indexer="include" status="PUBLISH">
-    <title xml-lang="en-US" id="tit">Show Draw Functions</title>
+    <title id="tit">Show Draw Functions</title>
     <filename>/text/shared/02/01140000.xhp</filename>
   </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3150476">
+<bookmark branch="index" id="bm_id3150476">
 <bookmark_value>Drawing bar</bookmark_value>
 <bookmark_value>lines; draw functions</bookmark_value>
 <bookmark_value>polygon drawing</bookmark_value>
@@ -43,21 +43,21 @@
 <bookmark_value>rectangle drawing</bookmark_value>
 <bookmark_value>shapes</bookmark_value>
 </bookmark><comment>MW moved "frames;" and "selecting;"  to the shared guide groups.xhp</comment><comment>MW added 5 entries</comment>
-<paragraph xml-lang="en-US" id="par_id3150476" role="paragraph" localize="false"/>
+<paragraph id="par_id3150476" role="paragraph" localize="false"/>
 <section id="show_draw_functions">
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertDraw" id="bm_id484265" localize="false"/>
+<bookmark branch="hid/.uno:InsertDraw" id="bm_id484265" localize="false"/>
 <h1 id="hd_id3152363"><link href="text/shared/02/01140000.xhp">Show Draw Functions</link></h1>
-<paragraph xml-lang="en-US" id="par_id3150789" role="paragraph"><ahelp hid=".uno:InsertDraw">Click to open or close the <emph>Drawing</emph> bar, where you can add shapes, lines, text, and callouts to the current document.</ahelp></paragraph>
+<paragraph id="par_id3150789" role="paragraph"><ahelp hid=".uno:InsertDraw">Click to open or close the <emph>Drawing</emph> bar, where you can add shapes, lines, text, and callouts to the current document.</ahelp></paragraph>
 </section>
-<paragraph xml-lang="en-US" id="par_idN10849" role="paragraph">You can switch on and off the <emph>Drawing</emph> toolbar of Writer and Calc documents using an icon on the <emph>Standard</emph> toolbar.</paragraph>
+<paragraph id="par_idN10849" role="paragraph">You can switch on and off the <emph>Drawing</emph> toolbar of Writer and Calc documents using an icon on the <emph>Standard</emph> toolbar.</paragraph>
 <section id="syshowdraw">
 <table id="tbl_id3149182">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3154288" role="paragraph"><image id="img_id3153683" src="cmd/sc_insertdraw.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153683">Icon</alt></image></paragraph>
+      <paragraph id="par_id3154288" role="paragraph"><image id="img_id3153683" src="cmd/lc_insertdraw.svg" width="1cm" height="1cm"><alt id="alt_id3153683">Icon Show Draw Functions</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3153032" role="paragraph">Show Draw Functions</paragraph>
+      <paragraph id="par_id3153032" role="paragraph">Show Draw Functions</paragraph>
     </tablecell>
   </tablerow>
 </table>
@@ -67,163 +67,163 @@
 <table id="tbl_id3159157">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3147573" role="paragraph"><image id="img_id3153824" src="cmd/sc_drawselect.png" width="0.222in" height="0.222in"><alt xml-lang="en-US" id="alt_id3153824">Icon</alt></image></paragraph>
+      <paragraph id="par_id3147573" role="paragraph"><image id="img_id3153824" src="cmd/lc_selectobject.svg" width="1cm" height="1cm"><alt id="alt_id3153824">Icon Selection</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3150771" role="paragraph">Lets you select objects in the current document. To select an object, click the object with the arrow. To select more than one object, drag a selection frame around the objects. To add an object to a selection, press <emph>Shift</emph>, and then click the object.</paragraph>
+      <paragraph id="par_id3150771" role="paragraph">Lets you select objects in the current document. To select an object, click the object with the arrow. To select more than one object, drag a selection frame around the objects. To add an object to a selection, press <emph>Shift</emph>, and then click the object.</paragraph>
     </tablecell>
   </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/.uno:Line" id="bm_id9304767" localize="false"/>
+<bookmark branch="hid/.uno:Line" id="bm_id9304767" localize="false"/>
 <h2 id="hd_id3143270"><variable id="line_title">Line</variable></h2>
 <table id="tbl_id3150275">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3154897" role="paragraph"><image id="img_id3147618" src="cmd/sc_line.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147618">Icon</alt></image></paragraph>
+      <paragraph id="par_id3154897" role="paragraph"><image id="img_id3147618" src="cmd/lc_line.svg" width="1cm" height="1cm"><alt id="alt_id3147618">Icon Line</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph"><variable id="line_text"><ahelp hid=".uno:Line">Draws a straight line where you drag in the current document. To constrain the line to 45 degrees, hold down <emph>Shift</emph> while you drag.</ahelp></variable></paragraph>
+      <paragraph id="par_id3155922" role="paragraph"><variable id="line_text"><ahelp hid=".uno:Line">Draws a straight line where you drag in the current document. To constrain the line to 45 degrees, hold down <emph>Shift</emph> while you drag.</ahelp></variable></paragraph>
     </tablecell>
   </tablerow>
 </table>
 <tip id="par_id3153360">To enter text on a line, double-click the line and type or paste your text. The text direction corresponds to the direction you dragged to draw the line. To hide the line, select <emph>Invisible</emph> in the <emph>Line Style</emph> box on the <emph>Drawing Object Properties</emph> bar.</tip>
-<bookmark xml-lang="en-US" branch="hid/.uno:Rect" id="bm_id8789060" localize="false"/>
+<bookmark branch="hid/.uno:Rect" id="bm_id8789060" localize="false"/>
 <h2 id="hd_id3152922">Rectangle</h2>
 <table id="tbl_id3153178">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3154125" role="paragraph"><image id="img_id3158407" src="cmd/sc_rect.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3158407">Icon</alt></image></paragraph>
+      <paragraph id="par_id3154125" role="paragraph"><image id="img_id3158407" src="cmd/lc_rect.svg" width="1cm" height="1cm"><alt id="alt_id3158407">Icon Rectangle</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph"><ahelp hid=".uno:Rect">Draws a rectangle where you drag in the current document. Click where you want to place a corner of the rectangle, and drag to the size you want. To draw a square, hold down <emph>Shift</emph> while you drag.</ahelp></paragraph>
+      <paragraph id="par_id3147230" role="paragraph"><ahelp hid=".uno:Rect">Draws a rectangle where you drag in the current document. Click where you want to place a corner of the rectangle, and drag to the size you want. To draw a square, hold down <emph>Shift</emph> while you drag.</ahelp></paragraph>
     </tablecell>
   </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/.uno:Ellipse" id="bm_id1817643" localize="false"/>
+<bookmark branch="hid/.uno:Ellipse" id="bm_id1817643" localize="false"/>
 <h2 id="hd_id3153367">Ellipse</h2>
 <table id="tbl_id3157894">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3156443" role="paragraph"><image id="img_id3153951" src="cmd/sc_ellipse.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153951">Icon</alt></image></paragraph>
+      <paragraph id="par_id3156443" role="paragraph"><image id="img_id3153951" src="cmd/lc_ellipse.svg" width="1cm" height="1cm"><alt id="alt_id3153951">Icon Ellipse</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3159197" role="paragraph"><ahelp hid=".uno:Ellipse">Draws an oval where you drag in the current document. Click where you want to draw the oval, and drag to the size you want. To draw a circle, hold down <emph>Shift</emph> while you drag.</ahelp></paragraph>
+      <paragraph id="par_id3159197" role="paragraph"><ahelp hid=".uno:Ellipse">Draws an oval where you drag in the current document. Click where you want to draw the oval, and drag to the size you want. To draw a circle, hold down <emph>Shift</emph> while you drag.</ahelp></paragraph>
     </tablecell>
   </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/.uno:Polygon_Unfilled" id="bm_id8487307" localize="false"/>
+<bookmark branch="hid/.uno:Polygon_Unfilled" id="bm_id8487307" localize="false"/>
 <h2 id="hd_id3155308">Polygon</h2>
 <section id="polytext">
 <table id="tbl_id3155366">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3154129" role="paragraph"><image id="img_id3152576" src="cmd/sc_polygon_unfilled.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3152576">Icon</alt></image></paragraph>
+      <paragraph id="par_id3154129" role="paragraph"><image id="img_id3152576" src="cmd/lc_polygon_unfilled.svg" width="1cm" height="1cm"><alt id="alt_id3152576">Icon Polygon</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <section id="polytext2">
-        <paragraph xml-lang="en-US" id="par_id3147214" role="paragraph"><ahelp hid=".uno:Polygon_Unfilled">Draws a line composed of a series of straight line segments. Drag to draw a line segment, click to define the endpoint of the line segment, and then drag to draw a new line segment. Double-click to finish drawing the line. To create a closed shape, double-click the starting point of the line.</ahelp></paragraph>
-        <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph">Hold the <emph>Shift</emph> key while drawing a polygon to position new points at 45 degree angles.</paragraph>
-        <paragraph xml-lang="en-US" id="par_id3154319" role="paragraph">The <link href="text/shared/01/05270000.xhp"><emph>Edit Points</emph></link> mode enables you to interactively modify the individual points of the polygon.</paragraph>
+        <paragraph id="par_id3147214" role="paragraph"><ahelp hid=".uno:Polygon_Unfilled">Draws a line composed of a series of straight line segments. Drag to draw a line segment, click to define the endpoint of the line segment, and then drag to draw a new line segment. Double-click to finish drawing the line. To create a closed shape, double-click the starting point of the line.</ahelp></paragraph>
+        <paragraph id="par_id3154638" role="paragraph">Hold the <emph>Shift</emph> key while drawing a polygon to position new points at 45 degree angles.</paragraph>
+        <paragraph id="par_id3154319" role="paragraph">The <link href="text/shared/01/05270000.xhp"><emph>Edit Points</emph></link> mode enables you to interactively modify the individual points of the polygon.</paragraph>
       </section>
     </tablecell>
   </tablerow>
 </table>
 </section>
-<bookmark xml-lang="en-US" branch="hid/.uno:Bezier_Unfilled" id="bm_id7112387" localize="false"/>
+<bookmark branch="hid/.uno:Bezier_Unfilled" id="bm_id7112387" localize="false"/>
 <h2 id="hd_id3153279">Curve</h2>
 <table id="tbl_id3150423">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3153876" role="paragraph"><image id="img_id3149379" src="cmd/sc_bezier_unfilled.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149379">Icon</alt></image></paragraph>
+      <paragraph id="par_id3153876" role="paragraph"><image id="img_id3149379" src="cmd/lc_bezier_unfilled.svg" width="1cm" height="1cm"><alt id="alt_id3149379">Icon Curve</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3148878" role="paragraph"><variable id="kurvetext"><ahelp hid=".uno:Bezier_Unfilled">Draws a smooth Bezier curve. Click where you want the curve to start, drag, release, and then move the pointer to where you want the curve to end and click. Move the pointer and click again to add a straight line segment to the curve. Double-click to finish drawing the curve. To create a closed shape, double click the starting point of the curve.</ahelp> The arc of the curve is determined by the distance you drag.</variable></paragraph>
+      <paragraph id="par_id3148878" role="paragraph"><variable id="kurvetext"><ahelp hid=".uno:Bezier_Unfilled">Draws a smooth Bezier curve. Click where you want the curve to start, drag, release, and then move the pointer to where you want the curve to end and click. Move the pointer and click again to add a straight line segment to the curve. Double-click to finish drawing the curve. To create a closed shape, double click the starting point of the curve.</ahelp> The arc of the curve is determined by the distance you drag.</variable></paragraph>
     </tablecell>
   </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/.uno:Freeline_Unfilled" id="bm_id7473732" localize="false"/>
+<bookmark branch="hid/.uno:Freeline_Unfilled" id="bm_id7473732" localize="false"/>
 <h2 id="hd_id3148587">Freeform Line</h2>
 <table id="tbl_id3154015">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3155602" role="paragraph"><image id="img_id3154510" src="cmd/sc_linetoolbox.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154510">Icon</alt></image></paragraph>
+      <paragraph id="par_id3155602" role="paragraph"><image id="img_id3154510" src="cmd/lc_freeline_unfilled.svg" width="1cm" height="1cm"><alt id="alt_id3154510">Icon Freeform Line</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3154163" role="paragraph"><variable id="freihandtext"><ahelp hid=".uno:Freeline_Unfilled">Draws a freeform line where you drag in the current document. To end the line, release the mouse button. To draw a closed shape, release the mouse button near the starting point of the line.</ahelp></variable></paragraph>
+      <paragraph id="par_id3154163" role="paragraph"><variable id="freihandtext"><ahelp hid=".uno:Freeline_Unfilled">Draws a freeform line where you drag in the current document. To end the line, release the mouse button. To draw a closed shape, release the mouse button near the starting point of the line.</ahelp></variable></paragraph>
     </tablecell>
   </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/.uno:Arc" id="bm_id8811603" localize="false"/>
+<bookmark branch="hid/.uno:Arc" id="bm_id8811603" localize="false"/>
 <h2 id="hd_id3147259">Arc</h2>
 <table id="tbl_id3148566">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3156359" role="paragraph"><image id="img_id3153710" src="cmd/sc_arc.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3153710">Icon</alt></image></paragraph>
+      <paragraph id="par_id3156359" role="paragraph"><image id="img_id3153710" src="cmd/lc_arc.svg" width="1cm" height="1cm"><alt id="alt_id3153710">Icon Arc</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3148482" role="paragraph"><ahelp hid=".uno:Arc">Draws an arc in the current document. To draw an arc, drag an oval to the size you want, and then click to define the starting point of the arc. Move your pointer to where you want to place the endpoint and click. You do not need to click on the oval. To draw an arc that is based on a circle, hold down <emph>Shift</emph> while you drag.</ahelp></paragraph>
+      <paragraph id="par_id3148482" role="paragraph"><ahelp hid=".uno:Arc">Draws an arc in the current document. To draw an arc, drag an oval to the size you want, and then click to define the starting point of the arc. Move your pointer to where you want to place the endpoint and click. You do not need to click on the oval. To draw an arc that is based on a circle, hold down <emph>Shift</emph> while you drag.</ahelp></paragraph>
     </tablecell>
   </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/.uno:Pie" id="bm_id8122704" localize="false"/>
+<bookmark branch="hid/.uno:Pie" id="bm_id8122704" localize="false"/>
 <h2 id="hd_id3153924">Ellipse Pie</h2>
 <table id="tbl_id3148914">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3154363" role="paragraph"><image id="img_id3159186" src="cmd/sc_pie.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3159186">Icon</alt></image></paragraph>
+      <paragraph id="par_id3154363" role="paragraph"><image id="img_id3159186" src="cmd/lc_pie.svg" width="1cm" height="1cm"><alt id="alt_id3159186">Icon Ellipse Pie</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3156383" role="paragraph"><ahelp hid=".uno:Pie">Draws a filled shape that is defined by the arc of an oval and two radius lines in the current document. To draw an ellipse pie, drag an oval to the size you want, and then click to define the first radius line. Move your pointer to where you want to place the second radius line and click. You do not need to click on the oval. To draw a circle pie, hold down <emph>Shift</emph> while you drag.</ahelp></paragraph>
+      <paragraph id="par_id3156383" role="paragraph"><ahelp hid=".uno:Pie">Draws a filled shape that is defined by the arc of an oval and two radius lines in the current document. To draw an ellipse pie, drag an oval to the size you want, and then click to define the first radius line. Move your pointer to where you want to place the second radius line and click. You do not need to click on the oval. To draw a circle pie, hold down <emph>Shift</emph> while you drag.</ahelp></paragraph>
     </tablecell>
   </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/.uno:CircleCut" id="bm_id485718" localize="false"/>
+<bookmark branch="hid/.uno:CircleCut" id="bm_id485718" localize="false"/>
 <h2 id="hd_id3154964">Circle Segment</h2>
 <table id="tbl_id3163807">
   <tablerow>
     <tablecell>
-       <paragraph xml-lang="en-US" id="par_id3151017" role="paragraph"><image id="img_id3147315" src="cmd/sc_circlecut.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147315">Icon</alt></image></paragraph>
+       <paragraph id="par_id3151017" role="paragraph"><image id="img_id3147315" src="cmd/lc_circlecut.svg" width="1cm" height="1cm"><alt id="alt_id3147315">Icon Circle Segment</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph"><ahelp hid=".uno:CircleCut">Draws a filled shape that is defined by the arc of a circle and a diameter line in the current document. To draw a circle segment, drag a circle to the size you want, and then click to define the starting point of the diameter line. Move your pointer to where you want to place the endpoint of the diameter line and click. You do not need to click on the circle. To draw an ellipse segment, hold down <emph>Shift</emph> while you drag.</ahelp></paragraph>
+      <paragraph id="par_id3149106" role="paragraph"><ahelp hid=".uno:CircleCut">Draws a filled shape that is defined by the arc of a circle and a diameter line in the current document. To draw a circle segment, drag a circle to the size you want, and then click to define the starting point of the diameter line. Move your pointer to where you want to place the endpoint of the diameter line and click. You do not need to click on the circle. To draw an ellipse segment, hold down <emph>Shift</emph> while you drag.</ahelp></paragraph>
     </tablecell>
   </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/.uno:DrawText" id="bm_id8730699" localize="false"/>
+<bookmark branch="hid/.uno:DrawText" id="bm_id8730699" localize="false"/>
 <h2 id="hd_id3145150"><variable id="textbox_title">Text Box</variable></h2>
 <table id="tbl_id3150297">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3145790" role="paragraph"><image id="img_id3155608" src="cmd/sc_texttoolbox.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3155608">Icon</alt></image></paragraph>
+      <paragraph id="par_id3145790" role="paragraph"><image id="img_id3155608" src="cmd/lc_text.svg" width="1cm" height="1cm"><alt id="alt_id3155608">Icon Text Box</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3154657" role="paragraph"><variable id="textbox_text"><ahelp hid=".uno:DrawText">Draws a text box with horizontal text direction where you drag in the current document. Drag a text box to the size you want anywhere in the document, and then type or paste your text. Rotate the text box to get rotated text.</ahelp></variable></paragraph>
+      <paragraph id="par_id3154657" role="paragraph"><variable id="textbox_text"><ahelp hid=".uno:DrawText">Draws a text box with horizontal text direction where you drag in the current document. Drag a text box to the size you want anywhere in the document, and then type or paste your text. Rotate the text box to get rotated text.</ahelp></variable></paragraph>
     </tablecell>
   </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/.uno:Text_Marquee" id="bm_id9847340" localize="false"/>
+<bookmark branch="hid/.uno:Text_Marquee" id="bm_id9847340" localize="false"/>
 <h2 id="hd_id3158214">Text Animation</h2>
 <table id="tbl_id3150979">
    <tablerow>
      <tablecell>
-       <paragraph xml-lang="en-US" id="par_id3150380" role="paragraph"><image id="img_id3152580" src="cmd/sc_text_marquee.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3152580">Icon</alt></image></paragraph>
+       <paragraph id="par_id3150380" role="paragraph"><image id="img_id3152580" src="cmd/lc_text_marquee.svg" width="1cm" height="1cm"><alt id="alt_id3152580">Icon Text Animation</alt></image></paragraph>
      </tablecell>
      <tablecell>
-       <paragraph xml-lang="en-US" id="par_id3150826" role="paragraph"><ahelp hid=".uno:Text_Marquee" visibility="hidden">Inserts animated text with horizontal text direction into the current document. Drag a text box, and then type or paste your text. To assign an animation effect, choose <emph>Format - Text - Text Animation</emph>.</ahelp> <variable id="lauftext">Inserts animated text with horizontal text direction into the current document.</variable></paragraph>
+       <paragraph id="par_id3150826" role="paragraph"><ahelp hid=".uno:Text_Marquee" visibility="hidden">Inserts animated text with horizontal text direction into the current document. Drag a text box, and then type or paste your text. To assign an animation effect, choose <emph>Format - Text - Text Animation</emph>.</ahelp> <variable id="lauftext">Inserts animated text with horizontal text direction into the current document.</variable></paragraph>
      </tablecell>
   </tablerow>
 </table>
-<bookmark xml-lang="en-US" branch="hid/.uno:DrawCaption" id="bm_id3229321" localize="false"/>
+<bookmark branch="hid/.uno:DrawCaption" id="bm_id3229321" localize="false"/>
 <h2 id="hd_id3149966">Callouts</h2>
 <table id="tbl_id3153793">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3153781" role="paragraph"><image id="img_id3145256" src="cmd/sc_drawcaption.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3145256">Icon</alt></image></paragraph>
+      <paragraph id="par_id3153781" role="paragraph"><image id="img_id3145256" src="cmd/lc_drawcaption.svg" width="1cm" height="1cm"><alt id="alt_id3145256">Icon Callouts</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3151274" role="paragraph"><ahelp hid=".uno:DrawCaption">Draws a line that ends in a rectangular callout with horizontal text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand.</ahelp></paragraph>
+      <paragraph id="par_id3151274" role="paragraph"><ahelp hid=".uno:DrawCaption">Draws a line that ends in a rectangular callout with horizontal text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand.</ahelp></paragraph>
     </tablecell>
   </tablerow>
 </table>
@@ -239,46 +239,49 @@
 <embed href="text/shared/00/00000404.xhp#sycallouts"/>
 <embed href="text/shared/02/stars.xhp#stars"/>
 <embed href="text/shared/00/00000404.xhp#systars"/>
-<h2 id="par_idN10E50"><link href="text/shared/01/05270000.xhp">Points</link></h2>
-<paragraph xml-lang="en-US" id="par_idN10E60" role="paragraph">Enables you to edit points on your drawing.</paragraph>
+
+<embed href="text/shared/01/05270000.xhp#edit_points"/>
+<embed href="text/shared/00/00040502.xhp#syedit_points"/>
+
 <embed href="text/shared/02/fontwork.xhp#fontwork"/>
 <embed href="text/shared/00/00000404.xhp#syfontworkgallery"/>
 <h2 id="par_idN10E75"><link href="text/shared/01/04140000.xhp">From File</link></h2>
 <embed href="text/shared/01/04140000.xhp#grafiktext"/>
 <embed href="text/shared/00/00000404.xhp#syimage"/>
-<h2 id="par_idN10E95"><link href="text/sdraw/01/3dsettings_toolbar.xhp">Extrusion On/Off</link></h2>
-<paragraph xml-lang="en-US" id="par_idN10EA5" role="paragraph">Switches the 3D effects on and off for the selected objects.</paragraph>
+
+<embed href="text/sdraw/01/3dsettings_toolbar.xhp#extrusiononoff"/>
+
 <embed href="text/shared/00/00000007.xhp#asia"/>
 <section id="legasia">
-<bookmark xml-lang="en-US" branch="hid/.uno:VerticalCaption" id="bm_id1434672" localize="false"/>
+<bookmark branch="hid/.uno:VerticalCaption" id="bm_id1434672" localize="false"/>
 <h2 id="hd_id3149735">Vertical Callouts</h2>
 <table id="tbl_id3154585">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3156068" role="paragraph"><image id="img_id3154818" src="cmd/sc_verticalcaption.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154818">Icon</alt></image></paragraph>
+      <paragraph id="par_id3156068" role="paragraph"><image id="img_id3154818" src="cmd/lc_verticalcaption.svg" width="1cm" height="1cm"><alt id="alt_id3154818">Icon Vertical Callouts</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3150492" role="paragraph"><ahelp hid=".uno:VerticalCaption">Draws a line that ends in a rectangular callout with vertical text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand. Only available when Asian language support is enabled.</ahelp></paragraph>
+      <paragraph id="par_id3150492" role="paragraph"><ahelp hid=".uno:VerticalCaption">Draws a line that ends in a rectangular callout with vertical text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand. Only available when Asian language support is enabled.</ahelp></paragraph>
     </tablecell>
   </tablerow>
 </table>
 </section>
 <section id="textasia">
-<bookmark xml-lang="en-US" branch="hid/.uno:VerticalText" id="bm_id5245755" localize="false"/>
+<bookmark branch="hid/.uno:VerticalText" id="bm_id5245755" localize="false"/>
 <h2 id="hd_id3166437">Vertical Text</h2>
 <table id="tbl_id3148751">
   <tablerow>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3146929" role="paragraph"><image id="img_id3154372" src="cmd/sc_verticaltext.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3154372">Icon</alt></image></paragraph>
+      <paragraph id="par_id3146929" role="paragraph"><image id="img_id3154372" src="cmd/lc_verticaltext.svg" width="1cm" height="1cm"><alt id="alt_id3154372">Icon Vertical Text</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph xml-lang="en-US" id="par_id3152989" role="paragraph"><ahelp hid=".uno:VerticalText">Draws a text box with vertical text direction where you click or drag in the current document. Click anywhere in the document, and then type or paste your text. You can also move the cursor to where you want to add the text, drag a text box, and then type or paste your text. Only available when Asian language support is enabled.</ahelp></paragraph>
+      <paragraph id="par_id3152989" role="paragraph"><ahelp hid=".uno:VerticalText">Draws a text box with vertical text direction where you click or drag in the current document. Click anywhere in the document, and then type or paste your text. You can also move the cursor to where you want to add the text, drag a text box, and then type or paste your text. Only available when Asian language support is enabled.</ahelp></paragraph>
     </tablecell>
   </tablerow>
 </table>
 </section>
 <section id="relatedtopics">
-<paragraph xml-lang="en-US" id="par_id3155555" role="paragraph"><link href="text/shared/guide/insert_graphic_drawit.xhp">Tips for working with the <emph>Drawing</emph> bar</link>.</paragraph>
+<paragraph id="par_id3155555" role="paragraph"><link href="text/shared/guide/insert_graphic_drawit.xhp">Tips for working with the <emph>Drawing</emph> bar</link>.</paragraph>
 </section>
 </body>
 </helpdocument>
diff --git a/source/text/simpress/main0202.xhp b/source/text/simpress/main0202.xhp
index 5dd7f2e86c..2e59f4e215 100644
--- a/source/text/simpress/main0202.xhp
+++ b/source/text/simpress/main0202.xhp
@@ -68,7 +68,6 @@
 <embed href="text/shared/01/05210100.xhp#sytext"/>
 <embed href="text/shared/00/00000004.xhp#syarea_style"/>
 
-
 <embed href="text/shared/01/05210600.xhp#syshadow"/>
 <embed href="text/shared/02/05020000.xhp#arrow_style"/>
 <embed href="text/shared/02/05020000.xhp#syarrow_style"/>
@@ -78,7 +77,6 @@
 
 <embed href="text/simpress/02/10030000.xhp#transformations"/>
 
-
 <embed href="text/shared/02/01230000.xhp#stylist"/>
 <embed href="text/shared/02/01230000.xhp#systylist"/>
 
diff --git a/source/text/simpress/main0210.xhp b/source/text/simpress/main0210.xhp
index 265028705d..16d09a9325 100644
--- a/source/text/simpress/main0210.xhp
+++ b/source/text/simpress/main0210.xhp
@@ -97,38 +97,14 @@
 <embed href="text/shared/02/24010000.xhp#filter"/>
 <embed href="text/shared/02/24010000.xhp#syfilter"/>
 
+<embed href="text/shared/01/05270000.xhp#edit_points"/>
+<embed href="text/shared/00/00040502.xhp#syedit_points"/>
 
-<h2 id="par_idN10770"><link href="text/shared/01/05270000.xhp">Points</link></h2>
-<paragraph role="paragraph" id="par_idN10780" xml-lang="en-US">Enables you to edit points on your drawing.</paragraph>
-<table id="tab_id41683513284831">
-    <tablerow>
-        <tablecell>
-            <paragraph id="par_id61683513284832" role="paragraph">
-                <image src="cmd/lc_toggleobjectbeziermode.svg" id="img_id891683513284833" width="1cm"  height="1cm"><alt xml-lang="en-US" id="alt_id291683513284835">Icon Points</alt></image>
-            </paragraph>
-        </tablecell>
-        <tablecell>
-            <paragraph id="par_id951683513284837" role="paragraph" xml-lang="en-US">Points</paragraph>
-        </tablecell>
-    </tablerow>
-    </table>
 <h2 id="par_idN10783"><link href="text/simpress/02/10030200.xhp">Gluepoints</link></h2>
 <paragraph role="paragraph" id="par_idN10793" xml-lang="en-US">Enables you to edit gluepoints on your drawing.</paragraph>
 <embed href="text/simpress/00/00000402.xhp#syeditgluepoints"/>
 
-<h2 id="par_idN107FF"><link href="text/sdraw/01/3dsettings_toolbar.xhp">Extrusion On/Off</link></h2>
-<paragraph role="paragraph" id="par_idN1080F" xml-lang="en-US">Switches the 3D effects on and off for the selected objects.</paragraph>
-<table id="tab_id1001683512095055">
-    <tablerow>
-        <tablecell>
-            <paragraph id="par_id71683512095056" role="paragraph">
-                <image src="cmd/lc_convertinto3d.svg" id="img_id751683512095057" width="1cm"  height="1cm"><alt xml-lang="en-US" id="alt_id761683512095058">Icon Extrusion On/Off</alt></image>
-            </paragraph>
-        </tablecell>
-        <tablecell>
-            <paragraph id="par_id571683512095060" role="paragraph" xml-lang="en-US">Extrusion On/Off</paragraph>
-        </tablecell>
-    </tablerow>
-    </table>
+<embed href="text/sdraw/01/3dsettings_toolbar.xhp#extrusiononoff"/>
+
 </body>
 </helpdocument>