tdf#149221 More fixes to the Database Wizard dialog

This patch create necessary HIDs for the Database Wizard dialog. It also creates a new help page named Connection Settings to serve as target for the widgets in dbwizconnectionpage.ui.

Change-Id: I9b518ff65729bd8f24c9b0f6960ccd8015b66b80
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/142441
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

4 files changed, 69 insertions, 4 deletions

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index b715812eec..1ab70ab906 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -62,6 +62,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
     helpcontent2/source/text/sdatabase/dabawiz02 \
     helpcontent2/source/text/sdatabase/dabawiz02access \
     helpcontent2/source/text/sdatabase/dabawiz02ado \
+    helpcontent2/source/text/sdatabase/dabawiz02connection \
     helpcontent2/source/text/sdatabase/dabawiz02dbase \
     helpcontent2/source/text/sdatabase/dabawiz02jdbc \
     helpcontent2/source/text/sdatabase/dabawiz02mysql \
diff --git a/source/text/sdatabase/dabawiz00.xhp b/source/text/sdatabase/dabawiz00.xhp
index 7c8fb92d5c..b8b001787f 100644
--- a/source/text/sdatabase/dabawiz00.xhp
+++ b/source/text/sdatabase/dabawiz00.xhp
@@ -49,7 +49,9 @@
 <paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US">If you create a new database file, the wizard contains two steps.</paragraph>
 <embed href="text/sdatabase/dabawiz01.xhp#dabaselection"/>
 <embed href="text/sdatabase/dabawiz02.xhp#nextsteps"/>
-<paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US">If you open the Database Wizard to create a database file for an existing database connection, there may be more steps to specify paths, authentication information, and more.</paragraph>
+<embed href="text/sdatabase/dabawiz02connection.xhp#conn_settings"/>
+<section id="connection_types">
+<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US"><link href="text/sdatabase/dabawiz02odbc.xhp">ODBC settings</link></paragraph>
 <paragraph role="paragraph" id="par_idN105F2" xml-lang="en-US"><link href="text/sdatabase/dabawiz02text.xhp">Set up text file connection</link></paragraph>
 <switch select="sys">
 <case select="WIN">
@@ -60,11 +62,12 @@
 <paragraph role="paragraph" id="par_idN1070F" xml-lang="en-US"><link href="text/sdatabase/dabawiz02dbase.xhp">Set up dBASE connection</link></paragraph>
 <paragraph role="paragraph" id="par_idN1063D" xml-lang="en-US"><link href="text/sdatabase/dabawiz02jdbc.xhp">Set up JDBC connection</link></paragraph>
 <paragraph role="paragraph" id="par_idN1064C" xml-lang="en-US"><link href="text/sdatabase/dabawiz02oracle.xhp">Set up Oracle database connection</link></paragraph>
-<embed href="text/sdatabase/dabawiz02mysql.xhp#mysql"/>
-<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US"><link href="text/sdatabase/dabawiz02odbc.xhp">ODBC settings</link></paragraph>
+<paragraph role="paragraph" id="par_idN1064F" xml-lang="en-US"><link href="text/sdatabase/dabawiz02mysql.xhp">Set up MariaDB and MySQL connection</link></paragraph>
 <paragraph role="paragraph" id="par_idN10679" xml-lang="en-US"><link href="text/sdatabase/dabawiz02spreadsheet.xhp">Set up Spreadsheet connection</link></paragraph>
-<embed href="text/shared/00/00000001.xhp#cancel"/>
+</section>
 <embed href="text/shared/00/00000001.xhp#back"/>
 <embed href="text/shared/00/00000001.xhp#next"/>
+<embed href="text/shared/00/00000001.xhp#finish"/>
+<embed href="text/shared/00/00000001.xhp#cancel"/>
 </body>
 </helpdocument>
diff --git a/source/text/sdatabase/dabawiz02connection.xhp b/source/text/sdatabase/dabawiz02connection.xhp
new file mode 100644
index 0000000000..27adf45ed9
--- /dev/null
+++ b/source/text/sdatabase/dabawiz02connection.xhp
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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 .
+ -->
+<helpdocument version="1.0">
+  <meta>
+    <topic id="dabawiz_connection" indexer="include" status="PUBLISH">
+      <title id="tit" xml-lang="en-US">Connection settings</title>
+      <filename>/text/sdatabase/dabawiz02connection.xhp</filename>
+    </topic>
+  </meta>
+<body>
+
+<section id="conn_settings">
+  <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizconnectionpage/@@nowidget@@" id="bm_id9310284" localize="false"/>
+  <bookmark xml-lang="en-US" branch="index" id="bm_id161668004416786">
+    <bookmark_value>databases;connection settings</bookmark_value>
+  </bookmark>
+  <h1 id="par_idN10544"><link href="text/sdatabase/dabawiz02connection.xhp">Connection settings</link></h1>
+  <paragraph role="paragraph" id="par_idN10554" xml-lang="en-US"><ahelp hid=".">Defines the connection settings to an existing database.</ahelp></paragraph>
+</section>
+
+  <note id="par_id561668004674782">The options in this dialog will vary depending on the databse driver selected in the <menuitem>Select database</menuitem> pane of the <menuitem>Database Wizard</menuitem>. Help pages for each specific options for each database driver as given below.</note>
+
+  <h2 id="hd_id381668004546650">Enter connection string</h2>
+  <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizconnectionpage/browseurl" id="bm_id9310282" localize="false"/>
+  <paragraph role="paragraph" id="par_id621668004638253">Specify the connection string to the selected database.</paragraph>
+
+  <h2 id="hd_id191668004961425">Create new</h2>
+  <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizconnectionpage/create" id="bm_id9310283" localize="false"/>
+  <paragraph role="paragraph" id="par_id331668004976240">Choose the path and file name of the new database file.</paragraph>
+
+  <h2 id="hd_id51668005045737">Browse</h2>
+  <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/dbwizconnectionpage/browse" id="bm_id9310281" localize="false"/>
+  <paragraph role="paragraph" id="par_id61668005068546">Select an existing database file.</paragraph>
+
+  <h2 id="hd_id81668005348066">Other connection options</h2>
+  <paragraph role="paragraph" id="par_id911668005357794">The help pages below describe the options that are specific to each available database driver.</paragraph>
+  <embed href="text/sdatabase/dabawiz00.xhp#connection_types"/>
+
+  <section id="relatedtopics">
+    <embed href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/>
+  </section>
+</body>
+</helpdocument>
diff --git a/source/text/shared/00/00000001.xhp b/source/text/shared/00/00000001.xhp
index c98becce12..8b670b010e 100644
--- a/source/text/shared/00/00000001.xhp
+++ b/source/text/shared/00/00000001.xhp
@@ -36,6 +36,7 @@
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGFORM_CMDCANCEL" id="bm_id3149177" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGREPORT_0_CMDCANCEL" id="bm_id3154142" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_LISTWIZARD_CANCEL" id="bm_id3145416" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DBWIZ_CANCEL" id="bm_id1058076" localize="false"/>
 <h2 id="hd_id3147617">Cancel</h2>
   <paragraph xml-lang="en-US" id="par_id3155913" role="paragraph"><ahelp hid=".">Clicking <emph>Cancel</emph> closes a dialog without saving any changes made.</ahelp></paragraph>
 </section>
@@ -43,6 +44,7 @@
 <section id="finish">
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_DLGTABLE_CMDFINISH" id="bm_id3211157" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_CREATE" id="bm_id189519" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DBWIZ_FINISH" id="bm_id1058076" localize="false"/>
 <h2 id="hd_id2341685">Finish</h2>
   <paragraph xml-lang="en-US" id="par_id6909390" role="paragraph"><ahelp hid=".">Applies all changes and closes the wizard.</ahelp></paragraph>
 </section>