adapt macro help ids for .ui

3 files changed, 27 insertions, 28 deletions

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index d2b978fe63..6d80bab9c8 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -828,7 +828,6 @@ HID_BASICIDE_EDITORWINDOW,63563,
 HID_BASICIDE_LIBS,63545,
 HID_BASICIDE_LIBSDLG_TREE,63549,
 HID_BASICIDE_LIBS_TREE,63548,
-HID_BASICIDE_MACROS,63544,
 HID_BASICIDE_MANAGE_LANGUAGE,63571,
 HID_BASICIDE_MODULES_TREE,63547,
 HID_BASICIDE_MODULWINDOW,63561,
diff --git a/source/text/sbasic/shared/01/06130000.xhp b/source/text/sbasic/shared/01/06130000.xhp
index 8afbd7c069..2477cda49a 100644
--- a/source/text/sbasic/shared/01/06130000.xhp
+++ b/source/text/sbasic/shared/01/06130000.xhp
@@ -49,21 +49,21 @@
 <paragraph role="paragraph" id="par_id3152886" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="makro"><ahelp hid=".">Opens the <emph>Macro </emph>dialog, where you can create, edit, organize, and run $[officename] Basic macros.</ahelp>
 </variable></paragraph>
 <paragraph role="heading" id="hd_id3154145" xml-lang="en-US" level="2" l10n="U" oldref="3">Macro name</paragraph>
-<paragraph role="paragraph" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="BASCTL_EDIT_RID_MACROCHOOSER_RID_ED_MACRONAME">Displays the name of the selected macro. To create or to change the name of a macro, enter a name here.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="4"><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>
 <paragraph role="heading" id="hd_id3153729" xml-lang="en-US" level="2" l10n="U" oldref="7">Macro from / Save macro in</paragraph>
-<paragraph role="paragraph" id="par_id3153190" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_BASICIDE_LIBS">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>
+<paragraph role="paragraph" id="par_id3153190" xml-lang="en-US" l10n="U" oldref="8"><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>
 <paragraph role="heading" id="hd_id3146975" xml-lang="en-US" level="2" l10n="U" oldref="11">Run / Save</paragraph>
-<paragraph role="paragraph" id="par_id3154791" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_RUN">Runs or saves the current macro.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154791" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/run">Runs or saves the current macro.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3153158" xml-lang="en-US" level="2" l10n="U" oldref="15">Assign</paragraph>
-<paragraph role="paragraph" id="par_id3149961" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ASSIGN">Opens the Customize dialog, where you can assign the selected macro to a menu command, a toolbar, or an event.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149961" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/assign">Opens the Customize dialog, where you can assign the selected macro to a menu command, a toolbar, or an event.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3145799" xml-lang="en-US" level="2" l10n="U" oldref="17">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3147127" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid=".">Starts the $[officename] Basic editor and opens the selected macro for editing.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="2" l10n="U" oldref="19">New/Delete</paragraph>
-<paragraph role="paragraph" id="par_id3155602" xml-lang="en-US" l10n="CHG" oldref="61"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_DEL">Creates a new macro, or deletes the selected macro.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155602" xml-lang="en-US" l10n="CHG" oldref="61"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/delete">Creates a new macro, or deletes the selected macro.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149124" xml-lang="en-US" l10n="CHG" oldref="20">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_id3150749" xml-lang="en-US" l10n="U" oldref="21">To delete a macro, select it, and then click <emph>Delete</emph>.</paragraph>
 <paragraph role="heading" id="hd_id3153764" xml-lang="en-US" level="2" l10n="U" oldref="22">Organizer</paragraph>
-<paragraph role="paragraph" id="par_id3148405" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ORG">Opens the <emph>Macro Organizer</emph> dialog, where you can add, edit, or delete existing macro modules, dialogs, and libraries.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3148405" xml-lang="en-US" l10n="U" oldref="23"><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>
 <paragraph role="heading" id="hd_id3166447" xml-lang="en-US" level="3" l10n="U" oldref="29">Module/Dialog</paragraph>
 <paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_BASICIDE_MODULES_TREE">Lists the existing macros and dialogs.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149922" xml-lang="en-US" l10n="CHG" oldref="31">You can drag-and-drop a module or a dialog between libraries.</paragraph>
diff --git a/source/text/shared/01/06130000.xhp b/source/text/shared/01/06130000.xhp
index ed2efa8cc6..e6a3386028 100644
--- a/source/text/shared/01/06130000.xhp
+++ b/source/text/shared/01/06130000.xhp
@@ -39,7 +39,7 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:MacroDialog" id="bm_id870519" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:MacroDialog" id="bm_id3149948" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/BasicMacroDialog" id="bm_id3149948" localize="false"/>
 <paragraph role="heading" id="hd_id3157552" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Macro</paragraph>
 <paragraph role="paragraph" id="par_id3148765" xml-lang="en-US" l10n="CHG" oldref="2"><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>
@@ -47,41 +47,41 @@
 <embed href="text/shared/00/00000406.xhp#makro"/>
 </section>
 <embed href="text/shared/guide/macro_recording.xhp#macro_recording"/>
-<bookmark xml-lang="en-US" branch="hid/basctl:Edit:RID_MACROCHOOSER:RID_ED_MACRONAME" id="bm_id3155351" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/macronameedit" id="bm_id3155351" localize="false"/>
 <paragraph role="heading" id="par_id3154863" xml-lang="en-US" level="2" l10n="U" oldref="3">Macro name</paragraph>
-<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="BASCTL_EDIT_RID_MACROCHOOSER_RID_ED_MACRONAME">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/BASCTL_HID_BASICIDE_MACROS" id="bm_id3149283" localize="false"/>
+<paragraph role="paragraph" id="par_id3150040" xml-lang="en-US" l10n="U" oldref="4"><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" l10n="CHG" oldref="6"><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" l10n="NEW"><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/BASCTL_HID_BASICIDE_LIBS" id="bm_id3152867" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/libraries" id="bm_id3152867" localize="false"/>
 <paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="7">Macro from / Save macro in</paragraph>
-<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="HID_BASICIDE_LIBS">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>
-<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_RUN" id="bm_id3147577" localize="false"/>
+<paragraph role="paragraph" id="par_id3153394" xml-lang="en-US" l10n="U" oldref="8"><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>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/run" id="bm_id3147577" localize="false"/>
 <paragraph role="heading" id="hd_id3147373" xml-lang="en-US" level="2" l10n="U" oldref="11">Run / Save<comment>unfortunately both have the same Help ID</comment></paragraph>
-<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_RUN">Runs or saves the current macro.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_ASSIGN" id="bm_id3150694" localize="false"/>
+<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/run">Runs or saves the current macro.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/assign" id="bm_id3150694" localize="false"/>
 <paragraph role="heading" id="hd_id3149388" xml-lang="en-US" level="2" l10n="U" oldref="15">Assign</paragraph>
-<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ASSIGN">Opens the <link href="text/shared/01/06140000.xhp" name="Customize">Customize</link> dialog, where you can assign the selected macro to a menu command, a toolbar, or an event.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_EDIT" id="bm_id3147276" localize="false"/>
+<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="CHG" oldref="16"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/assign">Opens the <link href="text/shared/01/06140000.xhp" name="Customize">Customize</link> dialog, where you can assign the selected macro to a menu command, a toolbar, or an event.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/edit" id="bm_id3147276" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_TP_DLGS:RID_PB_EDIT" id="bm_id5118869" localize="false"/>
 <paragraph role="heading" id="hd_id3153662" xml-lang="en-US" level="2" l10n="U" oldref="17">Edit</paragraph>
-<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_EDIT">Starts the $[officename] Basic editor and opens the selected macro or dialog for editing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_DEL" id="bm_id3155390" localize="false"/>
+<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="CHG" oldref="18"><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"/>
 <paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="2" l10n="U" oldref="19">New / Delete</paragraph>
-<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="CHG" oldref="61"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_DEL">Creates a new macro, or deletes the selected macro.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153257" xml-lang="en-US" l10n="CHG" oldref="61"><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" l10n="CHG" oldref="20">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" l10n="U" oldref="21">To delete a macro, select it, and then click <emph>Delete</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWLIB" id="bm_id3152910" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/newlibrary" id="bm_id3152910" localize="false"/>
 <paragraph role="heading" id="hd_id3159342" xml-lang="en-US" level="2" l10n="U" oldref="64">New Library</paragraph>
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="65"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWLIB">Saves the recorded macro in a new library.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWMOD" id="bm_id3155262" localize="false"/>
+<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="65"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/newlibrary">Saves the recorded macro in a new library.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/BasicIDE/ui/basicmacrodialog/newmodule" id="bm_id3155262" localize="false"/>
 <paragraph role="heading" id="hd_id3154173" xml-lang="en-US" level="2" l10n="U" oldref="66">New Module</paragraph>
-<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_NEWMOD">Saves the recorded macro in a new module.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/basctl:PushButton:RID_MACROCHOOSER:RID_PB_ORG" id="bm_id3150118" localize="false"/>
+<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U" oldref="67"><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"/>
 <paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="2" l10n="U" oldref="22">Organizer</paragraph>
-<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ORG">Opens the <emph>Macro Organizer</emph> dialog, where you can add, edit, or delete existing macro modules, dialogs, and libraries.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="23"><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>
 <paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="3" l10n="CHG" oldref="24">Module/Dialog tab page</paragraph>
-<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="BASCTL_PUSHBUTTON_RID_MACROCHOOSER_RID_PB_ORG">Lets you manage modules or dialog boxes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="modules/BasicIDE/ui/basicmacrodialog/organiz">Lets you manage modules or dialog boxes.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/BASCTL_HID_BASICIDE_MODULES_TREE" id="bm_id3147304" localize="false"/>
 <paragraph role="heading" id="hd_id3148944" xml-lang="en-US" level="3" l10n="U" oldref="29">Module/Dialog</paragraph>
 <paragraph role="paragraph" id="par_id3145068" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_BASICIDE_MODULES_TREE">Lists the existing macros and dialogs.</ahelp></paragraph>