tdf#155875 Tab'd UI commands Writer/Insert in Help

+ refactoring
+ Writer Insert menu (part 4)

Change-Id: Ifa2c290d2a90133d6ee21d4827f83b5690e59f9c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153462
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit 595a4c374671ac87761f9833cfc999a832d8ee58)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153426

6 files changed, 107 insertions, 66 deletions

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 1157d06aa7..937ccec6c3 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -370,6 +370,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/01/pasterowabove \
     helpcontent2/source/text/shared/01/pastecolumnleft \
     helpcontent2/source/text/shared/01/profile_safe_mode \
+    helpcontent2/source/text/shared/01/qrcode \
     helpcontent2/source/text/shared/01/quickcolorselector \
     helpcontent2/source/text/shared/01/ref_epub_export \
     helpcontent2/source/text/shared/01/ref_pdf_export \
@@ -745,7 +746,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/guide/print_blackwhite \
     helpcontent2/source/text/shared/guide/print_faster \
     helpcontent2/source/text/shared/guide/protection \
-    helpcontent2/source/text/shared/guide/qrcode \
     helpcontent2/source/text/shared/guide/redaction \
     helpcontent2/source/text/shared/guide/redlining \
     helpcontent2/source/text/shared/guide/redlining_accept \
diff --git a/source/text/shared/00/00000404.xhp b/source/text/shared/00/00000404.xhp
index e5ff9d8ff8..76f2b67253 100644
--- a/source/text/shared/00/00000404.xhp
+++ b/source/text/shared/00/00000404.xhp
@@ -103,44 +103,74 @@
     </section>
 </section>
 
-<paragraph role="paragraph" id="par_id3147242"><variable id="insert_objects">Choose <menuitem>Insert - OLE Object</menuitem>.</variable></paragraph>
-<section id="ole_object">
-<paragraph role="paragraph" id="par_id3152996">Choose <menuitem>Insert - OLE Object - OLE Object</menuitem>.</paragraph>
-<paragraph role="paragraph" id="par_id3146806">On the <emph>Insert</emph> bar, click</paragraph>
-<section id="syole">
-<table id="tbl_id3153348">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3150254">
-<image id="img_id3156305" src="cmd/sc_insobjctrl.png" width="1cm" height="1cm"><alt id="alt_id3156305">Icon OLE object</alt></image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3145417">OLE Object</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<section id="insert_objects">
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id3147242">Choose <menuitem>Insert - OLE Object</menuitem>.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+    <paragraph role="paragraph" id="par_id261687440040872">Choose <menuitem>Insert - Insert OLE Object</menuitem>.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <table id="tab_id591687440102731">
+        <tablerow>
+            <tablecell>
+                <paragraph id="par_id151687440102732" role="paragraph"><image src="cmd/lc_insertobject.svg" id="img_id151687440102733" width="1cm" height="1cm"><alt id="alt_id251687440102734">Icon Insert OLE Object</alt></image></paragraph>
+            </tablecell>
+            <tablecell>
+                <paragraph id="par_id411687440102736" role="paragraph">Insert OLE Object</paragraph>
+            </tablecell>
+        </tablerow>
+    </table>
 </section>
+
+<section id="ole_object">
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id3152996">Choose <menuitem>Insert - OLE Object - OLE Object</menuitem>.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+    <paragraph role="paragraph" id="par_id261697440040872">Choose <menuitem>Insert - Insert OLE Object</menuitem>.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <section id="syole">
+        <table id="tbl_id3153348">
+            <tablerow>
+                <tablecell>
+                    <paragraph role="paragraph" id="par_id3150254">
+                        <image id="img_id3156305" src="cmd/lc_insertobject.svg" width="1cm" height="1cm"><alt id="alt_id3156305">Icon OLE object</alt></image></paragraph>
+                </tablecell>
+                <tablecell>
+                    <paragraph role="paragraph" id="par_id3145417">OLE Object</paragraph>
+                </tablecell>
+            </tablerow>
+        </table>
+    </section>
 </section>
+
 <section id="qrcode">
-  <paragraph role="paragraph" id="par_id761566316165430">Choose <menuitem>Insert - OLE Object - QR and Barcode</menuitem>.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id761566316165430">Choose <menuitem>Insert - OLE Object - QR and Barcode</menuitem>.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+    <paragraph role="paragraph" id="par_id51687443038152">On the <menuitem>Insert</menuitem> menu of the <menuitem>Insert</menuitem> tab, choose <menuitem>QR and Barcode</menuitem>.</paragraph>
 </section>
+
 <section id="math">
-<paragraph role="paragraph" id="par_id3150393"><variable id="insert_formula">Choose <menuitem>Insert - OLE Object - Formula Object</menuitem>.</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153056">On the <emph>Insert</emph> bar, click</paragraph>
-<section id="systarmath">
-<table id="tbl_id3155432">
-<tablerow>
-<tablecell>
-<paragraph role="paragraph" id="par_id3148559">
-<image id="img_id3149933" src="cmd/sc_insertobjectstarmath.png" width="1cm" height="1cm"><alt id="alt_id3149933">Icon Formula</alt></image></paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="paragraph" id="par_id3155858">Formula</paragraph>
-</tablecell>
-</tablerow>
-</table>
-</section>
+    <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+    <paragraph role="paragraph" id="par_id3150393"><variable id="insert_formula">Choose <menuitem>Insert - OLE Object - Formula Object</menuitem>.</variable></paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_tabUI"/>
+    <paragraph role="paragraph" id="par_id761687440588022">Choose <menuitem>Insert - Formula Object</menuitem>.</paragraph>
+    <embed href="text/shared/00/00000004.xhp#from_toolbars"/>
+    <section id="systarmath">
+        <table id="tab_id901687440647192">
+            <tablerow>
+                <tablecell>
+                    <paragraph id="par_id951687440647194" role="paragraph"><image src="cmd/lc_insertmath.svg" id="img_id91687440647195" width="1cm"  height="1cm"><alt id="alt_id61687440647196">Icon Insert Formula Object</alt></image></paragraph>
+                </tablecell>
+                <tablecell>
+                    <paragraph id="par_id301687440647198" role="paragraph">Insert Formula Object</paragraph>
+                </tablecell>
+            </tablerow>
+        </table>
+    </section>
+    <embed href="text/shared/00/00000004.xhp#from_keyboard"/>
+    <paragraph role="paragraph" id="par_id191687440753064"><switchinline select="sys"><caseinline select="MAC"><keycode>Option</keycode></caseinline><defaultinline><keycode>Alt</keycode></defaultinline></switchinline><keycode> + Shift + E</keycode></paragraph>
 </section>
+
 <paragraph role="paragraph" id="par_id3153144">Choose <emph>Format - Chart Type</emph>.</paragraph>
 <paragraph role="paragraph" id="par_id3147578">Choose <menuitem>Insert - Chart </menuitem>.</paragraph>
 <paragraph role="paragraph" id="par_id3154011">Choose <emph>Format - Chart Type</emph>.</paragraph>
diff --git a/source/text/shared/01/04150000.xhp b/source/text/shared/01/04150000.xhp
index 7629753c83..d681c20644 100644
--- a/source/text/shared/01/04150000.xhp
+++ b/source/text/shared/01/04150000.xhp
@@ -20,23 +20,24 @@
 
 <meta>
   <topic id="textshared0104150000xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">OLE Object (Insert Menu)</title>
+    <title id="tit">OLE Object (Insert Menu)</title>
     <filename>/text/shared/01/04150000.xhp</filename>
   </topic>
 </meta>
 <body>
 <section id="object_submenu">
-<bookmark xml-lang="en-US" branch="hid/.uno:ObjectMenu" id="bm_id2569353" localize="false"/>
+<bookmark branch="hid/.uno:ObjectMenu" id="bm_id2569353" localize="false"/>
 <h1 id="hd_id3146873"><variable id="oleobjecth1"><link href="text/shared/01/04150000.xhp">OLE Object</link></variable></h1>
-  <paragraph id="par_id3159079" role="paragraph" xml-lang="en-US"><ahelp hid=".">Inserts an embedded or linked object into your document, including formulas, QR codes, and OLE objects.</ahelp></paragraph>
+  <paragraph id="par_id3159079" role="paragraph"><ahelp hid=".">Inserts an embedded or linked object into your document, including formulas, QR codes, and OLE objects.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000404.xhp#insert_objects"/>
 </section>
-<h2 id="hd_id3153577"><link href="text/shared/01/04160300.xhp">Formula Object</link></h2>
-  <embed href="text/shared/01/04160300.xhp#starmath"/>
-<embed href="text/shared/guide/qrcode.xhp#qrcodeh1"/>
-<h2 id="hd_id3154894"><link href="text/shared/01/04150100.xhp">OLE Object</link></h2>
-  <embed href="text/shared/01/04150100.xhp#ole"/>
+
+<embed href="text/shared/01/04160300.xhp#starmath"/>
+
+<embed href="text/shared/01/qrcode.xhp#qrcodeh1"/>
+
+<embed href="text/shared/01/04150100.xhp#ole"/>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/04150100.xhp b/source/text/shared/01/04150100.xhp
index e756fc1e9d..2b5fe5ad35 100644
--- a/source/text/shared/01/04150100.xhp
+++ b/source/text/shared/01/04150100.xhp
@@ -20,39 +20,43 @@
 
 <meta>
   <topic id="textshared0104150100xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Insert OLE Object</title>
+    <title id="tit">Insert OLE Object</title>
     <filename>/text/shared/01/04150100.xhp</filename>
   </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153116"><bookmark_value>OLE objects; inserting</bookmark_value>
+<bookmark branch="index" id="bm_id3153116"><bookmark_value>OLE objects; inserting</bookmark_value>
 <bookmark_value>inserting; OLE objects</bookmark_value>
 <bookmark_value>objects; inserting OLE objects</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/insertoleobject/InsertOLEObjectDialog" id="bm_id9083923" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/insertoleobject/@@nowidget@@" id="bm_id9083923" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertObject" id="bm_id3152952" localize="false"/>
-<h1 id="hd_id3153116">Insert OLE Object</h1>
-  <paragraph role="paragraph" id="par_id3149748" xml-lang="en-US"><variable id="ole"><ahelp hid=".">Inserts an <link href="text/shared/00/00000005.xhp#ole"><emph>OLE</emph></link> object into the current document. The OLE object is inserted as a link or an embedded object.</ahelp></variable></paragraph>
+<bookmark branch="hid/cui/ui/insertoleobject/InsertOLEObjectDialog" id="bm_id9083923" localize="false"/>
+<bookmark branch="hid/cui/ui/insertoleobject/@@nowidget@@" id="bm_id9083923" localize="false"/>
+<bookmark branch="hid/.uno:InsertObject" id="bm_id3152952" localize="false"/>
+
+<section id="ole">
+<h1 id="hd_id3153116"><link href="text/shared/01/04150100.xhp#insert ole object">Insert OLE Object</link></h1>
+<paragraph role="paragraph" id="par_id3149748"><ahelp hid=".">Inserts an <link href="text/shared/00/00000005.xhp#ole"><emph>OLE</emph></link> object into the current document. The OLE object is inserted as a link or an embedded object.</ahelp></paragraph>
+</section>
+
 <section id="howtoget">
   <embed href="text/shared/00/00000404.xhp#ole_object"/>
 </section>
 <note id="par_id3145314">You <emph>cannot</emph> use the clipboard or drag and drop to move OLE objects to other files.</note>
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US">Empty and inactive OLE objects are transparent.</paragraph>
+<paragraph role="paragraph" id="par_id3150693">Empty and inactive OLE objects are transparent.</paragraph>
 <h2 id="hd_id3149178">Create new</h2>
-  <paragraph role="paragraph" id="par_id3145345" xml-lang="en-US"><ahelp hid="cui/ui/insertoleobject/createnew">Creates a new OLE object based on the object type that you select.</ahelp></paragraph>
+  <paragraph role="paragraph" id="par_id3145345"><ahelp hid="cui/ui/insertoleobject/createnew">Creates a new OLE object based on the object type that you select.</ahelp></paragraph>
 <h2 id="hd_id3155535">Object type</h2>
-  <paragraph role="paragraph" id="par_id3109847" xml-lang="en-US"><ahelp hid="cui/ui/insertoleobject/types">Select the type of document that you want to create.</ahelp></paragraph>
+  <paragraph role="paragraph" id="par_id3109847"><ahelp hid="cui/ui/insertoleobject/types">Select the type of document that you want to create.</ahelp></paragraph>
 <h2 id="hd_id3163803">Create from file</h2>
-  <paragraph role="paragraph" id="par_id3149191" xml-lang="en-US"><ahelp hid="cui/ui/insertoleobject/createfromfile">Creates an OLE object from an existing file.</ahelp></paragraph>
+  <paragraph role="paragraph" id="par_id3149191"><ahelp hid="cui/ui/insertoleobject/createfromfile">Creates an OLE object from an existing file.</ahelp></paragraph>
 <h2 id="hd_id3150084">File</h2>
-  <paragraph role="paragraph" id="par_id3146773" xml-lang="en-US">Choose the file that you want to insert as an OLE object.</paragraph>
+  <paragraph role="paragraph" id="par_id3146773">Choose the file that you want to insert as an OLE object.</paragraph>
 <h3 id="hd_id3144438">File</h3>
-  <paragraph role="paragraph" id="par_id3155434" xml-lang="en-US"><ahelp hid="cui/ui/insertoleobject/urled">Enter the name of the file that you want to link or embed, or click <emph>Search</emph> to locate the file.</ahelp></paragraph>
+  <paragraph role="paragraph" id="par_id3155434"><ahelp hid="cui/ui/insertoleobject/urled">Enter the name of the file that you want to link or embed, or click <emph>Search</emph> to locate the file.</ahelp></paragraph>
 <h3 id="hd_id3153127">Search...</h3>
-  <paragraph role="paragraph" id="par_id3156326" xml-lang="en-US"><ahelp hid="cui/ui/insertoleobject/urlbtn">Locate the file that you want to insert, and then click <emph>Open</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/insertoleobject/linktofile" id="bm_id3152953" localize="false"/>
+  <paragraph role="paragraph" id="par_id3156326"><ahelp hid="cui/ui/insertoleobject/urlbtn">Locate the file that you want to insert, and then click <emph>Open</emph>.</ahelp></paragraph>
+<bookmark branch="hid/cui/ui/insertoleobject/linktofile" id="bm_id3152953" localize="false"/>
 <h3 id="hd_id4174321">Link to file</h3>
-  <paragraph role="paragraph" id="par_id6636555" xml-lang="en-US"><ahelp hid=".">Enable this checkbox to insert the OLE object as a link to the original file. If this checkbox is not enabled, the OLE object will be embedded into your document.</ahelp><comment>which consequences? cannot find featuremail or spec doc</comment></paragraph>
+  <paragraph role="paragraph" id="par_id6636555"><ahelp hid=".">Enable this checkbox to insert the OLE object as a link to the original file. If this checkbox is not enabled, the OLE object will be embedded into your document.</ahelp><comment>which consequences? cannot find featuremail or spec doc</comment></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/04160300.xhp b/source/text/shared/01/04160300.xhp
index 17bcd2939a..277580dcfc 100644
--- a/source/text/shared/01/04160300.xhp
+++ b/source/text/shared/01/04160300.xhp
@@ -20,7 +20,7 @@
 
 <meta>
   <topic id="textshared0104160300xml" indexer="include" status="PUBLISH">
-    <title id="tit" xml-lang="en-US">Formula</title>
+    <title id="tit">Formula</title>
     <filename>/text/shared/01/04160300.xhp</filename>
   </topic>
   <history>
@@ -28,23 +28,28 @@
   </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3152937"><bookmark_value>formulas; starting formula editor</bookmark_value>
+<bookmark branch="index" id="bm_id3152937">
+<bookmark_value>formulas; starting formula editor</bookmark_value>
 <bookmark_value>$[officename] Math start</bookmark_value>
 <bookmark_value>Math formula editor</bookmark_value>
 <bookmark_value>equations in formula editor</bookmark_value>
 <bookmark_value>editors;formula editor</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertMath" id="bm_id6753888" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertObjectStarMath" id="bm_id3154812" localize="false"/>
-<h1 id="hd_id3152937">Formula</h1>
-  <paragraph role="paragraph" id="par_id3149495" xml-lang="en-US"><variable id="starmath"><ahelp hid=".">Inserts a formula into the current document.</ahelp> <switchinline select="appl"><caseinline select="MATH"></caseinline><defaultinline>For more information open the <emph>$[officename] Math Help</emph>.</defaultinline></switchinline></variable></paragraph>
+<bookmark branch="hid/.uno:InsertMath" id="bm_id6753888" localize="false"/>
+<bookmark branch="hid/.uno:InsertObjectStarMath" id="bm_id3154812" localize="false"/>
+
+<section id="starmath">
+<h1 id="hd_id3152937"><link href="text/shared/01/04160300.xhp#formula object">Formula Object</link></h1>
+<paragraph role="paragraph" id="par_id3149495"><ahelp hid=".">Inserts a formula into the current document.</ahelp> <switchinline select="appl"><caseinline select="MATH"/><defaultinline>For more information open the <emph>$[officename] Math Help</emph>.</defaultinline></switchinline></paragraph>
+</section>
+
 <section id="howtoget">
   <embed href="text/shared/00/00000404.xhp#math"/>
 </section>
 <switch select="appl">
 <case select="MATH">
 <section id="relatedtopics">
-  <paragraph role="paragraph" id="par_id3154317" xml-lang="en-US"><link href="text/smath/main0000.xhp">Formulas</link></paragraph>
+  <paragraph role="paragraph" id="par_id3154317"><link href="text/smath/main0000.xhp">Formulas</link></paragraph>
 </section>
 </case>
 </switch>
diff --git a/source/text/shared/guide/qrcode.xhp b/source/text/shared/01/qrcode.xhp
index 1011109987..580e14e540 100644
--- a/source/text/shared/guide/qrcode.xhp
+++ b/source/text/shared/01/qrcode.xhp
@@ -12,7 +12,7 @@
     <meta>
         <topic id="qrcodetopic" indexer="include" status="PUBLISH">
             <title id="tit" xml-lang="en-US">QR and Barcode</title>
-            <filename>/text/shared/guide/qrcode.xhp</filename>
+            <filename>/text/shared/01/qrcode.xhp</filename>
         </topic>
     </meta>
     <body>
@@ -20,12 +20,13 @@
         <bookmark_value>QR code;barcode</bookmark_value>
     </bookmark>
     <section id="qrcodeh1">
-        <h1 id="hd_id461566315781439"><link href="text/shared/guide/qrcode.xhp">QR and Barcode</link></h1>
+        <h1 id="hd_id461566315781439"><link href="text/shared/01/qrcode.xhp">QR and Barcode</link></h1>
         <bookmark id="bm_id971566315781438" xml-lang="en-US" branch="hid/cui/ui/qrcodegen/QrCodeGenDialog" localize="false"/>
         <bookmark id="bm_id971566315781436" xml-lang="en-US" branch="hid/cui/ui/qrcodegen/@@nowidget@@" localize="false"/>
         <paragraph id="par_id381566315781439" role="paragraph" xml-lang="en-US">Generate linear and matrix codes for any text or URL.</paragraph>
     </section>
     <paragraph role="paragraph" id="par_id411566316109551">The QR and Barcode generation feature allows you to encode any text string or URL as a barcode or a QR code and insert it as a graphical object in a document for scanning.</paragraph>
+
     <section id="howtoget">
         <embed href="text/shared/00/00000404.xhp#qrcode"/>
     </section>