AllLangHelp_sdatabase.mk | 10 ++++++++++
AllLangHelp_shared.mk | 10 ----------
source/text/sdatabase/dabawiz00.xhp | 20 ++++++++++----------
source/text/sdatabase/dabawiz01.xhp | 18 +++++++++---------
source/text/sdatabase/dabawiz02.xhp | 4 ++--
source/text/sdatabase/dabawiz02access.xhp | 4 ++--
source/text/sdatabase/dabawiz02ado.xhp | 4 ++--
source/text/sdatabase/dabawiz02dbase.xhp | 4 ++--
source/text/sdatabase/dabawiz02jdbc.xhp | 4 ++--
source/text/sdatabase/dabawiz02mysql.xhp | 8 ++++----
source/text/sdatabase/dabawiz02odbc.xhp | 4 ++--
source/text/sdatabase/dabawiz02oracle.xhp | 2 +-
source/text/sdatabase/dabawiz02spreadsheet.xhp | 2 +-
source/text/sdatabase/dabawiz02text.xhp | 2 +-
source/text/sdatabase/dabawiz03auth.xhp | 2 +-
15 files changed, 49 insertions(+), 49 deletions(-)
New commits:
commit 08deb44ef2fdac4a1e173da75c9cdc1dfe289c61
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Tue Oct 19 13:36:05 2021 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Tue Oct 19 19:01:25 2021 +0200
Refactor database Help files (connection wizard)
Change-Id: I2d924cb3611d8749ed1e19d9321b1f230697412e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123831
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index e0c62d192..53b5e7db4 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -55,6 +55,16 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
helpcontent2/source/text/sdatabase/dabapropgen \
helpcontent2/source/text/sdatabase/dabawiz00 \
helpcontent2/source/text/sdatabase/dabawiz01 \
+ helpcontent2/source/text/sdatabase/dabawiz02 \
+ helpcontent2/source/text/sdatabase/dabawiz02access \
+ helpcontent2/source/text/sdatabase/dabawiz02ado \
+ helpcontent2/source/text/sdatabase/dabawiz02dbase \
+ helpcontent2/source/text/sdatabase/dabawiz02jdbc \
+ helpcontent2/source/text/sdatabase/dabawiz02mysql \
+ helpcontent2/source/text/sdatabase/dabawiz02odbc \
+ helpcontent2/source/text/sdatabase/dabawiz02oracle \
+ helpcontent2/source/text/sdatabase/dabawiz02spreadsheet \
+ helpcontent2/source/text/sdatabase/dabawiz02text \
helpcontent2/source/text/sdatabase/dabawiz03auth \
))
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index ef2c1eb44..0158fc6d2 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -868,16 +868,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
))
$(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
- helpcontent2/source/text/shared/explorer/database/dabawiz02 \
- helpcontent2/source/text/shared/explorer/database/dabawiz02access \
- helpcontent2/source/text/shared/explorer/database/dabawiz02ado \
- helpcontent2/source/text/shared/explorer/database/dabawiz02dbase \
- helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc \
- helpcontent2/source/text/shared/explorer/database/dabawiz02mysql \
- helpcontent2/source/text/shared/explorer/database/dabawiz02odbc \
- helpcontent2/source/text/shared/explorer/database/dabawiz02oracle \
- helpcontent2/source/text/shared/explorer/database/dabawiz02spreadsheet \
- helpcontent2/source/text/shared/explorer/database/dabawiz02text \
helpcontent2/source/text/shared/explorer/database/menubar \
helpcontent2/source/text/shared/explorer/database/menuedit \
helpcontent2/source/text/shared/explorer/database/menufile \
diff --git a/source/text/sdatabase/dabawiz00.xhp
b/source/text/sdatabase/dabawiz00.xhp
index bbb1492b7..3451a0b5a 100644
--- a/source/text/sdatabase/dabawiz00.xhp
+++ b/source/text/sdatabase/dabawiz00.xhp
@@ -47,21 +47,21 @@
<paragraph role="paragraph" id="par_idN105D5" xml-lang="en-US">Depending on
the type of operation and the type of database, the Database Wizard consists of
a varying number of steps.</paragraph>
<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/shared/explorer/database/dabawiz02.xhp#nextsteps"/>
+<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>
-<paragraph role="paragraph" id="par_idN105F2" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02text.xhp">Set up text file
connection</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">
-<paragraph role="paragraph" id="par_idN10601" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02access.xhp">Set up Microsoft
Access connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN1062E" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02ado.xhp">Set up ADO
connection</link></paragraph>
+<paragraph role="paragraph" id="par_idN10601" xml-lang="en-US"><link
href="text/sdatabase/dabawiz02access.xhp">Set up Microsoft Access
connection</link></paragraph>
+<paragraph role="paragraph" id="par_idN1062E" xml-lang="en-US"><link
href="text/sdatabase/dabawiz02ado.xhp">Set up ADO connection</link></paragraph>
</case>
</switch>
-<paragraph role="paragraph" id="par_idN1070F" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02dbase.xhp">Set up dBASE
connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN1063D" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02jdbc.xhp">Set up JDBC
connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN1064C" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02oracle.xhp">Set up Oracle database
connection</link></paragraph>
-<embed href="text/shared/explorer/database/dabawiz02mysql.xhp#mysql"/>
-<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02odbc.xhp">ODBC
settings</link></paragraph>
-<paragraph role="paragraph" id="par_idN10679" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02spreadsheet.xhp">Set up
Spreadsheet connection</link></paragraph>
+<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_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"/>
<embed href="text/shared/00/00000001.xhp#back"/>
<embed href="text/shared/00/00000001.xhp#next"/>
diff --git a/source/text/sdatabase/dabawiz01.xhp
b/source/text/sdatabase/dabawiz01.xhp
index a6e22814a..5826a0d79 100644
--- a/source/text/sdatabase/dabawiz01.xhp
+++ b/source/text/sdatabase/dabawiz01.xhp
@@ -57,15 +57,15 @@
<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US"><ahelp
hid=".">Select the database type for the existing database
connection.</ahelp></paragraph>
<note id="par_idN1059A">The Outlook, Evolution, KDE Address Book, and
Seamonkey database types do not need additional information. For other database
types, the wizard contains additional pages to specify the required
information.</note>
<paragraph role="paragraph" id="par_idN10611" xml-lang="en-US">The next wizard
page is one of the following pages:</paragraph>
-<embed href="text/shared/explorer/database/dabawiz02.xhp#nextsteps"/>
-<paragraph role="paragraph" id="par_idN1061C" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02text.xhp">Set up text file
connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN1062B" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02access.xhp">Set up Microsoft
Access or Microsoft Access 2007 connection</link></paragraph>
+<embed href="text/sdatabase/dabawiz02.xhp#nextsteps"/>
+<paragraph role="paragraph" id="par_idN1061C" xml-lang="en-US"><link
href="text/sdatabase/dabawiz02text.xhp">Set up text file
connection</link></paragraph>
+<paragraph role="paragraph" id="par_idN1062B" xml-lang="en-US"><link
href="text/sdatabase/dabawiz02access.xhp">Set up Microsoft Access or Microsoft
Access 2007 connection</link></paragraph>
<paragraph role="paragraph" id="par_idN1063A" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02ldap.xhp">Set up LDAP
connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN10658" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02ado.xhp">Set up ADO
connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02jdbc.xhp">Set up JDBC
connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN10676" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02oracle.xhp">Set up Oracle database
connection</link></paragraph>
-<embed href="text/shared/explorer/database/dabawiz02mysql.xhp#mysql"/>
-<paragraph role="paragraph" id="par_idN10694" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02odbc.xhp">ODBC
settings</link></paragraph>
-<paragraph role="paragraph" id="par_idN106A3" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02spreadsheet.xhp">Set up
Spreadsheet connection</link></paragraph>
+<paragraph role="paragraph" id="par_idN10658" xml-lang="en-US"><link
href="text/sdatabase/dabawiz02ado.xhp">Set up ADO connection</link></paragraph>
+<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US"><link
href="text/sdatabase/dabawiz02jdbc.xhp">Set up JDBC
connection</link></paragraph>
+<paragraph role="paragraph" id="par_idN10676" 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_idN10694" xml-lang="en-US"><link
href="text/sdatabase/dabawiz02odbc.xhp">ODBC settings</link></paragraph>
+<paragraph role="paragraph" id="par_idN106A3" xml-lang="en-US"><link
href="text/sdatabase/dabawiz02spreadsheet.xhp">Set up Spreadsheet
connection</link></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/dabawiz02.xhp
b/source/text/sdatabase/dabawiz02.xhp
similarity index 94%
rename from source/text/shared/explorer/database/dabawiz02.xhp
rename to source/text/sdatabase/dabawiz02.xhp
index 956e0d72e..4bb8556ae 100644
--- a/source/text/shared/explorer/database/dabawiz02.xhp
+++ b/source/text/sdatabase/dabawiz02.xhp
@@ -20,13 +20,13 @@
<meta>
<topic id="textsharedexplorerdatabasedabawiz02xml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">Save and proceed</title>
-<filename>/text/shared/explorer/database/dabawiz02.xhp</filename>
+<filename>/text/sdatabase/dabawiz02.xhp</filename>
</topic>
</meta>
<body>
<section id="nextsteps">
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/finalpagewizard/PageFinal"
id="bm_id9310280" localize="false"/>
-<h1 id="par_idN10544"><link
href="text/shared/explorer/database/dabawiz02.xhp">Save and proceed</link></h1>
+<h1 id="par_idN10544"><link href="text/sdatabase/dabawiz02.xhp">Save and
proceed</link></h1>
<paragraph role="paragraph" id="par_idN10554" xml-lang="en-US"><ahelp
hid=".">Specifies whether you want to register the database, open the database
for editing, or insert a new table.</ahelp></paragraph>
</section>
<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/finalpagewizard/yesregister" id="bm_id9310281"
localize="false"/><h2 id="par_idN10557">Yes, register the Database for me</h2>
diff --git a/source/text/shared/explorer/database/dabawiz02access.xhp
b/source/text/sdatabase/dabawiz02access.xhp
similarity index 92%
rename from source/text/shared/explorer/database/dabawiz02access.xhp
rename to source/text/sdatabase/dabawiz02access.xhp
index b02a147a0..2c06c0d99 100644
--- a/source/text/shared/explorer/database/dabawiz02access.xhp
+++ b/source/text/sdatabase/dabawiz02access.xhp
@@ -20,13 +20,13 @@
<meta>
<topic id="textsharedexplorerdatabasedabawiz02accessxml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">Microsoft Access Connection</title>
-<filename>/text/shared/explorer/database/dabawiz02access.xhp</filename>
+<filename>/text/sdatabase/dabawiz02access.xhp</filename>
</topic>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index"
id="bm_id2755516"><bookmark_value>Access databases (base)</bookmark_value>
<bookmark_value>Microsoft Office;Access databases (base)</bookmark_value>
-</bookmark><comment>mw added 2 new index entries</comment><h1
id="par_idN1053D"><variable id="access"><link
href="text/shared/explorer/database/dabawiz02access.xhp">Microsoft Access
Connection</link>
+</bookmark><comment>mw added 2 new index entries</comment><h1
id="par_idN1053D"><variable id="access"><link
href="text/sdatabase/dabawiz02access.xhp">Microsoft Access Connection</link>
</variable></h1>
<paragraph role="paragraph" id="par_idN10541" xml-lang="en-US"><ahelp
hid=".">Specifies the settings for importing a database file in Microsoft
Access or Access 2007 format.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id1142772" xml-lang="en-US">See also the
English Wiki page <link href="https://wiki.documentfoundation.org/MSA-Base_Faq";
name="wiki.documentfoundation.org MS Access Base
FAQ">https://wiki.documentfoundation.org/MSA-Base_Faq</link>.</paragraph>
diff --git a/source/text/shared/explorer/database/dabawiz02ado.xhp
b/source/text/sdatabase/dabawiz02ado.xhp
similarity index 95%
rename from source/text/shared/explorer/database/dabawiz02ado.xhp
rename to source/text/sdatabase/dabawiz02ado.xhp
index 467807719..40fe8812c 100644
--- a/source/text/shared/explorer/database/dabawiz02ado.xhp
+++ b/source/text/sdatabase/dabawiz02ado.xhp
@@ -20,7 +20,7 @@
<meta>
<topic id="textsharedexplorerdatabasedabawiz02adoxml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">ADO Connection</title>
-<filename>/text/shared/explorer/database/dabawiz02ado.xhp</filename>
+<filename>/text/sdatabase/dabawiz02ado.xhp</filename>
</topic>
<history>
<created date="2004-07-28T15:45:26">UFI: Database Wizard ADO page</created>
@@ -31,7 +31,7 @@
<bookmark_value>MS ADO interface (Base)</bookmark_value>
<bookmark_value>databases;ADO (Base)</bookmark_value>
</bookmark><comment>mw copied 3 index entries from
shared/explorer/database/1116000.xhp</comment>
-<h1 id="par_idN1054C"><variable id="ado"><link
href="text/shared/explorer/database/dabawiz02ado.xhp">ADO Connection</link>
+<h1 id="par_idN1054C"><variable id="ado"><link
href="text/sdatabase/dabawiz02ado.xhp">ADO Connection</link>
</variable></h1>
<paragraph role="paragraph" id="par_idN10550" xml-lang="en-US"><ahelp
hid=".">Specifies the options for adding an ADO (Microsoft ActiveX Data
Objects) database.</ahelp><comment>UFI: copied text from
shared\explorer\database\11160000</comment></paragraph>
<note id="par_idN10565">The ADO interface is a Microsoft Windows proprietary
container for connecting to databases.</note>
diff --git a/source/text/shared/explorer/database/dabawiz02dbase.xhp
b/source/text/sdatabase/dabawiz02dbase.xhp
similarity index 90%
rename from source/text/shared/explorer/database/dabawiz02dbase.xhp
rename to source/text/sdatabase/dabawiz02dbase.xhp
index 2a55dcc32..4cd6b7ce1 100644
--- a/source/text/shared/explorer/database/dabawiz02dbase.xhp
+++ b/source/text/sdatabase/dabawiz02dbase.xhp
@@ -23,11 +23,11 @@
<meta>
<topic id="textsharedexplorerdatabasedabawiz02dbasexhp" indexer="include">
<title id="tit" xml-lang="en-US">dBASE Connection </title>
-<filename>/text/shared/explorer/database/dabawiz02dbase.xhp</filename>
+<filename>/text/sdatabase/dabawiz02dbase.xhp</filename>
</topic>
</meta>
<body><comment>** Expression is faulty **</comment>
-<h1 id="par_idN1054A"><variable id="dbase"><link
href="text/shared/explorer/database/dabawiz02dbase.xhp">dBASE Connection</link>
+<h1 id="par_idN1054A"><variable id="dbase"><link
href="text/sdatabase/dabawiz02dbase.xhp">dBASE Connection</link>
</variable></h1>
<bookmark xml-lang="en-US"
branch="hid/DBACCESS_HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION"
id="bm_id2821131" localize="false"/>
<h2 id="par_idN10556">Path to the dBASE files</h2>
diff --git a/source/text/shared/explorer/database/dabawiz02jdbc.xhp
b/source/text/sdatabase/dabawiz02jdbc.xhp
similarity index 97%
rename from source/text/shared/explorer/database/dabawiz02jdbc.xhp
rename to source/text/sdatabase/dabawiz02jdbc.xhp
index 88b080463..45e9c8b6f 100644
--- a/source/text/shared/explorer/database/dabawiz02jdbc.xhp
+++ b/source/text/sdatabase/dabawiz02jdbc.xhp
@@ -20,7 +20,7 @@
<meta>
<topic id="textsharedexplorerdatabasedabawiz02jdbcxml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">JDBC Connection</title>
-<filename>/text/shared/explorer/database/dabawiz02jdbc.xhp</filename>
+<filename>/text/sdatabase/dabawiz02jdbc.xhp</filename>
</topic>
</meta>
<body>
@@ -28,7 +28,7 @@
<bookmark_value>databases; JDBC (Base)</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/jdbcconnectionpage/JDBCConnectionPage"
id="bm_id6293219" localize="false"/>
-<h1 id="par_idN105FC"><variable id="jdbc"><link
href="text/shared/explorer/database/dabawiz02jdbc.xhp">JDBC Connection</link>
+<h1 id="par_idN105FC"><variable id="jdbc"><link
href="text/sdatabase/dabawiz02jdbc.xhp">JDBC Connection</link>
</variable></h1>
<paragraph role="paragraph" id="par_idN10600" xml-lang="en-US"><ahelp
hid=".">Specifies the options to access a <link
href="text/shared/00/00000005.xhp#jdbc" name="JDBC">JDBC</link>
database.</ahelp><comment>copied text from
shared\explorer\database\11110000</comment></paragraph>
<h2 id="par_idN10623">JDBC Examples</h2>
diff --git a/source/text/shared/explorer/database/dabawiz02mysql.xhp
b/source/text/sdatabase/dabawiz02mysql.xhp
similarity index 92%
rename from source/text/shared/explorer/database/dabawiz02mysql.xhp
rename to source/text/sdatabase/dabawiz02mysql.xhp
index 83f8cc05b..5910b6a97 100644
--- a/source/text/shared/explorer/database/dabawiz02mysql.xhp
+++ b/source/text/sdatabase/dabawiz02mysql.xhp
@@ -23,7 +23,7 @@
<meta>
<topic id="textsharedexplorerdatabasedabawiz02mysqlxml" indexer="include">
<title id="tit" xml-lang="en-US">MariaDB and MySQL Connection</title>
-<filename>/text/shared/explorer/database/dabawiz02mysql.xhp</filename>
+<filename>/text/sdatabase/dabawiz02mysql.xhp</filename>
</topic>
</meta>
<body><comment>** Expression is faulty **</comment>
@@ -34,7 +34,7 @@
<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/mysqlnativesettings/MysqlNativeSettings"
id="bm_id921587413082830" localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/dbwizmysqlintropage/DBWizMysqlIntroPage"
id="bm_id181587415238853" localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/dbwizmysqlintropage/directly" id="bm_id891587415338612"
localize="false"/>
-<h1 id="par_idN10549"><variable id="mysql"><link
href="text/shared/explorer/database/dabawiz02mysql.xhp">MariaDB and MySQL
Connection</link></variable></h1>
+<h1 id="par_idN10549"><variable id="mysql"><link
href="text/sdatabase/dabawiz02mysql.xhp">MariaDB and MySQL
Connection</link></variable></h1>
<paragraph role="paragraph" id="par_idN1054D" xml-lang="en-US"><ahelp
hid=".">Specifies the options for MariaDB and MySQL
databases.</ahelp><comment>text copied from
shared\explorer\database\11120000</comment></paragraph>
<h2 id="hd_id661587405298284">Direct Connection for MariaDB and MySQL
databases</h2>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/mysqlnativesettings/dbname"
id="bm_id461587412947601" localize="false"/>
@@ -65,8 +65,8 @@
<h2 id="par_idN10569">Connect using JDBC (Java Database Connectivity)</h2>
<paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US"><ahelp
hid=".">Connects to an existing JDBC data source that was set on a system
level.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN10570" xml-lang="en-US">The next wizard
page depends on your choice of ODBC or JDBC:</paragraph>
-<paragraph role="paragraph" id="par_idN10573" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02odbc.xhp">ODBC
Connection</link></paragraph>
-<paragraph role="paragraph" id="par_idN10582" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02jdbc.xhp">JDBC
Connection</link></paragraph>
+<paragraph role="paragraph" id="par_idN10573" xml-lang="en-US"><link
href="text/sdatabase/dabawiz02odbc.xhp">ODBC Connection</link></paragraph>
+<paragraph role="paragraph" id="par_idN10582" xml-lang="en-US"><link
href="text/sdatabase/dabawiz02jdbc.xhp">JDBC Connection</link></paragraph>
<paragraph role="paragraph" id="par_idN10591" xml-lang="en-US"><link
href="text/sdatabase/dabawiz03auth.xhp">Authentication</link></paragraph>
<paragraph role="paragraph" localize="false" id="par_idN1061A"
xml-lang="en-US"><embedvar
href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph>
</body>
diff --git a/source/text/shared/explorer/database/dabawiz02odbc.xhp
b/source/text/sdatabase/dabawiz02odbc.xhp
similarity index 94%
rename from source/text/shared/explorer/database/dabawiz02odbc.xhp
rename to source/text/sdatabase/dabawiz02odbc.xhp
index 3efc70cc5..0a69034c2 100644
--- a/source/text/shared/explorer/database/dabawiz02odbc.xhp
+++ b/source/text/sdatabase/dabawiz02odbc.xhp
@@ -20,7 +20,7 @@
<meta>
<topic id="textsharedexplorerdatabasedabawiz02odbcxml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">ODBC Connection</title>
-<filename>/text/shared/explorer/database/dabawiz02odbc.xhp</filename>
+<filename>/text/sdatabase/dabawiz02odbc.xhp</filename>
</topic>
<history>
<created date="2004-07-28T16:27:31">UFI: Database Wizard ODBC page</created>
@@ -30,7 +30,7 @@
<bookmark xml-lang="en-US" branch="index"
id="bm_id3149031"><bookmark_value>ODBC;database (Base)</bookmark_value>
<bookmark_value>databases;ODBC (Base)</bookmark_value>
</bookmark><comment>mw added "(Base)" to all entries</comment>
-<h1 id="par_idN1053D"><variable id="odbc"><link
href="text/shared/explorer/database/dabawiz02odbc.xhp">ODBC Connection</link>
+<h1 id="par_idN1053D"><variable id="odbc"><link
href="text/sdatabase/dabawiz02odbc.xhp">ODBC Connection</link>
</variable></h1>
<paragraph role="paragraph" id="par_idN10541" xml-lang="en-US"><ahelp
hid=".">Specifies the settings for <link
href="text/shared/00/00000005.xhp#odbc" name="ODBC">ODBC</link>
databases.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id8856776" xml-lang="en-US">To edit or add
records to a database table in $[officename], the table must have a unique
index field.</paragraph>
diff --git a/source/text/shared/explorer/database/dabawiz02oracle.xhp
b/source/text/sdatabase/dabawiz02oracle.xhp
similarity index 98%
rename from source/text/shared/explorer/database/dabawiz02oracle.xhp
rename to source/text/sdatabase/dabawiz02oracle.xhp
index c098bbb12..efe7aae2e 100644
--- a/source/text/shared/explorer/database/dabawiz02oracle.xhp
+++ b/source/text/sdatabase/dabawiz02oracle.xhp
@@ -20,7 +20,7 @@
<meta>
<topic id="textsharedexplorerdatabasedabawiz02oraclexml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">Oracle Database Connection</title>
-<filename>/text/shared/explorer/database/dabawiz02oracle.xhp</filename>
+<filename>/text/sdatabase/dabawiz02oracle.xhp</filename>
</topic>
<history>
<created date="2004-07-28T16:07:28">UFI: Database Wizard Oracle page</created>
diff --git a/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
b/source/text/sdatabase/dabawiz02spreadsheet.xhp
similarity index 96%
rename from source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
rename to source/text/sdatabase/dabawiz02spreadsheet.xhp
index 40663ea56..3980a2632 100644
--- a/source/text/shared/explorer/database/dabawiz02spreadsheet.xhp
+++ b/source/text/sdatabase/dabawiz02spreadsheet.xhp
@@ -23,7 +23,7 @@
<meta>
<topic id="textsharedexplorerdatabasedabawiz02spreadsheetxml"
indexer="include">
<title id="tit" xml-lang="en-US">Spreadsheet Database Connection</title>
-<filename>/text/shared/explorer/database/dabawiz02spreadsheet.xhp</filename>
+<filename>/text/sdatabase/dabawiz02spreadsheet.xhp</filename>
</topic>
</meta>
<body><comment>** Expression is faulty **</comment>
diff --git a/source/text/shared/explorer/database/dabawiz02text.xhp
b/source/text/sdatabase/dabawiz02text.xhp
similarity index 98%
rename from source/text/shared/explorer/database/dabawiz02text.xhp
rename to source/text/sdatabase/dabawiz02text.xhp
index f2d4951da..18b734d57 100644
--- a/source/text/shared/explorer/database/dabawiz02text.xhp
+++ b/source/text/sdatabase/dabawiz02text.xhp
@@ -20,7 +20,7 @@
<meta>
<topic id="textsharedexplorerdatabasedabawiz02textxml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">Text File Connection</title>
-<filename>/text/shared/explorer/database/dabawiz02text.xhp</filename>
+<filename>/text/sdatabase/dabawiz02text.xhp</filename>
</topic>
<history>
<created date="2004-07-28T15:03:00">UFI: Database Wizard text file</created>
diff --git a/source/text/sdatabase/dabawiz03auth.xhp
b/source/text/sdatabase/dabawiz03auth.xhp
index 6be455599..cd91d9e15 100644
--- a/source/text/sdatabase/dabawiz03auth.xhp
+++ b/source/text/sdatabase/dabawiz03auth.xhp
@@ -38,7 +38,7 @@
<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/authentificationpage/testConnectionButton"
id="bm_id6467788" localize="false"/>
<h3 id="par_idN10549">Test Connection</h3>
<paragraph role="paragraph" id="par_idN10546" xml-lang="en-US"><ahelp
hid=".">Check if the configured connection can be used to access the
database.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN1054F" xml-lang="en-US"><link
href="text/shared/explorer/database/dabawiz02.xhp">Save and
proceed</link></paragraph>
+<paragraph role="paragraph" id="par_idN1054F" xml-lang="en-US"><link
href="text/sdatabase/dabawiz02.xhp">Save and proceed</link></paragraph>
<paragraph role="paragraph" localize="false" id="par_idN1061A"
xml-lang="en-US"><embedvar
href="text/sdatabase/dabawiz00.xhp#databasewizardh1"/></paragraph>
</body>
</helpdocument>
