Mute L10N when <embedvar> is a singleton in text

+ some refactor

Change-Id: I071758f139a7f6e9ab91ca277a420c8283b1eae0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/178833
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit 9bbf0db1682b2cd6b749e0fbd9a72606277cafe5)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/178834
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

4 files changed, 10 insertions, 12 deletions

diff --git a/source/text/swriter/guide/contentcontrols.xhp b/source/text/swriter/guide/contentcontrols.xhp
index 8576c9228e..85554c998c 100644
--- a/source/text/swriter/guide/contentcontrols.xhp
+++ b/source/text/swriter/guide/contentcontrols.xhp
@@ -128,7 +128,7 @@
     </list>
 <list type="ordered" startwith="6">
     <listitem>
-        <paragraph id="par_id621672751395854"  role="listitem"><embedvar href="text/swriter/guide/contentcontrols.xhp#clickok" markup="ignore"/></paragraph>
+        <paragraph id="par_id621672751395854"  role="listitem" localize="false"><embedvar href="text/swriter/guide/contentcontrols.xhp#clickok" markup="ignore"/></paragraph>
     </listitem>
     <listitem>
         <paragraph id="par_id721672767925728"  role="listitem">To insert a content, click on the control to open the drop-down list, select one of the items displayed.</paragraph>
diff --git a/source/text/swriter/guide/footer_pagenumber.xhp b/source/text/swriter/guide/footer_pagenumber.xhp
index 9a262431a0..1612767b94 100644
--- a/source/text/swriter/guide/footer_pagenumber.xhp
+++ b/source/text/swriter/guide/footer_pagenumber.xhp
@@ -53,7 +53,7 @@
             <paragraph id="par_id3155554" role="listitem">Choose <emph>Insert - Field - Page Count</emph>.</paragraph>
          </listitem>
       </list>
-      <h2 id="hd_id331715628566984"><embedvar href="text/swriter/guide/title_page.xhp#usingtitlepage"/></h2>
+      <h2 id="hd_id331715628566984" localize="false"><embedvar href="text/swriter/guide/title_page.xhp#usingtitlepage"/></h2>
       <paragraph role="paragraph" id="par_id21715629004389">Title pages are a common way to create documents with different page numbering schemes.</paragraph>
 <section id="relatedtopics">
       <embed href="text/swriter/guide/header_footer.xhp#header_footer"/>
diff --git a/source/text/swriter/guide/registertrue.xhp b/source/text/swriter/guide/registertrue.xhp
index 0e494c80e4..70d9e3cdbe 100644
--- a/source/text/swriter/guide/registertrue.xhp
+++ b/source/text/swriter/guide/registertrue.xhp
@@ -63,8 +63,8 @@
           <paragraph xml-lang="en-US" id="par_idN1068C" role="listitem">Open the Styles window (<switchinline select="sys"><caseinline select="MAC"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline>), click the Paragraph Style you want to exempt, right-click that style, choose <emph>Modify</emph>. In the dialog, click the <link href="text/shared/01/05030100.xhp"><emph>Indents &amp; Spacing</emph></link> tab.</paragraph>
         </listitem>
         <listitem>
-          <paragraph id="par_id481604252645547" role="listitem"><embedvar href="text/swriter/guide/registertrue.xhp#exempt"/></paragraph>
-          <paragraph id="par_id911604252806932" role="listitem"><embedvar href="text/swriter/guide/registertrue.xhp#no-effect"/></paragraph>
+          <paragraph id="par_id481604252645547" role="listitem" localize="false"><embedvar href="text/swriter/guide/registertrue.xhp#exempt"/></paragraph>
+          <paragraph id="par_id911604252806932" role="listitem" localize="false"><embedvar href="text/swriter/guide/registertrue.xhp#no-effect"/></paragraph>
         </listitem>
       </list>
 </body>
diff --git a/source/text/swriter/guide/stylist_fillformat.xhp b/source/text/swriter/guide/stylist_fillformat.xhp
index 778d9aa1d0..9cec4815d3 100644
--- a/source/text/swriter/guide/stylist_fillformat.xhp
+++ b/source/text/swriter/guide/stylist_fillformat.xhp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,8 +18,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-	
+
+
 <meta>
       <topic id="textswriterguidestylist_fillformatxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Applying Styles in Fill Format Mode</title>
@@ -45,7 +45,7 @@
             <paragraph xml-lang="en-US" id="par_id3153128" role="listitem">Click the icon of the style category that you want to apply.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3145090" role="listitem">Click the style, and then click the <item type="menuitem">Fill Format Mode</item> icon 
+            <paragraph xml-lang="en-US" id="par_id3145090" role="listitem">Click the style, and then click the <item type="menuitem">Fill Format Mode</item> icon
 <image id="img_id3149644" src="cmd/sc_fillstyle.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3149644">Icon</alt>
 	</image> in the <item type="menuitem">Styles</item> window.</paragraph>
          </listitem>
@@ -57,13 +57,11 @@
          </listitem>
       </list>
       <section id="relatedtopics">
-         <paragraph xml-lang="en-US" id="par_id2227852" role="paragraph" localize="false">
-<embedvar href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/>
-</paragraph>
+         <paragraph xml-lang="en-US" id="par_id2227852" role="paragraph" localize="false"><embedvar href="text/shared/guide/paintbrush.xhp#formatpaintbrush"/></paragraph>
          <embed href="text/swriter/guide/templates_styles.xhp#templates_styles"/>
          <embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/>
          <embed href="text/swriter/guide/stylist_update.xhp#stylist_update"/>
          <paragraph xml-lang="en-US" id="par_id3159259" role="paragraph"><link href="text/swriter/01/05140000.xhp">Styles</link></paragraph>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>