Fix ahelps and bookmarks on the Save As page

Also move/fix HIDs from the Create Master Document / HTML document
pages, as these functions define custom HIDs for the
generic Save as dialog.
With the above set towards deprecation, this is not utterly useful,
but still.

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

3 files changed, 34 insertions, 25 deletions

diff --git a/source/text/shared/01/01070000.xhp b/source/text/shared/01/01070000.xhp
index 087887502c..16a2a7e75f 100644
--- a/source/text/shared/01/01070000.xhp
+++ b/source/text/shared/01/01070000.xhp
@@ -65,24 +65,36 @@
 <paragraph role="heading" id="hd_id3155627" xml-lang="en-US" level="2">Places area</paragraph>
 <paragraph role="paragraph" id="par_id3149901" xml-lang="en-US"><ahelp hid=".">Displays "favourite" places, i.e. shortcuts to local or remote locations.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_FILEVIEW" id="bm_id3149514" localize="false"/><paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="2">Display area</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_FILEVIEW" id="bm_id3149514" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW" id="bm_id3154673" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_CONTROL_FILEVIEW" id="bm_id3151311" localize="false"/>
+<paragraph role="heading" id="hd_id3155628" xml-lang="en-US" level="2">Display area</paragraph>
 <section id="fileview">
-<paragraph role="paragraph" id="par_id3149902" xml-lang="en-US"><ahelp hid="HID_FILESAVE_FILEVIEW">Displays the files and folders in the folder that you are in.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149902" xml-lang="en-US"><ahelp hid=".">Displays the files and folders in the folder that you are in.</ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_FILEURL" id="bm_id3155179" localize="false"/><paragraph role="heading" id="hd_id3154810" xml-lang="en-US" level="2">File name</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_FILEURL" id="bm_id3155179" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_MASTER_CTRL_EDIT_FILEURL" id="bm_id3154751" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_EDIT_FILEURL" id="bm_id3154470" localize="false"/>
+<paragraph role="heading" id="hd_id3154810" xml-lang="en-US" level="2">File name</paragraph>
 <section id="filename">
-<paragraph role="paragraph" id="par_id3153626" xml-lang="en-US"><ahelp hid="HID_FILESAVE_FILEURL">Enter a file name or a path for the file. You can also enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link></ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153626" xml-lang="en-US"><ahelp hid=".">Enter a file name or a path for the file. You can also enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link></ahelp></paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_FILETYPE" id="bm_id3148552" localize="false"/><paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="2">File type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_FILETYPE" id="bm_id3148552" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_MASTER_CTRL_LISTBOX_FILTER" id="bm_id3153527" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_LISTBOX_FILTER" id="bm_id3149491" localize="false"/>
+<paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="2">File type</paragraph>
 <section id="filetype">
-<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US"><ahelp hid="HID_FILESAVE_FILETYPE">Select the file format for the document that you are saving.</ahelp> In the display area, only the documents with this file type are displayed. File types are described in <link href="text/shared/00/00000020.xhp" name="Information on Import and Export Filters">Information on Import and Export Filters</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US"><ahelp hid=".">Select the file format for the document that you are saving.</ahelp> In the display area, only the documents with this file type are displayed. File types are described in <link href="text/shared/00/00000020.xhp" name="Information on Import and Export Filters">Information on Import and Export Filters</link>.</paragraph>
 </section>
 <embed href="text/shared/01/ref_pdf_export.xhp#ref_pdf_export"/>
 <embed href="text/shared/00/00000021.xhp#xmlformat"/>
 <paragraph role="warning" id="par_id3145116" xml-lang="en-US">Always save your document in a <item type="productname">%PRODUCTNAME</item> file type before saving it to an external file type. When you export to an external file type, some formatting features may be lost.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_DOSAVE" id="bm_id3149170" localize="false"/><paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="2">Save</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_DOSAVE" id="bm_id3149170" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_OK" id="bm_id3150693" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_PUSHBUTTON_OK" id="bm_id3149099" localize="false"/>
+<paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="2">Save</paragraph>
 <section id="save">
-<paragraph role="paragraph" id="par_id3154068" xml-lang="en-US"><ahelp hid="HID_FILESAVE_DOSAVE">Saves the file.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154068" xml-lang="en-US"><ahelp hid=".">Saves the file.</ahelp></paragraph>
 </section>
 <bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_SAVEWITHPASSWORD" id="bm_id3156282" localize="false"/><paragraph role="heading" id="hd_id3145744" xml-lang="en-US" level="2">Save with password</paragraph>
 <section id="kennwort">
diff --git a/source/text/shared/01/01160300.xhp b/source/text/shared/01/01160300.xhp
index b064c25150..0ad901d51b 100644
--- a/source/text/shared/01/01160300.xhp
+++ b/source/text/shared/01/01160300.xhp
@@ -28,33 +28,29 @@
 <body>
 
 <bookmark xml-lang="en-US" branch="hid/.uno:NewGlobalDoc" id="bm_id7444055" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:NewGlobalDoc" id="bm_id9144566" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL" id="bm_id9144566" localize="false"/>
 
 <paragraph id="hd_id3152790" role="heading" level="1" xml-lang="en-US">Create Master Document</paragraph>
-<paragraph id="par_id3148668" role="paragraph" xml-lang="en-US"><variable id="globtext"><ahelp hid="HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL">Creates a master document from the current Writer document. A new sub-document is created at each occurrence of a chosen paragraph style or outline level in the source document.</ahelp></variable></paragraph>
+<paragraph id="par_id3148668" role="paragraph" xml-lang="en-US"><variable id="globtext"><ahelp hid=".">Creates a master document from the current Writer document. A new sub-document is created at each occurrence of a chosen paragraph style or outline level in the source document.</ahelp></variable></paragraph>
 
 <section id="howtoget">
 <embed href="text/shared/00/00000401.xhp#glo"/>
 </section>
 <paragraph id="par_id3149999" role="paragraph" xml-lang="en-US">The <link href="text/shared/01/02110000.xhp" name="Navigator"><emph>Navigator</emph></link> appears after you create a master document. To edit a sub-document, double-click the name of a sub-document in the <emph>Navigator</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW" id="bm_id3154673" localize="false"/>
 
 <paragraph id="hd_id3152924" role="heading" level="2" xml-lang="en-US">Display area</paragraph>
 <embed href="text/shared/01/01070000.xhp#fileview"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_MASTER_CTRL_EDIT_FILEURL" id="bm_id3154751" localize="false"/>
 
 <paragraph id="hd_id3152425" role="heading" level="2" xml-lang="en-US">File name</paragraph>
 <embed href="text/shared/01/01070000.xhp#filename"/>
+
 <bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE" id="bm_id3155392" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SVT_HID_FILESAVE_TEMPLATE" id="bm_id3145072" localize="false"/>
-
 <paragraph id="hd_id3147291" role="heading" level="2" xml-lang="en-US">separated by</paragraph>
-<paragraph id="par_id3156426" role="paragraph" xml-lang="en-US"><ahelp hid="HID_FILESAVE_TEMPLATE">Select the paragraph style or outline level that you want to use to separate the source document into sub-documents.</ahelp> By default a new document is created for every chapter level 1.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_MASTER_CTRL_LISTBOX_FILTER" id="bm_id3153527" localize="false"/>
+<paragraph id="par_id3156426" role="paragraph" xml-lang="en-US"><ahelp hid=".">Select the paragraph style or outline level that you want to use to separate the source document into sub-documents.</ahelp> By default a new document is created for every chapter level 1.</paragraph>
 
 <paragraph id="hd_id3153311" role="heading" level="2" xml-lang="en-US">File type</paragraph>
 <embed href="text/shared/01/01070000.xhp#filetype"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_OK" id="bm_id3150693" localize="false"/>
 
 <paragraph id="hd_id3145313" role="heading" level="2" xml-lang="en-US">Save</paragraph>
 <embed href="text/shared/01/01070000.xhp#save"/><comment>removed autoextension</comment>
diff --git a/source/text/swriter/01/01160500.xhp b/source/text/swriter/01/01160500.xhp
index e5fc4d590a..e8a0f30733 100644
--- a/source/text/swriter/01/01160500.xhp
+++ b/source/text/swriter/01/01160500.xhp
@@ -30,23 +30,24 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL" id="bm_id3150499" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION" id="bm_id3151262" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:NewHtmlDoc" id="bm_id8703681" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:NewHtmlDoc" id="bm_id3150760" localize="false"/><paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="1">Name and Path of HTML Documents</paragraph>
-<paragraph role="paragraph" id="par_id3151175" xml-lang="en-US"><variable id="htmltext"><ahelp hid=".uno:NewHtmlDoc">Saves the file as an HTML document, so that you can view it in a web browser. You can choose to create a separate page when a heading style that you specify is encountered in the document.</ahelp> If you choose this option, a separate page of links to all of the pages that are generated is also created. 
+<paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="1">Name and Path of HTML Documents</paragraph>
+<paragraph role="paragraph" id="par_id3151175" xml-lang="en-US"><variable id="htmltext"><ahelp hid=".">Saves the file as an HTML document, so that you can view it in a web browser. You can choose to create a separate page when a heading style that you specify is encountered in the document.</ahelp> If you choose this option, a separate page of links to all of the pages that are generated is also created. 
 </variable></paragraph>
 <section id="howtoget">
   <embed href="text/swriter/00/00000401.xhp#html"/>
 </section>
 <paragraph role="paragraph" id="par_id3149801" xml-lang="en-US">Consecutive numbers are added to the file name if more than one HTML document is created. The titles of the HTML pages are created from the topmost chapter heading.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_CONTROL_FILEVIEW" id="bm_id3151311" localize="false"/><paragraph role="heading" id="hd_id3154568" xml-lang="en-US" level="2">Display area</paragraph>
+<paragraph role="heading" id="hd_id3154568" xml-lang="en-US" level="2">Display area</paragraph>
 <embed href="text/shared/01/01070000.xhp#fileview"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_EDIT_FILEURL" id="bm_id3154470" localize="false"/><paragraph role="heading" id="hd_id3153668" xml-lang="en-US" level="2">File name</paragraph>
+<paragraph role="heading" id="hd_id3153668" xml-lang="en-US" level="2">File name</paragraph>
 <embed href="text/shared/01/01070000.xhp#filename"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE" id="bm_id3155903" localize="false"/><paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="2">Current Style</paragraph>
-<paragraph role="paragraph" id="par_id3149688" xml-lang="en-US"><ahelp hid="HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE">Select the heading paragraph style that you want to use to indicate a new HTML page.</ahelp> To use this option, apply one of the heading paragraph styles to the paragraphs where you want to start a new page in the document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_LISTBOX_FILTER" id="bm_id3149491" localize="false"/><paragraph role="heading" id="hd_id3155187" xml-lang="en-US" level="2">File type</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE" id="bm_id3155903" localize="false"/><paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="2">separated by</paragraph>
+<paragraph role="paragraph" id="par_id3149688" xml-lang="en-US"><ahelp hid=".">Select the heading paragraph style that you want to use to indicate a new HTML page.</ahelp> To use this option, apply one of the heading paragraph styles to the paragraphs where you want to start a new page in the document.</paragraph>
+<paragraph role="heading" id="hd_id3155187" xml-lang="en-US" level="2">File type</paragraph>
 <embed href="text/shared/01/01070000.xhp#filetype"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_PUSHBUTTON_OK" id="bm_id3149099" localize="false"/><paragraph role="heading" id="hd_id3143277" xml-lang="en-US" level="2">Save</paragraph>
+<paragraph role="heading" id="hd_id3143277" xml-lang="en-US" level="2">Save</paragraph>
 <embed href="text/shared/01/01070000.xhp#save"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION" id="bm_id3151262" localize="false"/></body>
+</body>
 </helpdocument>