tdf#134377 Refactoring built-in file dialogs

Following use cases are covered:
File - Save A Copy
File - Export

Change-Id: Id32418e944dc968cbd16100083cb2b9835084fd5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/143576
Tested-by: Jenkins
Reviewed-by: Alain Romedenne <alain.romedenne@libreoffice.org>

3 files changed, 52 insertions, 13 deletions

diff --git a/source/text/shared/01/01060002.xhp b/source/text/shared/01/01060002.xhp
index deac0208d8..e562f09264 100644
--- a/source/text/shared/01/01060002.xhp
+++ b/source/text/shared/01/01060002.xhp
@@ -28,10 +28,31 @@
   <paragraph role="paragraph" id="par_id701513472080716" xml-lang="en-US">Choose <item type="menuitem">File - Save a Copy</item>.</paragraph>
 </section>
 <paragraph role="paragraph" id="par_id881513473450156" xml-lang="en-US">Creates another file with same contents of the current file. The current file is kept open for editing.</paragraph>
+
+<embed href="text/shared/01/01020000.xhp#fpUserPreferences"/>
+<embed href="text/shared/01/01020000.xhp#fpFolderSelection"/>
+
+<h2 id="hd_id3147209">File name</h2>
+  <embed href="text/shared/01/01070000.xhp#filename"/>
+
+<h2 id="hd_id3152996">File type</h2>
+  <embed href="text/shared/01/01070000.xhp#filetype"/>
+
+<h2 id="hd_id3145744" xml-lang="en-US">Save with password</h2>
+  <embed href="text/shared/01/01070000.xhp#password"/>
+
+<embed href="text/shared/01/01070001.xhp#fpAutoFileExt"/>
+<embed href="text/shared/01/01070001.xhp#fpEncryptGPG"/>
+<embed href="text/shared/01/01070001.xhp#fpFilterSettings"/>
+
+<h2 id="hd_id3148539">Save</h2>
+  <embed href="text/shared/01/01070000.xhp#save"/>
+
 <section id="relatedtopics">
   <paragraph role="paragraph" id="par_id21513472326060" xml-lang="en-US"><link href="text/shared/01/01060000.xhp" name="Save">Save</link></paragraph>
   <paragraph role="paragraph" id="par_id411513472333495" xml-lang="en-US"><link href="text/shared/01/01070000.xhp" name="Save As">Save as</link></paragraph>
   <paragraph role="paragraph" id="par_id681513472341081" xml-lang="en-US"><link href="text/shared/01/01070001.xhp" name="Export">Export</link></paragraph>
 </section>
+
 </body>
 </helpdocument>
diff --git a/source/text/shared/01/01070000.xhp b/source/text/shared/01/01070000.xhp
index 0f084ce1b6..31bf6aa909 100644
--- a/source/text/shared/01/01070000.xhp
+++ b/source/text/shared/01/01070000.xhp
@@ -50,6 +50,7 @@
 <bookmark branch="hid/SVT_HID_FILESAVE_FILETYPE" id="bm_id3148552" localize="false"/>
 <bookmark branch="hid/SW_HID_SEND_MASTER_CTRL_LISTBOX_FILTER" id="bm_id3153527" localize="false"/>
 <bookmark branch="hid/SW_HID_SEND_HTML_CTRL_LISTBOX_FILTER" id="bm_id3149491" localize="false"/>
+
 <h2 id="hd_id3149669" xml-lang="en-US">File type</h2>
 <section id="filetype">
 <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>
@@ -70,27 +71,34 @@
 <paragraph role="note" id="par_id3152920" xml-lang="en-US">Only documents using the <item type="productname">%PRODUCTNAME</item> XML-based format can be saved with a password.</paragraph>
 </section>
 
+<section id="fpAutoFileExt">
 <h2 id="hd_id161669393492018" xml-lang="en-US">Automatic file name extension</h2>
 <paragraph role="paragraph" id="par_id651669393564026" xml-lang="en-US">Enforces the Open Document Format (ODF) when checked.</paragraph>
+</section>
 
+<section id="fpEncryptGPG">
 <h2 id="hd_id41543592332834" xml-lang="en-US">Encrypt with GPG key</h2>
 <paragraph role="paragraph" id="par_id71543592343227" xml-lang="en-US">Use OpenPGP public keys to encrypt documents.</paragraph>
+</section>
 
 <bookmark branch="hid/SVT_HID_FILESAVE_CUSTOMIZEFILTER" id="bm_id3147300" localize="false"/>
-<switch select="appl">
-<case select="CALC">
-<h2 id="hd_id3147502" xml-lang="en-US">Edit filter settings</h2>
-<paragraph role="paragraph" id="par_id3152883" xml-lang="en-US"><ahelp hid="HID_FILESAVE_CUSTOMIZEFILTER">Allows you to set the spreadsheet saving options for some types of data files.</ahelp>
-<comment>UFI: had to change text and remove Calc switch because switch did not work correctly</comment></paragraph>
-</case>
-</switch>
+<section id="fpFilterSettings">
+ <switch select="appl">
+  <case select="CALC">
+  <h2 id="hd_id3147502" xml-lang="en-US">Edit filter settings</h2>
+  <paragraph role="paragraph" id="par_id3152883" xml-lang="en-US"><ahelp hid="HID_FILESAVE_CUSTOMIZEFILTER">Allows you to set the spreadsheet saving options for some types of data files.</ahelp></paragraph>
+  </case>
+ </switch>
+</section>
 
 <bookmark branch="hid/SVT_HID_FILESAVE_SELECTION" id="bm_id3150012" localize="false"/>
+<section id="fpSelection">
 <h2 id="hd_id3154988" xml-lang="en-US">Selection</h2>
 <paragraph role="paragraph" id="par_id3159125" xml-lang="en-US"><ahelp hid="HID_FILESAVE_SELECTION">Exports only the selected graphic objects in <item type="productname">%PRODUCTNAME</item> Draw and Impress to another format. If this box is not checked, the entire document is exported.</ahelp></paragraph>
 <paragraph role="note" id="par_id3148577" xml-lang="en-US">If you are exporting to any document file type, the entire document is exported.</paragraph>
-<h2 id="hd_id3147228" xml-lang="en-US">Save</h2>
+</section>
 
+<h2 id="hd_id3147228" xml-lang="en-US">Save</h2>
 <section id="save">
 <paragraph role="paragraph" id="par_id3154068" xml-lang="en-US"><ahelp hid=".">Saves the file.</ahelp></paragraph>
 </section>
diff --git a/source/text/shared/01/01070001.xhp b/source/text/shared/01/01070001.xhp
index 2064b7d47d..47d6924c68 100644
--- a/source/text/shared/01/01070001.xhp
+++ b/source/text/shared/01/01070001.xhp
@@ -38,13 +38,23 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#export"/>
 </section>
-<tip id="par_id91561565107419">Unlike <emph>Save As</emph>, the <emph>Export</emph> command writes a copy of the current document in a new file with the chosen format, but keeps the current document and format open in your session.</tip>
+<tip id="par_id91561565107419">Unlike <menuitem>Save As</menuitem>, the <menuitem>Export</menuitem> command writes a copy of the current document in a new file with the chosen format, but keeps the current document and format open in your session.</tip>
 <paragraph role="paragraph" id="par_id471561565422027">The Export command opens the system file picker, where you can enter the name and format of the exported file.</paragraph>
-<h2 id="hd_id3147209">File Name</h2>
-<paragraph role="paragraph" id="par_id871561565412738">Enter a file name or a path for the file.</paragraph>
-<h2 id="hd_id3152996">File Type</h2>
+
+<embed href="text/shared/01/01020000.xhp#fpUserPreferences"/>
+<embed href="text/shared/01/01020000.xhp#fpFolderSelection"/>
+
+<h2 id="hd_id3147209">File name</h2>
+  <embed href="text/shared/01/01070000.xhp#filename"/>
+
+<h2 id="hd_id3152996">File format</h2>
   <embed href="text/shared/01/01070000.xhp#filetype"/>
-<h2 id="hd_id3148539">Save</h2>
+
+<embed href="text/shared/01/01070001.xhp#fpAutoFileExt"/>
+<embed href="text/shared/01/01070001.xhp#fpSelection"/>
+
+<h2 id="hd_id3148539">Export</h2>
   <embed href="text/shared/01/01070000.xhp#save"/>
+
 </body>
 </helpdocument>