tdf#130886 update Tools - Macro menu help page

- add Edit Macro command heading (and embed description from sbasic)
- update name of XML Filter to XML Filter Settings
- update access command to XML Filter Settings (and use <menuitem>)
- added "Related Topics" and link to "Basic Editor"

- update XML Filters Setting help page
- move "About XML Filters" to Related Topics
- remove double presentation about optional filters
- add sys-switch for note about installing optional filters

Change-Id: Idefbe7ec56e410a8bc9f0b44077f9f07ce9df25c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/89441
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Jenkins

3 files changed, 15 insertions, 10 deletions

diff --git a/source/text/shared/00/00000406.xhp b/source/text/shared/00/00000406.xhp
index 13891fd10f..a1872611d8 100644
--- a/source/text/shared/00/00000406.xhp
+++ b/source/text/shared/00/00000406.xhp
@@ -87,9 +87,9 @@
     <paragraph xml-lang="en-US" id="par_id3150498" role="paragraph"><variable id="liborganizer">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>,<br/>click the <widget>Organizer</widget> button.</variable></paragraph>
     <paragraph xml-lang="en-US" id="par_idN10843" role="paragraph"><variable id="packagemanager">Choose <emph>Tools - Extension Manager</emph>.</variable></paragraph>
     <paragraph xml-lang="en-US" id="par_id9988402" role="paragraph"><variable id="packagemanager_eu">Choose <emph>Tools - Extension Manager</emph>, click <emph>Check for Updates</emph> button.</variable></paragraph>
-    <paragraph xml-lang="en-US" id="par_id3151106" role="paragraph"><variable id="xmlfilter">Choose <emph>Tools - XML Filter Settings</emph>.</variable></paragraph>
-    <paragraph xml-lang="en-US" id="par_id3153778" role="paragraph"><variable id="xmlfilteredit">Choose <emph>Tools - XML Filter Settings</emph>, then click <emph>New</emph> or <emph>Edit</emph>.</variable></paragraph>
-    <paragraph xml-lang="en-US" id="par_id3148979" role="paragraph"><variable id="xmlfiltertest">Choose <emph>Tools - XML Filter Settings</emph>, then click <emph>Test XSLTs</emph>.</variable></paragraph>
+    <paragraph xml-lang="en-US" id="par_id3151106" role="paragraph"><variable id="xmlfilter">Choose <menuitem>Tools - Macros - XML Filter Settings</menuitem>.</variable></paragraph>
+    <paragraph xml-lang="en-US" id="par_id3153778" role="paragraph"><variable id="xmlfilteredit"><menuitem>Tools - Macros - XML Filter Settings</menuitem>, then click <emph>New</emph> or <emph>Edit</emph>.</variable></paragraph>
+    <paragraph xml-lang="en-US" id="par_id3148979" role="paragraph"><variable id="xmlfiltertest"><menuitem>Tools - Macros - XML Filter Settings</menuitem>, then click <emph>Test XSLTs</emph>.</variable></paragraph>
     <paragraph xml-lang="en-US" id="par_id3148672" role="paragraph"><variable id="anpassen">Choose <emph>Tools - Customize</emph>.</variable></paragraph>
     <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph"><variable id="menue">Choose <emph>Tools - Customize - Menus</emph> tab.</variable></paragraph>
     <paragraph xml-lang="en-US" id="par_idN108E9" role="paragraph"><variable id="menuenew">Choose <menuitem>Tools - Customize - Menus</menuitem> tab, click the gear  <image id="img_id3148386" src="cmd/lc_config.svg" width="0.2228in" height="0.2228in"><alt id="alt_id3148386" xml-lang="en-US">Icon gear menu</alt></image> dropdown menu and choose <menuitem>Add</menuitem>.</variable></paragraph>
diff --git a/source/text/shared/01/06130001.xhp b/source/text/shared/01/06130001.xhp
index 140bae2a6d..ec0c5df61f 100644
--- a/source/text/shared/01/06130001.xhp
+++ b/source/text/shared/01/06130001.xhp
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -38,6 +37,8 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:RunMacro" id="bm_id4431927" localize="false"/>
 <h2 id="par_idN105B1"><link href="text/shared/01/06130020.xhp">Run Macro</link></h2>
 <paragraph role="paragraph" id="par_idN105EB" xml-lang="en-US"><ahelp hid=".">Opens the Macro Selector dialog where you can start a macro.</ahelp></paragraph>
+<h2 id="hd_id821582666527674">Edit Macros</h2>
+<embed href="text/sbasic/shared/01/06130000.xhp#makro"/>
 <embed href="text/shared/01/06130200.xhp#organizemacros"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:MacroSignature" id="bm_id9232221" localize="false"/>
 <h2 id="par_idN10608"><link href="text/shared/01/digitalsignatures.xhp">Digital Signature</link></h2>
@@ -46,5 +47,8 @@
 <h2 id="par_idN105D3"><link href="text/shared/01/06130300.xhp">Organize Dialogs</link></h2>
 <paragraph role="paragraph" id="par_idN105E3" xml-lang="en-US"><ahelp hid=".">Opens the Dialogs tab page of the Macro Organizer.</ahelp></paragraph>
 <embed href="text/shared/01/06150000.xhp#xmlfilter"/>
+<section id="relatedtopics">
+<embed href="text/sbasic/shared/01030200.xhp"/>
+</section>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/06150000.xhp b/source/text/shared/01/06150000.xhp
index 24cad9d5ba..06e6fc5740 100644
--- a/source/text/shared/01/06150000.xhp
+++ b/source/text/shared/01/06150000.xhp
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <helpdocument version="1.0">
 
 <!--
@@ -20,7 +19,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-
 <meta>
 <topic id="textshared0106150000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">XML Filter Settings</title>
@@ -35,14 +33,18 @@
 <bookmark xml-lang="en-US" branch="hid/filter/ui/xmlfiltersettings/XMLFilterSettingsDialog" id="bm_id3149964" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/filter/ui/xmlfiltersettings/@@nowidget@@" id="bm_id3149964" localize="false"/>
 <section id="xmlfilter">
-<paragraph role="heading" id="hd_id3153272" xml-lang="en-US" level="1"><link href="text/shared/01/06150000.xhp" name="XML Filter Settings">XML Filter</link></paragraph>
+<h1 id="hd_id3153272" xml-lang="en-US"><link href="text/shared/01/06150000.xhp" name="XML Filter Settings">XML Filter Settings</link></h1>
 <paragraph role="paragraph" id="par_id3152937" xml-lang="en-US"><ahelp hid=".uno:OpenXMLFilterSettings">Opens the <emph>XML Filter Settings</emph> dialog, where you can create, edit, delete, and test filters to import and to export XML files.</ahelp></paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#xmlfilter"/>
 </section>
-<embed href="text/shared/guide/xsltfilter.xhp#xsltfilter"/>
+<switch select="sys">
+<case select="MAC"></case><comment>MAC does not have installation options</comment>
+<default>
 <paragraph role="note" id="par_idN10646" xml-lang="en-US">Some filters are only available as optional components during the %PRODUCTNAME installation. To install an optional filter, run the %PRODUCTNAME Setup application, select "Modify", and then select the filter that you want in the list of modules.</paragraph>
+</default>
+</switch>
 <paragraph role="paragraph" id="par_id3154794" xml-lang="en-US">The term <emph>XML filter</emph> is used in the following as a shortcut for the more exact description as an <emph>XSLT based filter</emph>.</paragraph>
 <table id="tbl_id3151097">
 <tablerow>
@@ -78,12 +80,10 @@
 </tablecell>
 </tablerow>
 </table>
-
 <paragraph role="note" id="par_idN106E7" xml-lang="en-US">The XHTML export filter produces valid "XHTML 1.0 Strict" output for Writer, Calc, Draw, and Impress documents.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/filter/ui/xmlfiltersettings/filterlist" id="bm_id3166460" localize="false"/>
 <paragraph role="heading" id="hd_id3145382" xml-lang="en-US" level="2">Filter list</paragraph>
 <paragraph role="paragraph" id="par_id3147209" xml-lang="en-US"><ahelp hid="filter/ui/xmlfiltersettings/filterlist">Select one or more filters, then click one of the buttons.</ahelp></paragraph>
-<paragraph role="note" id="par_idN10711" xml-lang="en-US">Some filters are only available as optional components during the %PRODUCTNAME installation. To install an optional filter, run the %PRODUCTNAME Setup application, select "Modify", and then select the filter that you want in the list of modules.</paragraph>
 <paragraph role="paragraph" id="par_id3153032" xml-lang="en-US">The lists shows the name and the type of the installed filters.</paragraph>
 <list type="ordered">
 <listitem>
@@ -123,6 +123,7 @@
 <paragraph role="heading" id="hd_id3152772" xml-lang="en-US" level="2">Close</paragraph>
 <paragraph role="paragraph" id="par_id3159086" xml-lang="en-US"><ahelp hid="filter/ui/xmlfiltersettings/close">Closes the dialog.</ahelp></paragraph>
 <section id="relatedtopics">
+<embed href="text/shared/guide/xsltfilter.xhp#xsltfilter"/>
 <embed href="text/shared/00/00000021.xhp#xmlformat"/>
 </section>
 </body>