fix some …</emph><emph>… cases

as closing formatting just to open it immediately again doesn't make
sense.
unfortunately "switchinline" is none of emph's allowed children, so the
individual cases need to have the formatting

Change-Id: I9071990f882086d6c280df1d3ab958a8f3ff3c61

10 files changed, 12 insertions, 18 deletions

diff --git a/source/text/scalc/guide/table_view.xhp b/source/text/scalc/guide/table_view.xhp
index bead53d812..49dc7b5773 100644
--- a/source/text/scalc/guide/table_view.xhp
+++ b/source/text/scalc/guide/table_view.xhp
@@ -49,7 +49,7 @@
 <paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="4">To hide grid lines:</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3153726" xml-lang="en-US" l10n="CHG" oldref="5">Under the menu item <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph><emph>,</emph> go to the <emph>View</emph> tab page. Unmark <emph>Grid lines</emph>. Confirm with <emph>OK</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153726" xml-lang="en-US" l10n="CHG" oldref="5">Under the menu item <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Calc</emph>, go to the <emph>View</emph> tab page. Unmark <emph>Grid lines</emph>. Confirm with <emph>OK</emph>.</paragraph>
 </listitem>
 </list>
 <section id="relatedtopics">
diff --git a/source/text/shared/00/00000406.xhp b/source/text/shared/00/00000406.xhp
index d803a72a5f..163f4aeb62 100644
--- a/source/text/shared/00/00000406.xhp
+++ b/source/text/shared/00/00000406.xhp
@@ -147,7 +147,7 @@
          <paragraph xml-lang="en-US" id="par_id3145112" role="paragraph" l10n="U" oldref="125">Path selection button in various wizards</paragraph>
          <paragraph xml-lang="en-US" id="par_id3153953" role="paragraph" l10n="U" oldref="126">Click <emph>Edit</emph> button for a few entries under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph></paragraph>
       </section>
-      <paragraph xml-lang="en-US" id="par_id3147295" role="paragraph" l10n="U" oldref="23"><variable id="optionen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>
+      <paragraph xml-lang="en-US" id="par_id3147295" role="paragraph" l10n="U" oldref="23"><variable id="optionen">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline>
 </variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id3156006" role="paragraph" l10n="U" oldref="24"><variable id="optionenallgemein">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename]</emph>
 </variable></paragraph>
diff --git a/source/text/shared/guide/aaa_start.xhp b/source/text/shared/guide/aaa_start.xhp
index e654f40262..f5f4cb3cf4 100644
--- a/source/text/shared/guide/aaa_start.xhp
+++ b/source/text/shared/guide/aaa_start.xhp
@@ -35,7 +35,7 @@
 </variable></paragraph>
 <paragraph role="heading" id="hd_id3156211" xml-lang="en-US" level="3" l10n="U" oldref="2">How to simplify your work using samples and templates</paragraph>
 <paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="3">
-<item type="productname">%PRODUCTNAME</item> includes many sample documents and ready-to-use templates. You can access these by choosing <emph>File - New - </emph><emph>Templates</emph>, or press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N.</paragraph>
+<item type="productname">%PRODUCTNAME</item> includes many sample documents and ready-to-use templates. You can access these by choosing <emph>File - New - Templates</emph>, or press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N.</paragraph>
 <paragraph role="paragraph" id="par_id3147291" xml-lang="en-US" l10n="U" oldref="4">When you open one of the templates, a new document is created based on this template.</paragraph>
 <paragraph role="paragraph" id="par_id0820200803563860" xml-lang="en-US" l10n="NEW">Click the <emph>Get more templates online</emph> link in the dialog to select and download more templates.</paragraph>
 <paragraph role="paragraph" id="par_id0820200803563974" xml-lang="en-US" l10n="NEW">You can also use the various wizards (under the <emph>File - Wizards</emph> menu) to create your own templates, which you can use as a basis for further documents.</paragraph>
diff --git a/source/text/shared/guide/language_select.xhp b/source/text/shared/guide/language_select.xhp
index 5699d7e24a..dd97f89a0a 100644
--- a/source/text/shared/guide/language_select.xhp
+++ b/source/text/shared/guide/language_select.xhp
@@ -55,7 +55,7 @@
       <paragraph xml-lang="en-US" id="hd_id3146121" role="heading" level="2" l10n="U" oldref="6">Selecting a language for the whole document</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3083443" role="listitem" l10n="U" oldref="7">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3083443" role="listitem" l10n="U" oldref="7">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="8">Under <emph>Default languages for documents</emph>, select the document language for all newly created documents. If you mark <emph>For the current document only</emph>, your choice will only apply to the current document. Close the dialog with <emph>OK</emph>.</paragraph>
diff --git a/source/text/shared/guide/measurement_units.xhp b/source/text/shared/guide/measurement_units.xhp
index 0cfd800c64..cfea6abcc5 100644
--- a/source/text/shared/guide/measurement_units.xhp
+++ b/source/text/shared/guide/measurement_units.xhp
@@ -46,7 +46,7 @@
 <paragraph role="listitem" id="par_idN10674" xml-lang="en-US" l10n="NEW">Open a document of the type for which you want to change the measurement units.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="3">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="3">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="4">In the left pane of the dialog, double-click the application for which you want to select the measurement unit.</paragraph>
diff --git a/source/text/shared/optionen/01090000.xhp b/source/text/shared/optionen/01090000.xhp
index 72c1a5d211..faca4e236b 100644
--- a/source/text/shared/optionen/01090000.xhp
+++ b/source/text/shared/optionen/01090000.xhp
@@ -34,7 +34,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:SmEditOptions" id="bm_id3155338" localize="false"/>
 <paragraph role="heading" id="hd_id3150040" xml-lang="en-US" level="1" l10n="U" oldref="1">%PRODUCTNAME Math Options</paragraph>
 <paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="druckentext"><ahelp hid=".uno:SmEditOptions">Defines the print format and print options for all new formula documents. These options apply when you print a formula directly from <item type="productname">%PRODUCTNAME</item> Math.</ahelp>
-</variable> You can also call the dialog by clicking the <emph>Options</emph> button in the <emph>Print</emph> dialog. The settings you define in the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph> dialog will be permanent settings, whereas the settings in the Print dialog are only valid for the current document.</paragraph>
+</variable> You can also call the dialog by clicking the <emph>Options</emph> button in the <emph>Print</emph> dialog. The settings you define in the <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline> dialog will be permanent settings, whereas the settings in the Print dialog are only valid for the current document.</paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#etsodr"/>
 </section>
diff --git a/source/text/swriter/guide/captions.xhp b/source/text/swriter/guide/captions.xhp
index 9414f743e5..0b4599d227 100644
--- a/source/text/swriter/guide/captions.xhp
+++ b/source/text/swriter/guide/captions.xhp
@@ -62,8 +62,7 @@
 </list>
 <paragraph id="par_id3147254" role="note" xml-lang="en-US">You can edit caption text directly in the document.</paragraph>
 <paragraph id="par_id3147271" role="paragraph" xml-lang="en-US">A caption is formatted with the paragraph style that matches the name of the caption category. For example, if you insert a "Table" caption, the "Table" paragraph style is applied to the caption text.</paragraph>
-<paragraph id="par_id3145671" role="tip" xml-lang="en-US">$[officename] can automatically add a caption when you insert an object, graphic, frame, or table. Choose <emph><switchinline select="sys"></emph><emph><caseinline select="MAC"></emph><emph>%PRODUCTNAME - Preferences</emph><emph>
-</caseinline></emph><emph><defaultinline></emph><emph>Tools - Options</emph><emph></defaultinline></emph><emph></switchinline></emph><emph> - %PRODUCTNAME Writer - AutoCaption</emph>.</paragraph>
+<paragraph id="par_id3145671" role="tip" xml-lang="en-US">$[officename] can automatically add a caption when you insert an object, graphic, frame, or table. Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - AutoCaption</emph>.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/swriter/guide/captions_numbers.xhp#captions_numbers"/>
 <embed href="text/swriter/guide/using_numbering.xhp#using_numbering"/>
diff --git a/source/text/swriter/guide/delete_from_dict.xhp b/source/text/swriter/guide/delete_from_dict.xhp
index c5f10adc59..df71cac2dd 100644
--- a/source/text/swriter/guide/delete_from_dict.xhp
+++ b/source/text/swriter/guide/delete_from_dict.xhp
@@ -38,8 +38,7 @@
 
 <list type="ordered">
   <listitem>
-    <paragraph id="par_id3153417" role="listitem" xml-lang="en-US">Choose <emph><switchinline select="sys"></emph><emph><caseinline select="MAC"></emph><emph>%PRODUCTNAME - Preferences</emph><emph>
-</caseinline></emph><emph><defaultinline></emph><emph>Tools - Options</emph><emph></defaultinline></emph><emph></switchinline></emph><emph> - Language Settings - Writing Aids</emph>.</paragraph>
+    <paragraph id="par_id3153417" role="listitem" xml-lang="en-US">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - Language Settings - Writing Aids</emph>.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id3151391" role="listitem" xml-lang="en-US">Select the user-defined dictionary that you want to edit in the <item type="menuitem">User-defined</item> list, and then click <item type="menuitem">Edit</item>.</paragraph>
diff --git a/source/text/swriter/guide/even_odd_sdw.xhp b/source/text/swriter/guide/even_odd_sdw.xhp
index 49013720ec..2250e86ecc 100644
--- a/source/text/swriter/guide/even_odd_sdw.xhp
+++ b/source/text/swriter/guide/even_odd_sdw.xhp
@@ -89,8 +89,7 @@
 
 <list type="ordered">
   <listitem>
-    <paragraph id="par_id7594225" role="paragraph" xml-lang="en-US">Choose <emph><switchinline select="sys"></emph><emph><caseinline select="MAC"></emph><emph>%PRODUCTNAME - Preferences</emph><emph>
-</caseinline></emph><emph><defaultinline></emph><emph>Tools - Options</emph><emph></defaultinline></emph><emph></switchinline></emph><emph> - %PRODUCTNAME Writer - </emph><emph>Print</emph>.</paragraph>
+    <paragraph id="par_id7594225" role="paragraph" xml-lang="en-US">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Print</emph>.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id8147221" role="paragraph" xml-lang="en-US">Remove the check mark from <emph>Print automatically inserted blank pages</emph>.</paragraph>
diff --git a/source/text/swriter/guide/table_sizing.xhp b/source/text/swriter/guide/table_sizing.xhp
index 5964e2f1c2..714d9ce497 100644
--- a/source/text/swriter/guide/table_sizing.xhp
+++ b/source/text/swriter/guide/table_sizing.xhp
@@ -76,14 +76,11 @@
 <paragraph id="par_id3153364" role="listitem" xml-lang="en-US">To increase the distance from the left edge of the page to the edge of the table, hold down <switchinline select="sys"><caseinline select="MAC">Option 
 </caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift, and then press the right arrow key.</paragraph>
 </listitem></list>
-<paragraph id="par_id3155891" role="note" xml-lang="en-US">You can specify the behavior for the arrow keys by choosing <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
-</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><emph>%PRODUCTNAME Writer - Table</emph>, and selecting the options that you want in the <emph>Keyboard handling</emph> area.</paragraph>
+<paragraph id="par_id3155891" role="note" xml-lang="en-US">You can specify the behavior for the arrow keys by choosing <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Table</emph>, and selecting the options that you want in the <emph>Keyboard handling</emph> area.</paragraph>
 <paragraph id="hd_id3149993" role="heading" xml-lang="en-US" level="3">To Change the Width of a Cell</paragraph>
-<paragraph id="par_id3148676" role="listitem" xml-lang="en-US">Hold down <switchinline select="sys"><caseinline select="MAC">Option+Command 
-</caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>, and then press the left or the right arrow key</paragraph>
+<paragraph id="par_id3148676" role="listitem" xml-lang="en-US">Hold down <switchinline select="sys"><caseinline select="MAC">Option+Command</caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>, and then press the left or the right arrow key</paragraph>
 <paragraph id="hd_id3153014" role="heading" xml-lang="en-US" level="2">Changing the Height of a Row</paragraph>
-<paragraph id="par_id3153035" role="listitem" xml-lang="en-US">To change the height of a row, place the cursor in a cell in the row, hold down the <switchinline select="sys"><caseinline select="MAC">Option 
-</caseinline><defaultinline>Alt</defaultinline></switchinline> key, and then press the up or the down arrow key.</paragraph>
+<paragraph id="par_id3153035" role="listitem" xml-lang="en-US">To change the height of a row, place the cursor in a cell in the row, hold down the <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> key, and then press the up or the down arrow key.</paragraph>
 <paragraph id="hd_id8478041" role="heading" xml-lang="en-US" level="2">Resizing a Whole Table</paragraph>
 <paragraph id="par_id3358867" role="paragraph" xml-lang="en-US">To change the width and height of a table, do one of the following:</paragraph>
 <list type="unordered">