tdf#127603 + refactor Basic/script dialogs Help pg

Split help pages into many, as 06130000.xhp was too dense to
properly manage

Basic selector dialogs are different from other script selector
dialogs.
Improve navigation between pages
Fix contents
Fix Help pages for current menu

Change-Id: I5c6195a80cc6860fa89a0e399be774247a81712a
Reviewed-on: https://gerrit.libreoffice.org/80988
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

9 files changed, 238 insertions, 123 deletions

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 0c76d1108b..c7da10afdd 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -302,8 +302,11 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
     helpcontent2/source/text/shared/01/06130000 \
     helpcontent2/source/text/shared/01/06130001 \
     helpcontent2/source/text/shared/01/06130010 \
+    helpcontent2/source/text/shared/01/06130020 \
+    helpcontent2/source/text/shared/01/06130030 \
     helpcontent2/source/text/shared/01/06130100 \
     helpcontent2/source/text/shared/01/06130200 \
+    helpcontent2/source/text/shared/01/06130300 \
     helpcontent2/source/text/shared/01/06130500 \
     helpcontent2/source/text/shared/01/06140000 \
     helpcontent2/source/text/shared/01/06140100 \
diff --git a/source/text/shared/00/00000406.xhp b/source/text/shared/00/00000406.xhp
index 0aa38939c2..e23a56ace8 100644
--- a/source/text/shared/00/00000406.xhp
+++ b/source/text/shared/00/00000406.xhp
@@ -77,6 +77,7 @@
       </section>
       <paragraph xml-lang="en-US" id="par_idN107E9" role="paragraph"><variable id="mediaplayer">Choose <emph>Tools - Media Player</emph>.</variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id3151385" role="paragraph"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+F11 (if not assigned by your system).</variable></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151386" role="paragraph"><variable id="selectmakro">Choose <emph>Tools - Macros - Run Macros</emph>.</variable></paragraph>
       <paragraph role="paragraph" id="par_id511543350796749" xml-lang="en-US"><variable id="beanshell">Choose <emph>Tools - Macros - Organize Macros - BeanShell</emph>.</variable></paragraph>
       <paragraph role="paragraph" id="par_id661543350803067" xml-lang="en-US"><variable id="javascript">Choose <emph>Tools - Macros - Organize Macros - JavaScript</emph>.</variable></paragraph>
       <paragraph role="paragraph" id="par_id441543350811395" xml-lang="en-US"><variable id="python">Choose <emph>Tools - Macros - Organize Macros - Python</emph>.</variable></paragraph>
@@ -84,6 +85,7 @@
          <paragraph xml-lang="en-US" id="par_id3149456" role="paragraph">Choose <emph>Tools - Macros - Record Macro</emph>.</paragraph>
       </section>
       <paragraph xml-lang="en-US" id="par_id3150398" role="paragraph"><variable id="passwort">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>,<br/>click the <emph>Organizer</emph> button,<br/>click the <emph>Libraries</emph> tab,<br/>and then click the <emph>Password</emph> button.</variable></paragraph>
+      <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>
diff --git a/source/text/shared/01/06130000.xhp b/source/text/shared/01/06130000.xhp
index a0f7861755..0f3d82a03f 100644
--- a/source/text/shared/01/06130000.xhp
+++ b/source/text/shared/01/06130000.xhp
@@ -22,7 +22,7 @@
 
 <meta>
 <topic id="textshared0106130000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Macro</title>
+<title id="tit" xml-lang="en-US">Basic Macros</title>
 <filename>/text/shared/01/06130000.xhp</filename>
 </topic>
 </meta>
@@ -30,7 +30,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:MacroDialog" id="bm_id870519" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/BasicMacroDialog" id="bm_id3149948" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/@@nowidget@@" id="bm_id3149948" localize="false"/>
-<h1 id="hd_id3157552">Macro</h1>
+<h1 id="hd_id3157552"><variable id="basicmacros"><link href="text/shared/01/06130000.xhp" name="%PRODUCTNAME Basic Macros">%PRODUCTNAME Basic Macros</link></variable></h1>
 <paragraph role="paragraph" id="par_id3148765" xml-lang="en-US"><variable id="makro"><ahelp hid=".uno:MacroDialog">Opens a dialog to organize macros.</ahelp>
 </variable><comment>UFI: it is not the dialog to run a macro</comment></paragraph>
 <section id="howtoget">
@@ -41,7 +41,6 @@
 <paragraph role="paragraph" id="par_id3150040" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/macronameedit">Displays the name of the selected macro. To create or to change the name of a macro, enter a name here.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/macros" id="bm_id3149283" localize="false"/>
 <paragraph role="paragraph" id="par_id3150902" xml-lang="en-US"><ahelp hid="." visibility="hidden">Lists the macros that are contained in the module selected in the <emph>Macro from </emph>list.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10642" xml-lang="en-US" localize="false"><comment>UFI: Important: do not add Help IDS for SELECTOR_COMMANDS and SELECTOR_CATEGORIES, because they are reused for Customize dialog and will lead to display errors there if assigned. See #i51556#</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/libraries" id="bm_id3152867" localize="false"/>
 <h2 id="hd_id3153750">Macro from / Save macro in</h2>
 <paragraph role="paragraph" id="par_id3153394" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/libraries">Lists the libraries and the modules where you can open or save your macros. To save a macro with a particular document, open the document, and then open this dialog.</ahelp></paragraph>
@@ -57,9 +56,10 @@
 <paragraph role="paragraph" id="par_id3150355" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/edit">Starts the $[officename] Basic editor and opens the selected macro or dialog for editing.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/delete" id="bm_id3155393" localize="false"/>
 <h2 id="hd_id3150772">New / Delete</h2>
-<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/delete">Creates a new macro, or deletes the selected macro.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3154514" xml-lang="en-US">To create a new macro, select the "Standard" module in the <emph>Macro from</emph> list, and then click <emph>New</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3148474" xml-lang="en-US">To delete a macro, select it, and then click <emph>Delete</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/delete">Creates a new macro, creates a new module or deletes the selected macro or selected module.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154514" xml-lang="en-US">To create a new macro in your document, select the "Standard" module in the <emph>Macro from</emph> list, and then click <widget>New</widget>.</paragraph>
+<paragraph role="paragraph" id="par_id51571312108555">To create a new module in a library of the <emph>My Macros</emph> container, select the proper library and press <widget>New</widget>. The $[officename] Basic editor opens.</paragraph>
+<paragraph role="paragraph" id="par_id3148474" xml-lang="en-US">To delete a macro or module, select it, and then click <widget>Delete</widget>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/newlibrary" id="bm_id3152910" localize="false"/>
 <h2 id="hd_id3159342">New Library</h2>
 <paragraph role="paragraph" id="par_id3154897" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/newlibrary">Saves the recorded macro in a new library.</ahelp></paragraph>
@@ -67,100 +67,8 @@
 <h2 id="hd_id3154173">New Module</h2>
 <paragraph role="paragraph" id="par_id3155628" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/newmodule">Saves the recorded macro in a new module.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/organize" id="bm_id3150118" localize="false"/>
-<h2 id="hd_id3153665">Organizer</h2>
+<h2 id="hd_id3153665"><link href="text/shared/01/06130300.xhp" name="organizer">Organizer</link></h2>
 <paragraph role="paragraph" id="par_id3147618" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/organize">Opens the <emph>Macro Organizer</emph> dialog, where you can add, edit, or delete existing macro modules, dialogs, and libraries.</ahelp></paragraph>
-<h3 id="hd_id3145609">Module/Dialog tab page</h3>
-<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/organize">Lets you manage modules or dialog boxes.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/modulepage/ModulePage" id="bm_id3147304" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/modulepage/@@nowidget@@" id="bm_id3147304" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/modulepage/library" id="bm_id3147304" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/dialogpage/DialogPage" id="bm_id3547305" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/dialogpage/@@nowidget@@" id="bm_id3547305" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/dialogpage/library" id="bm_id3147305" localize="false"/>
-<h3 id="hd_id3148944">Module/Dialog</h3>
-<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/modulepage/library">Lists the existing macros and dialogs.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/modulepage/edit" id="bm_id3153779" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/dialogpage/edit" id="bm_id3153780" localize="false"/>
-<h3 id="hd_id3150398">Edit</h3>
-<paragraph role="paragraph" id="par_id3150543" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/modulepage/edit">Opens the selected macro or dialog for editing.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#schliessen"/>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/modulepage/newmodule" id="bm_id3156080" localize="false"/>
-<h3 id="hd_id3151210">New<comment>UFI: i40875</comment></h3>
-<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/modulepage/newmodule">Opens the editor and creates a new module.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/dialogpage/newdialog" id="bm_id3150496" localize="false"/>
-<h3 id="hd_id3145173">New</h3>
-<paragraph role="paragraph" id="par_id3150767" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/dialogpage/newdialog">Opens the editor and creates a new dialog.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#loeschen"/>
-<h3 id="hd_id3151177">Libraries tab page</h3><comment>the three tab pages have no Help button, so no need to have three help pages</comment>
-<paragraph role="paragraph" id="par_id3156281" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/dialogpage/delete">Lets you manage the macro libraries for the current application and any open documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/LibPage" id="bm_id3150650" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/@@nowidget@@" id="bm_id3150650" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/location" id="bm_id3150650" localize="false"/>
-<h3 id="hd_id3144760">Location</h3>
-<paragraph role="paragraph" id="par_id3150290" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/libpage/location">Select the application or the document containing the macro libraries that you want to organize.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/library" id="bm_id3154910" localize="false"/>
-<h3 id="hd_id3159149">Library</h3>
-<paragraph role="paragraph" id="par_id3147500" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/libpage/library">Lists the existing macro libraries for the current application and any open documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/edit" id="bm_id3156212" localize="false"/>
-<h3 id="hd_id3157320">Edit</h3>
-<paragraph role="paragraph" id="par_id3150868" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/libpage/edit">Opens the $[officename] Basic editor so that you can modify the selected library.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#schliessen"/>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/password" id="bm_id3148561" localize="false"/>
-<h3 id="hd_id3153104">Password</h3>
-<paragraph role="paragraph" id="par_id3154299" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/libpage/password">Assigns or edits the <link href="text/shared/01/06130100.xhp" name="password">password</link> for the selected library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/new" id="bm_id3153056" localize="false"/>
-<h3 id="hd_id3147502">New</h3>
-<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/libpage/new">Creates a new library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/newlibdialog/NewLibDialog" id="bm_id3154985" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/newlibdialog/@@nowidget@@" id="bm_id3154985" localize="false"/>
-<h3 id="hd_id3153770">Name</h3>
-<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/newlibdialog/NewLibDialog">Enter a name for the new library or module.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/import" id="bm_id3153951" localize="false"/>
-<h3 id="hd_id3154693">Import<comment>changed in #i64102</comment></h3>
-<paragraph role="paragraph" id="par_id3147441" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/libpage/import">Locate that $[officename] Basic library that you want to add to the current list, and then click Open.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#loeschen"/>
-<h1 id="par_idN10A39"><variable id="script">Scripts</variable></h1>
-<section id="howtoget">
-    <embed href="text/shared/00/00000406.xhp#beanshell"/>
-    <embed href="text/shared/00/00000406.xhp#javascript"/>
-    <embed href="text/shared/00/00000406.xhp#python"/>
-</section>
-<h2 id="hd_id6963408">Export</h2>
-<paragraph role="paragraph" id="par_id8968169" xml-lang="en-US"><ahelp hid=".">Opens a dialog to export the selected library either as an extension or as a Basic library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/ScriptOrganizerDialog" id="bm_id7982421" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/@@nowidget@@" id="bm_id7982421" localize="false"/>
-<h2 id="par_idN109BE">Macros</h2>
-<paragraph role="paragraph" id="par_idN109C2" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/ScriptOrganizerDialog">Select a macro or script from <emph>My Macros</emph>, <emph>%PRODUCTNAME Macros</emph>, or an open document. To view the available macros or scripts, double-click an entry.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/run" id="bm_id8628498" localize="false"/>
-<h3 id="par_idN109CD">Run</h3>
-<paragraph role="paragraph" id="par_idN109D1" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/run">To run a script, select a script in the list, and then click Run.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/create" id="bm_id6405835" localize="false"/>
-<h3 id="par_idN109E8">Create</h3>
-<paragraph role="paragraph" id="par_idN109EC" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/create">Creates a new script.</ahelp> The default script editor opens after you enter a name for the script.</paragraph>
-<paragraph role="paragraph" id="par_idN10A04" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/newlibdialog/NewLibDialog">Enter a name for the script.</ahelp><comment>UFI: called from Create and from Rename</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/edit" id="bm_id1055330" localize="false"/>
-<h3 id="par_idN10A2F">Edit</h3>
-<paragraph role="paragraph" id="par_idN10A33" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/edit">Opens the default script editor for your operating system.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/rename" id="bm_id9843745.00000001" localize="false"/>
-<h3 id="par_idN10A4B">Rename</h3>
-<paragraph role="paragraph" id="par_idN10A4F" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/rename">Opens a dialog where you can change the name of the selected script.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/delete" id="bm_id4198736" localize="false"/>
-<h3 id="par_idN10A66">Delete</h3>
-<paragraph role="paragraph" id="par_idN10A6A" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/delete">Prompts you to delete the selected script.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10AE5" xml-lang="en-US">The Macro Selector dialog contains two list boxes, namely the Library list box and the Macro name list box.</paragraph>
-<h3 id="par_idN10AFC">Library</h3>
-<paragraph role="paragraph" id="par_idN10B00" xml-lang="en-US">Select a macro or script from <emph>My Macros</emph>, <emph>%PRODUCTNAME Macros</emph>, or an open document. To view the contents of a library, double-click an entry in the list.</paragraph>
-<h3 id="par_idN10B17">Macro name</h3>
-<paragraph role="paragraph" id="par_idN10B1B" xml-lang="en-US">Click a script, and then click a command button.</paragraph>
-<h1 id="par_id381543352048115" xml-lang="en-US">Python</h1>
-<section id="howtoget">
-    <embed href="text/shared/00/00000406.xhp#python"/>
-</section>
-<h2 id="par_idN109as">Python Macros</h2>
-<paragraph role="paragraph" id="par_idN134C2" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/ScriptOrganizerDialog">Select a macro or script from <emph>My Macros</emph>, <emph>%PRODUCTNAME Macros</emph>, or an open document.</ahelp></paragraph>
-<h3 id="par_id641543351777423">Run</h3>
-<paragraph role="paragraph" id="par_id31543351781865" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/run">To run a script, select a script in the list, and then click Run.</ahelp></paragraph>
-
 <section id="relatedtopics">
 <embed href="text/shared/guide/scripting.xhp#scripting"/>
 <embed href="text/shared/guide/macro_recording.xhp#macro_recording"/>
diff --git a/source/text/shared/01/06130001.xhp b/source/text/shared/01/06130001.xhp
index 53992b82f5..140bae2a6d 100644
--- a/source/text/shared/01/06130001.xhp
+++ b/source/text/shared/01/06130001.xhp
@@ -18,7 +18,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0106130001xml" indexer="include" status="PUBLISH">
@@ -31,19 +31,20 @@
 </meta>
 <body>
 <section id="macro">
-<paragraph role="heading" id="hd_id3152414" xml-lang="en-US" level="1"><link href="text/shared/01/06130001.xhp" name="Macros">Macros</link></paragraph>
+<h1 id="hd_id3152414"><link href="text/shared/01/06130001.xhp" name="Macros">Macros</link></h1>
 <paragraph role="paragraph" id="par_id3150008" xml-lang="en-US">Lets you record or organize and edit macros.</paragraph>
 </section>
 <embed href="text/shared/01/06130010.xhp#recordmacro"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:RunMacro" id="bm_id4431927" localize="false"/>
-<paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="2"><link href="text/shared/01/06130000.xhp">Run Macro</link></paragraph>
-<paragraph role="paragraph" id="par_idN105EB" xml-lang="en-US"><ahelp hid=".">Opens a dialog where you can start a macro.</ahelp></paragraph>
+<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>
 <embed href="text/shared/01/06130200.xhp#organizemacros"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:MacroSignature" id="bm_id9232221" localize="false"/>
-<paragraph role="heading" id="par_idN10608" xml-lang="en-US" level="2"><link href="text/shared/01/digitalsignatures.xhp">Digital Signature</link></paragraph>
+<h2 id="par_idN10608"><link href="text/shared/01/digitalsignatures.xhp">Digital Signature</link></h2>
 <paragraph role="paragraph" id="par_idN10618" xml-lang="en-US"><ahelp hid=".">Adds and removes digital signatures to and from your macros. You can also use the dialog to view certificates.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:MacroOrganizer?TabId:short=1" id="bm_id9360942" localize="false"/>
-<paragraph role="heading" id="par_idN105D3" xml-lang="en-US" level="2"><link href="text/shared/01/06130000.xhp">Organize Dialogs</link></paragraph>
+<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"/>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/06130020.xhp b/source/text/shared/01/06130020.xhp
new file mode 100644
index 0000000000..6622f60e0e
--- /dev/null
+++ b/source/text/shared/01/06130020.xhp
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+    <!--
+    * This file is part of the LibreOffice project.
+    *
+    * This Source Code Form is subject to the terms of the Mozilla Public
+    * License, v. 2.0. If a copy of the MPL was not distributed with this
+    * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    *
+    -->
+
+    <meta>
+        <topic id="macroselectordialog" indexer="include" status="PUBLISH">
+            <title id="tit" xml-lang="en-US">Basic Macro Selector</title>
+            <filename>/text/shared/01/06130020.xhp</filename>
+        </topic>
+    </meta>
+    <body>
+    <bookmark xml-lang="en-US" branch="index" id="bm_id711571329266663">
+        <bookmark_value>macro;select macro to run</bookmark_value>
+        <bookmark_value>run macro;select</bookmark_value>
+    </bookmark>
+        <bookmark id="bm_id321571264310510" xml-lang="en-US" branch="hid/.uno:RunMacro" localize="false"/>
+        <bookmark xml-lang="en-US" branch="hid/cui/ui/macroselectordialog/MacroSelectorDialog" id="bm_id3083278" localize="false"/>
+        <bookmark xml-lang="en-US" branch="hid/cui/ui/macroselectordialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/>
+        <section id="macroselectorsec">
+        <h1 id="hd_id131571264310511"><variable id="macroselectorh1"><link href="text/shared/01/06130020.xhp" name="macro selector">Basic Macro selector</link></variable></h1>
+        <paragraph id="par_id761571264310511" role="paragraph" xml-lang="en-US">Selects the Basic macro to run. Locate the macro by selecting the container, library, module and macro name.</paragraph>
+    </section>
+    <section id="howtoget">
+        <embed href="text/shared/00/00000406.xhp#selectmakro"/>
+    </section>
+    <bookmark xml-lang="en-US" branch="hid/cui/ui/macroselectordialog/categories" id="bm_id3084278" localize="false"/>
+    <h2 id="hd_id3159149">Library</h2>
+    <paragraph role="paragraph" id="par_id3147500" xml-lang="en-US">Lists the existing macro containers, Basic macro libraries and Basic modules for the current application and any open documents.</paragraph>
+    <bookmark xml-lang="en-US" branch="hid/cui/ui/macroselectordialog/commands" id="bm_id3085278" localize="false"/>
+    <h2 id="par_idN10B17">Macro name</h2>
+    <paragraph role="paragraph" id="par_idN10B1B" xml-lang="en-US">Lists the Basic macros for the selected module. Select a macro and press <widget>Run</widget>.</paragraph>
+    <bookmark xml-lang="en-US" branch="hid/cui/ui/macroselectordialog/description" id="bm_id308678" localize="false"/>
+    <h2 id="hd_id841571267025475">Description</h2>
+    <section id="relatedtopics">
+        <embed href="text/shared/01/06130000.xhp#basicmacros"/>
+    </section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/01/06130030.xhp b/source/text/shared/01/06130030.xhp
new file mode 100644
index 0000000000..32eda867fd
--- /dev/null
+++ b/source/text/shared/01/06130030.xhp
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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="textshared0106130030xml" indexer="include">
+<title id="tit" xml-lang="en-US">Scripts</title>
+<filename>/text/shared/01/06130030.xhp</filename>
+</topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id401571328832739">
+    <bookmark_value>javascript scripts;run</bookmark_value>
+    <bookmark_value>beanshell scripts;run</bookmark_value>
+    <bookmark_value>java scripts;run</bookmark_value>
+    <bookmark_value>run scripts;java</bookmark_value>
+    <bookmark_value>run scripts;javascript</bookmark_value>
+    <bookmark_value>run scripts;beanshell</bookmark_value>
+</bookmark>
+<h1 id="par_idN10A39"><variable id="script">Scripts</variable></h1>
+<section id="howtoget">
+    <embed href="text/shared/00/00000406.xhp#javascript"/>
+    <embed href="text/shared/00/00000406.xhp#beanshell"/>
+</section>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/ScriptOrganizerDialog" id="bm_id7982421" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/@@nowidget@@" id="bm_id7982421" localize="false"/>
+<h2 id="par_idN109BE">Macros</h2>
+<paragraph role="paragraph" id="par_idN109C2" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/ScriptOrganizerDialog">Select a macro or script from <emph>My Macros</emph>, <emph>%PRODUCTNAME Macros</emph>, or an open document. To view the available macros or scripts, double-click an entry.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/run" id="bm_id8628498" localize="false"/>
+<h3 id="par_idN109CD">Run</h3>
+<paragraph role="paragraph" id="par_idN109D1" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/run">To run a script, select a script in the list, and then click <emph>Run</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/create" id="bm_id6405835" localize="false"/>
+<h3 id="par_idN109E8">Create</h3>
+<paragraph role="paragraph" id="par_idN109EC" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/create">Creates a new script.</ahelp> The default script editor opens after you enter a name for the script.</paragraph>
+<paragraph role="paragraph" id="par_idN10A04" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/newlibdialog/NewLibDialog">Enter a name for the script.</ahelp><comment>UFI: called from Create and from Rename</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/edit" id="bm_id1055330" localize="false"/>
+<h3 id="par_idN10A2F">Edit</h3>
+<paragraph role="paragraph" id="par_idN10A33" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/edit">Opens the default script editor for your operating system.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/rename" id="bm_id9843745.00000001" localize="false"/>
+<h3 id="par_idN10A4B">Rename</h3>
+<paragraph role="paragraph" id="par_idN10A4F" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/rename">Opens a dialog where you can change the name of the selected script.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/scriptorganizer/delete" id="bm_id4198736" localize="false"/>
+<h3 id="par_idN10A66">Delete</h3>
+<paragraph role="paragraph" id="par_idN10A6A" xml-lang="en-US"><ahelp hid="cui/ui/scriptorganizer/delete">Prompts you to delete the selected script.</ahelp></paragraph>
+<section id="relatedtopics">
+<embed href="text/shared/guide/scripting.xhp#scripting"/>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/01/06130200.xhp b/source/text/shared/01/06130200.xhp
index bda3b643ed..0cffc18274 100644
--- a/source/text/shared/01/06130200.xhp
+++ b/source/text/shared/01/06130200.xhp
@@ -31,33 +31,29 @@
 </meta>
 <body>
 <section id="organizemacros">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3237403"><bookmark_value>macros;organizing</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3237403">
+<bookmark_value>macros;organizing</bookmark_value>
 <bookmark_value>organizing;macros and scripts</bookmark_value>
 <bookmark_value>script organization</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:ScriptOrganizer" id="bm_id542008" localize="false"/>
-<paragraph role="heading" id="par_idN1054B" xml-lang="en-US" level="1"><variable id="organize_macros"><link href="text/shared/01/06130200.xhp">Organize Macros</link>
-</variable></paragraph>
+<h1 id="par_idN1054B"><variable id="organize_macros"><link href="text/shared/01/06130200.xhp">Organize Macros</link></variable></h1>
 <paragraph role="paragraph" id="par_idN105B7" xml-lang="en-US"><ahelp hid=".">Opens a submenu with links to dialogs where you can organize macros and scripts.</ahelp></paragraph>
 </section>
-<paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="2"><link href="text/shared/01/06130000.xhp">%PRODUCTNAME Basic</link></paragraph>
+<h2 id="par_idN1057F"><link href="text/shared/01/06130000.xhp">%PRODUCTNAME Basic</link></h2>
 <paragraph role="paragraph" id="par_idN105C3" xml-lang="en-US"><ahelp hid=".">Opens a dialog where you can organize %PRODUCTNAME Basic macros.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:ScriptOrganizer?ScriptOrganizer.Language:string=JavaScript" id="bm_id1124912" localize="false"/>
-<paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2"><link href="text/shared/01/06130000.xhp#script">JavaScript</link></paragraph>
+<h2 id="par_idN105AA"><link href="text/shared/01/06130030.xhp">JavaScript</link></h2>
 <paragraph role="paragraph" id="par_idN105BA" xml-lang="en-US"><ahelp hid=".">Opens a dialog where you can organize Javascript scripts.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10622" xml-lang="en-US" localize="false">
-	<embedvar href="text/shared/guide/scripting.xhp#scripting"/>
-</paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:ScriptOrganizer?ScriptOrganizer.Language:string=BeanShell" id="bm_id1355632" localize="false"/>
-<paragraph role="heading" id="par_idN10597" xml-lang="en-US" level="2"><link href="text/shared/01/06130000.xhp#script">BeanShell</link></paragraph>
+<h2 id="par_idN10597"><link href="text/shared/01/06130030.xhp">BeanShell</link></h2>
 <paragraph role="paragraph" id="par_idN105A7" xml-lang="en-US"><ahelp hid=".">Opens a dialog where you can organize Java scripts.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN105FB" xml-lang="en-US" localize="false">
-	<embedvar href="text/shared/guide/scripting.xhp#scripting"/>
-</paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:ScriptOrganizer?ScriptOrganizer.Language:string=Python" id="bm_id1345632" localize="false"/>
 <h2 id="hd_id601564144861483"><link href="text/sbasic/python/main0000.xhp#script">Python</link></h2>
-<paragraph role="paragraph" id="par_id171564144873585"><ahelp hid=".">Opens a dialog where you can organize Python scripts.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id171564146941721"><embedvar href="text/shared/guide/scripting.xhp#scripting"/></paragraph>
-<paragraph role="paragraph" id="par_id191564146071396" localize="false"><embedvar href="text/sbasic/python/main0000.xhp#pythonscriptshelp"/></paragraph>
+<paragraph role="paragraph" id="par_id171564144873585"><ahelp hid=".">Opens a dialog where you can run Python scripts.</ahelp></paragraph>
+<section id="relatedtopics">
+    <paragraph role="paragraph" id="par_id171564146941721" localize="false"><embedvar href="text/shared/guide/scripting.xhp#scripting"/></paragraph>
+    <paragraph role="paragraph" id="par_id191564146071396" localize="false"><embedvar href="text/sbasic/python/main0000.xhp#pythonscriptshelp"/></paragraph>
+</section>
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/06130300.xhp b/source/text/shared/01/06130300.xhp
new file mode 100644
index 0000000000..afd8c8e5f2
--- /dev/null
+++ b/source/text/shared/01/06130300.xhp
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<helpdocument version="1.0">
+
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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="basicorganizer" indexer="include">
+<title id="tit" xml-lang="en-US">Basic Organizer</title>
+<filename>/text/shared/01/06130300.xhp</filename>
+</topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id31571329093046">
+    <bookmark_value>Basic macros;organize in libraries</bookmark_value>
+    <bookmark_value>Basic modules;organize in libraries</bookmark_value>
+    <bookmark_value>Basic dialogs;organize in libraries</bookmark_value>
+</bookmark>
+<h1 id="par_idN10A39"><variable id="BasicOrganizer">%PRODUCTNAME Basic Library Organizer</variable></h1>
+<paragraph role="paragraph" id="par_id111571327198482">The dialog let you organize %PRODUCTNAME modules and dialogs into libraries. You can also import and export Basic libraries into files or extensions.</paragraph>
+<section id="howtoget">
+    <embed href="text/shared/00/00000406.xhp#liborganizer"/>
+</section>
+<h2 id="hd_id3145609">Module and Dialog tab pages</h2>
+<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/organize">Lets you manage modules or dialog boxes.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/modulepage/ModulePage" id="bm_id3147304" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/modulepage/@@nowidget@@" id="bm_id3147304" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/modulepage/library" id="bm_id3147304" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/dialogpage/DialogPage" id="bm_id3547305" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/dialogpage/@@nowidget@@" id="bm_id3547305" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/dialogpage/library" id="bm_id3147305" localize="false"/>
+<h3 id="hd_id3148944">Module or Dialog</h3>
+<paragraph role="paragraph" id="par_id3145068" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/modulepage/library">Lists the existing modules or dialogs.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/modulepage/edit" id="bm_id3153779" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/dialogpage/edit" id="bm_id3153780" localize="false"/>
+<h3 id="hd_id3150398">Edit</h3>
+<paragraph role="paragraph" id="par_id3150543" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/modulepage/edit">Opens the selected module or dialog for editing.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/modulepage/newmodule" id="bm_id3156080" localize="false"/>
+<h3 id="hd_id3151210">New (module)<comment>UFI: i40875</comment></h3>
+<paragraph role="paragraph" id="par_id3149291" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/modulepage/newmodule">Opens the editor and creates a new module.</ahelp></paragraph>
+<h3 id="hd_id3145173">New (dialog)</h3>
+<paragraph role="paragraph" id="par_id3150767" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/dialogpage/newdialog">Opens the editor and creates a new dialog.</ahelp></paragraph>
+<h2 id="hd_id3151177">Libraries tab page</h2><comment>the three tab pages have no Help button, so no need to have three help pages</comment>
+<paragraph role="paragraph" id="par_id3156281" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/dialogpage/delete">Lets you manage the macro libraries for the current application and any open documents.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/LibPage" id="bm_id3150650" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/@@nowidget@@" id="bm_id3150650" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/location" id="bm_id3150650" localize="false"/>
+<h3 id="hd_id3144760">Location</h3>
+<paragraph role="paragraph" id="par_id3150290" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/libpage/location">Select the application or the document containing the macro libraries that you want to organize.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/library" id="bm_id3154910" localize="false"/>
+<h3 id="hd_id3159149">Library</h3>
+<paragraph role="paragraph" id="par_id3147500" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/libpage/library">Lists the existing macro libraries for the current application and any open documents.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/edit" id="bm_id3156212" localize="false"/>
+<h3 id="hd_id3157320">Edit</h3>
+<paragraph role="paragraph" id="par_id3150868" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/libpage/edit">Opens the $[officename] Basic editor so that you can modify the selected library.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/password" id="bm_id3148561" localize="false"/>
+<h3 id="hd_id3153104">Password</h3>
+<paragraph role="paragraph" id="par_id3154299" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/libpage/password">Assigns or edits the <link href="text/shared/01/06130100.xhp" name="password">password</link> for the selected library.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/new" id="bm_id3153056" localize="false"/>
+<h3 id="hd_id3147502">New</h3>
+<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/libpage/new">Creates a new library.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/newlibdialog/NewLibDialog" id="bm_id3154985" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/newlibdialog/@@nowidget@@" id="bm_id3154985" localize="false"/>
+<h3 id="hd_id3153770">Name</h3>
+<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/newlibdialog/NewLibDialog">Enter a name for the new library or module.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/libpage/import" id="bm_id3153951" localize="false"/>
+<h3 id="hd_id3154693">Import<comment>changed in #i64102</comment></h3>
+<paragraph role="paragraph" id="par_id3147441" xml-lang="en-US"><ahelp hid="modules/BasicIDE/ui/libpage/import">Locate that $[officename] Basic library that you want to add to the current list, and then click Open.</ahelp></paragraph>
+<h3 id="hd_id6963408">Export</h3>
+<paragraph role="paragraph" id="par_id8968169" xml-lang="en-US"><ahelp hid=".">Opens a dialog to export the selected library either as an extension or as a Basic library.</ahelp></paragraph>
+<embed href="text/shared/00/00000001.xhp#loeschen"/>
+<embed href="text/shared/00/00000001.xhp#schliessen"/>
+<section id="relatedtopics">
+    <paragraph role="paragraph" localize="false" id="par_id311571318044460"><embedvar href="text/sbasic/shared/01030400.xhp#01030400" markup="ignore"/></paragraph>
+</section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/01/06150000.xhp b/source/text/shared/01/06150000.xhp
index 6af3727e31..24cad9d5ba 100644
--- a/source/text/shared/01/06150000.xhp
+++ b/source/text/shared/01/06150000.xhp
@@ -28,15 +28,15 @@
 </topic>
 </meta>
 <body>
-<section id="xmlfilter">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3153272"><bookmark_value>filters; XML filter settings</bookmark_value>
 <bookmark_value>XML filters; settings</bookmark_value>
 </bookmark><comment>mw deleted "XSLT based filters;"</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:OpenXMLFilterSettings" id="bm_id1477589" localize="false"/>
 <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"/>
-<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 Settings</link></paragraph>
-<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 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>
+<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"/>