AllLangHelp_sdatabase.mk | 7 +++++
AllLangHelp_shared.mk | 7 -----
source/text/sdatabase/main.xhp | 2 -
source/text/sdatabase/menubar.xhp | 19 +++++---------
source/text/sdatabase/menuedit.xhp | 39 +++++++++++++----------------
source/text/sdatabase/menufile.xhp | 23 +++++++----------
source/text/sdatabase/menufilesave.xhp | 12 ++++----
source/text/sdatabase/menuinsert.xhp | 27 ++++++++------------
source/text/sdatabase/menutools.xhp | 15 ++++-------
source/text/sdatabase/menuview.xhp | 33 +++++++++++-------------
source/text/shared/guide/database_main.xhp | 2 -
11 files changed, 83 insertions(+), 103 deletions(-)
New commits:
commit 95f006af3ffbe256ebf095db8be2ebd1321e673e
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Mon Nov 1 15:21:09 2021 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Tue Nov 2 08:04:48 2021 +0100
Refactor database files
Change-Id: I97f41e7a5268ee307e3e0b051abebb35b917ed73
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/124565
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 53b5e7db4..a2ad6311e 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -66,6 +66,13 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
helpcontent2/source/text/sdatabase/dabawiz02spreadsheet \
helpcontent2/source/text/sdatabase/dabawiz02text \
helpcontent2/source/text/sdatabase/dabawiz03auth \
+ helpcontent2/source/text/sdatabase/menubar \
+ helpcontent2/source/text/sdatabase/menuedit \
+ helpcontent2/source/text/sdatabase/menufile \
+ helpcontent2/source/text/sdatabase/menufilesave \
+ helpcontent2/source/text/sdatabase/menuinsert \
+ helpcontent2/source/text/sdatabase/menutools \
+ helpcontent2/source/text/sdatabase/menuview \
))
# vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 1d8258596..e758a8330 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -870,13 +870,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
))
$(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
- helpcontent2/source/text/shared/explorer/database/menubar \
- helpcontent2/source/text/shared/explorer/database/menuedit \
- helpcontent2/source/text/shared/explorer/database/menufile \
- helpcontent2/source/text/shared/explorer/database/menufilesave \
- helpcontent2/source/text/shared/explorer/database/menuinsert \
- helpcontent2/source/text/shared/explorer/database/menutools \
- helpcontent2/source/text/shared/explorer/database/menuview \
helpcontent2/source/text/shared/explorer/database/migrate_macros \
helpcontent2/source/text/shared/explorer/database/password \
helpcontent2/source/text/shared/explorer/database/querywizard00 \
diff --git a/source/text/sdatabase/main.xhp b/source/text/sdatabase/main.xhp
index 806e88419..f76bead79 100644
--- a/source/text/sdatabase/main.xhp
+++ b/source/text/sdatabase/main.xhp
@@ -87,7 +87,7 @@
<embedvar href="text/shared/guide/database_main.xhp#database_main"/>
</paragraph>
<paragraph role="paragraph" id="par_idN107AD" xml-lang="en-US"
localize="false">
- <embedvar href="text/shared/explorer/database/menubar.xhp#titletext"/>
+ <embedvar href="text/sdatabase/menubar.xhp#titletext"/>
</paragraph>
<paragraph role="paragraph" id="par_idN107BB" xml-lang="en-US"
localize="false">
<embedvar href="text/sdatabase/toolbars.xhp#toolbars"/>
diff --git a/source/text/shared/explorer/database/menubar.xhp
b/source/text/sdatabase/menubar.xhp
similarity index 70%
rename from source/text/shared/explorer/database/menubar.xhp
rename to source/text/sdatabase/menubar.xhp
index 59919db15..7542609df 100644
--- a/source/text/shared/explorer/database/menubar.xhp
+++ b/source/text/sdatabase/menubar.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,12 +16,11 @@
* 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="textsharedexplorerdatabasemenubarxml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">Menus</title>
-<filename>/text/shared/explorer/database/menubar.xhp</filename>
+<filename>/text/sdatabase/menubar.xhp</filename>
</topic>
<history>
<created date="2004-07-29T13:33:27">UFI: Database Document Menu bar</created>
@@ -31,14 +28,14 @@
</meta>
<body>
<section id="menus">
-<paragraph role="heading" id="par_idN10552" xml-lang="en-US"
level="1"><variable id="titletext"><link
href="text/shared/explorer/database/menubar.xhp">Menus</link>
-</variable></paragraph>
+<h1 id="par_idN10552"><variable id="titletext"><link
href="text/sdatabase/menubar.xhp">Menus</link>
+</variable></h1>
<paragraph role="paragraph" id="par_idN10562" xml-lang="en-US">In the database
window, you see a new set of menu commands for working on the current database
file.</paragraph>
</section>
-<embed href="text/shared/explorer/database/menufile.xhp#file"/>
-<embed href="text/shared/explorer/database/menuedit.xhp#edit"/>
-<embed href="text/shared/explorer/database/menuview.xhp#view"/>
-<embed href="text/shared/explorer/database/menuinsert.xhp#insert"/>
-<embed href="text/shared/explorer/database/menutools.xhp#tools"/>
+<embed href="text/sdatabase/menufile.xhp#file"/>
+<embed href="text/sdatabase/menuedit.xhp#edit"/>
+<embed href="text/sdatabase/menuview.xhp#view"/>
+<embed href="text/sdatabase/menuinsert.xhp#insert"/>
+<embed href="text/sdatabase/menutools.xhp#tools"/>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/menuedit.xhp
b/source/text/sdatabase/menuedit.xhp
similarity index 73%
rename from source/text/shared/explorer/database/menuedit.xhp
rename to source/text/sdatabase/menuedit.xhp
index 4fc35cfc5..bdb4046a8 100644
--- a/source/text/shared/explorer/database/menuedit.xhp
+++ b/source/text/sdatabase/menuedit.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,12 +16,11 @@
* 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="textsharedexplorerdatabasemenueditxml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">Edit</title>
-<filename>/text/shared/explorer/database/menuedit.xhp</filename>
+<filename>/text/sdatabase/menuedit.xhp</filename>
</topic>
<history>
<created date="2004-07-29T14:30:39">UFI: Edit menu of Database</created>
@@ -31,56 +28,56 @@
</meta>
<body>
<section id="edit">
-<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><link
href="text/shared/explorer/database/menuedit.xhp">Edit</link></paragraph>
+<h1 id="par_idN1054D"><link href="text/sdatabase/menuedit.xhp">Edit</link></h1>
</section>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US">The Edit menu
of a database window.</paragraph>
-<paragraph role="heading" id="par_idN10560" xml-lang="en-US"
level="2">Copy</paragraph>
+<h2 id="par_idN10560">Copy</h2>
<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp
hid=".">Copies the selected object to the clipboard.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10567" xml-lang="en-US"
level="2">Paste</paragraph>
+<h2 id="par_idN10567">Paste</h2>
<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US"><ahelp
hid=".">Inserts an item from the clipboard. If you want, you can insert forms
and reports, including subfolders, from one database file to
another.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:PasteSpecial" id="bm_id2726522"
localize="false"/>
-<paragraph role="heading" id="par_idN1056E" xml-lang="en-US" level="2">Paste
Special</paragraph>
+<h2 id="par_idN1056E">Paste Special</h2>
<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US"><ahelp
hid=".">Inserts an item from the clipboard. If you want, you can insert forms
and reports, including subfolders, from one database file to
another.</ahelp></paragraph>
<section id="table_edit">
<bookmark xml-lang="en-US" branch="hid/.uno:SelectAll" id="bm_id2726524"
localize="false"/>
-<paragraph role="heading" id="par_idN105D7" xml-lang="en-US" level="2">Select
All</paragraph>
+<h2 id="par_idN105D7">Select All</h2>
<paragraph role="paragraph" id="par_idN105DB" xml-lang="en-US"><ahelp
hid=".">Selects all entries, including subfolders, in the lower part of the
database window.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_BROWSER_TABLE_EDIT"
id="bm_id3152996" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DBEdit" id="bm_id2726523"
localize="false"/>
-<paragraph role="heading" id="hd_id3153683" xml-lang="en-US"
level="2">Edit</paragraph>
+<h2 id="hd_id3153683">Edit</h2>
<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US"><ahelp
hid=".">Opens a window where you can edit the selected table, query, form, or
report.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_BROWSER_TABLE_DELETE"
id="bm_id3153824" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DBDelete" id="bm_id4481643"
localize="false"/>
-<paragraph role="heading" id="hd_id3145315" xml-lang="en-US"
level="2">Delete</paragraph>
+<h2 id="hd_id3145315">Delete</h2>
<paragraph role="paragraph" id="par_id3153666" xml-lang="en-US"><ahelp
hid=".">Deletes the selected table, query, form, or report.</ahelp></paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/.uno:DBRename" id="bm_id2862636"
localize="false"/>
-<paragraph role="heading" id="par_idN1057C" xml-lang="en-US"
level="2">Rename</paragraph>
+<h2 id="par_idN1057C">Rename</h2>
<paragraph role="paragraph" id="par_idN10580" xml-lang="en-US"><ahelp
hid=".">Renames the selected object. Depending on the database, some names,
characters, and name length might be invalid.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBOpen" id="bm_id4928739"
localize="false"/>
-<paragraph role="heading" id="par_idN1058A" xml-lang="en-US"
level="2">Open</paragraph>
+<h2 id="par_idN1058A">Open</h2>
<paragraph role="paragraph" id="par_idN1058E" xml-lang="en-US"><ahelp
hid=".">Opens the selected object in the last saved state.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBConvertToView" id="bm_id1669362"
localize="false"/>
-<paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2">Create
as View</paragraph>
+<h2 id="par_idN10591">Create as View</h2>
<paragraph role="paragraph" id="par_idN105A7" xml-lang="en-US"><ahelp
hid=".">Converts the selected query to a view. The original query remains in
your database file and an additional view is generated on the database server.
You must have write permission to add a view to a database.</ahelp></paragraph>
-<paragraph role="note" id="par_idN105AA" xml-lang="en-US">Most databases use
queries to filter or to sort database tables to display records on your
computer. Views offer the same functionality as queries, but on the server
side. If your database is on a server that supports views, you can use views to
filter the records on the server to speed up the display time.</paragraph>
+<note id="par_idN105AA">Most databases use queries to filter or to sort
database tables to display records on your computer. Views offer the same
functionality as queries, but on the server side. If your database is on a
server that supports views, you can use views to filter the records on the
server to speed up the display time.</note>
<bookmark xml-lang="en-US"
branch="hid/.uno:DBNewFormAutoPilotWithPreSelection" id="bm_id1720023b"
localize="false"/>
-<paragraph role="heading" id="par_idN105AD" xml-lang="en-US" level="2">Form
Wizard</paragraph>
+<h2 id="par_idN105AD">Form Wizard</h2>
<paragraph role="paragraph" id="par_idN105B1" xml-lang="en-US"><ahelp
hid=".">Starts the <link href="text/shared/autopi/01090000.xhp">Form
Wizard</link> for the selected table, query, or view.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/.uno:DBNewReportAutoPilotWithPreSelection" id="bm_id28626361"
localize="false"/>
-<paragraph role="heading" id="par_idN105C2" xml-lang="en-US" level="2">Report
Wizard</paragraph>
+<h2 id="par_idN105C2">Report Wizard</h2>
<paragraph role="paragraph" id="par_idN105C6" xml-lang="en-US"><ahelp
hid=".">Starts the <link href="text/shared/autopi/01100000.xhp">Report
Wizard</link> for the selected table, query, or view.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBDatabasePropertiesMenu"
id="bm_id24472791" localize="false"/>
-<paragraph role="heading" id="par_idN105DE" xml-lang="en-US"
level="2">Database</paragraph>
+<h2 id="par_idN105DE">Database</h2>
<paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US"><ahelp
hid=".">Opens a submenu.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBDSProperties" id="bm_id49287391"
localize="false"/>
-<paragraph role="heading" id="par_idN105E5" xml-lang="en-US"
level="3">Properties</paragraph>
+<h3 id="par_idN105E5">Properties</h3>
<paragraph role="paragraph" id="par_idN105E9" xml-lang="en-US"><ahelp
hid=".">Opens the Database Properties dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBDSConnectionType"
id="bm_id16693621" localize="false"/>
-<paragraph role="heading" id="par_idN105EC" xml-lang="en-US"
level="3">Connection Type</paragraph>
+<h3 id="par_idN105EC">Connection Type</h3>
<paragraph role="paragraph" id="par_idN105F0" xml-lang="en-US"><ahelp
hid=".">Opens the Connection Type Wizard.</ahelp><comment>shortened the
paragraph, see i58462</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBDSAdvancedSettings"
id="bm_id1720023c" localize="false"/>
-<paragraph role="heading" id="par_idN105F3" xml-lang="en-US"
level="3">Advanced Properties</paragraph>
+<h3 id="par_idN105F3">Advanced Properties</h3>
<paragraph role="paragraph" id="par_idN105F7" xml-lang="en-US"><ahelp
hid=".">Opens the Advanced Properties dialog.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/menufile.xhp
b/source/text/sdatabase/menufile.xhp
similarity index 76%
rename from source/text/shared/explorer/database/menufile.xhp
rename to source/text/sdatabase/menufile.xhp
index 16d508685..cf1f0a533 100644
--- a/source/text/shared/explorer/database/menufile.xhp
+++ b/source/text/sdatabase/menufile.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,12 +16,11 @@
* 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="textsharedexplorerdatabasemenufilexml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">File</title>
-<filename>/text/shared/explorer/database/menufile.xhp</filename>
+<filename>/text/sdatabase/menufile.xhp</filename>
</topic>
<history>
<created date="2004-07-29T14:25:38">UFI: File menu for Database</created>
@@ -31,24 +28,24 @@
</meta>
<body>
<section id="file">
-<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><link
href="text/shared/explorer/database/menufile.xhp">File</link></paragraph>
+<h1 id="par_idN1054D"><link href="text/sdatabase/menufile.xhp">File</link></h1>
</section>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US">The File menu
of a database window. Only entries specific to databases are listed.</paragraph>
-<paragraph role="heading" id="par_idN105C0" xml-lang="en-US"
level="2">Save</paragraph>
-<paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US">Saves the
current database file, query, form or report. For the database file, you see
the <link href="text/shared/01/01070000.xhp">file save</link> dialog. For the
other objects, you see the <link
href="text/shared/explorer/database/menufilesave.xhp">Save</link>
dialog.</paragraph>
-<paragraph role="heading" id="par_idN105D5" xml-lang="en-US" level="2">Save
As</paragraph>
+<h2 id="par_idN105C0">Save</h2>
+<paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US">Saves the
current database file, query, form or report. For the database file, you see
the <link href="text/shared/01/01070000.xhp">file save</link> dialog. For the
other objects, you see the <link
href="text/sdatabase/menufilesave.xhp">Save</link> dialog.</paragraph>
+<h2 id="par_idN105D5">Save As</h2>
<paragraph role="paragraph" id="par_idN105D9" xml-lang="en-US">Saves the
current database file with another name. In the <link
href="text/shared/01/01070000.xhp">file save</link> dialog, select a path and
file name to save.</paragraph>
-<paragraph role="heading" id="par_idN105EA" xml-lang="en-US"
level="2">Export</paragraph>
+<h2 id="par_idN105EA">Export</h2>
<paragraph role="paragraph" id="par_idN105EE" xml-lang="en-US">Exports the
selected report or form to a text document. A dynamic report is exported as a
copy of the database contents at the time of export.</paragraph>
-<paragraph role="heading" id="par_idN105F1" xml-lang="en-US"
level="2">Send</paragraph>
+<h2 id="par_idN105F1">Send</h2>
<paragraph role="paragraph" id="par_idN105F5" xml-lang="en-US">Opens a
submenu.</paragraph>
-<paragraph role="heading" id="par_idN105F8" xml-lang="en-US" level="3">Email
Document</paragraph>
+<h3 id="par_idN105F8">Email Document</h3>
<paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US">Opens the
default email application to send a new email. The current database file is
appended as an attachment. You can enter the subject, the recipients and a mail
body.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBSendReportAsMail"
id="bm_id4928739" localize="false"/>
-<paragraph role="heading" id="par_idN105FF" xml-lang="en-US" level="3">Report
as Email</paragraph>
+<h3 id="par_idN105FF">Report as Email</h3>
<paragraph role="paragraph" id="par_idN10603" xml-lang="en-US"><ahelp
hid=".">Opens the default email application to send a new email. The selected
report is appended as an attachment. You can enter the subject, the recipients
and a mail body. A dynamic report is exported as a copy of the database
contents at the time of export.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBSendReportToWriter"
id="bm_id1669362" localize="false"/>
-<paragraph role="heading" id="par_idN10606" xml-lang="en-US" level="3">Report
to Text Document</paragraph>
+<h3 id="par_idN10606">Report to Text Document</h3>
<paragraph role="paragraph" id="par_idN1060A" xml-lang="en-US"><ahelp
hid=".">Exports the selected report to a text document. A dynamic report is
exported as a copy of the database contents at the time of
export.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/menufilesave.xhp
b/source/text/sdatabase/menufilesave.xhp
similarity index 84%
rename from source/text/shared/explorer/database/menufilesave.xhp
rename to source/text/sdatabase/menufilesave.xhp
index 304a40d47..0347c9d43 100644
--- a/source/text/shared/explorer/database/menufilesave.xhp
+++ b/source/text/sdatabase/menufilesave.xhp
@@ -21,7 +21,7 @@
<meta>
<topic id="textsharedexplorerdatabasemenufilesavexhp" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">Save</title>
-<filename>/text/shared/explorer/database/menufilesave.xhp</filename>
+<filename>/text/sdatabase/menufilesave.xhp</filename>
</topic>
<history>
<created date="2005-02-07T15:50:39">save dialog in Base</created>
@@ -29,19 +29,19 @@
</meta>
<body>
<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/collectionviewdialog/CollectionView" id="bm_id2862637"
localize="false"/>
-<paragraph role="heading" id="par_idN10547" xml-lang="en-US"
level="1">Save</paragraph>
+<h1 id="par_idN10547">Save</h1>
<paragraph role="paragraph" id="par_idN1054B" xml-lang="en-US">In this dialog,
you can specify the position and name of a form <comment>UFI: spec says also
for report, but reports can be created only by Wizard and are autosaved
there</comment><comment>UFI: spec says also for query, cannot
verify</comment>that you save within a <link
href="text/sdatabase/dabadoc.xhp">database file</link>. The dialog opens
automatically when you save a form the first time.<comment>UFI: no chance to
open the dialog a second time</comment></paragraph>
<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/collectionviewdialog/newFolderButton" id="bm_id2862636"
localize="false"/>
-<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2">Create
New Directory</paragraph>
+<h2 id="par_idN10564">Create New Directory</h2>
<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US"><ahelp
hid=".">Click to create a new folder within the database
file.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/collectionviewdialog/upButton" id="bm_id2447279"
localize="false"/>
-<paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="2">Up One
Level</paragraph>
+<h2 id="par_idN1057F">Up One Level</h2>
<paragraph role="paragraph" id="par_idN10583" xml-lang="en-US"><ahelp
hid=".">Click to go up one level in the folder hierarchy.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/collectionviewdialog/fileNameEntry" id="bm_id1669362"
localize="false"/>
-<paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="2">File
name</paragraph>
+<h2 id="par_idN1059A">File name</h2>
<paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US"><ahelp
hid=".">Enter the file name for the saved form.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/collectionviewdialog/ok"
id="bm_id1720023" localize="false"/>
-<paragraph role="heading" id="par_idN105B5" xml-lang="en-US"
level="2">Save</paragraph>
+<h2 id="par_idN105B5">Save</h2>
<paragraph role="paragraph" id="par_idN105B9" xml-lang="en-US"><ahelp
hid=".">Click to save the form to the database file.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/menuinsert.xhp
b/source/text/sdatabase/menuinsert.xhp
similarity index 69%
rename from source/text/shared/explorer/database/menuinsert.xhp
rename to source/text/sdatabase/menuinsert.xhp
index 76b40bf50..1f9196bc0 100644
--- a/source/text/shared/explorer/database/menuinsert.xhp
+++ b/source/text/sdatabase/menuinsert.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,35 +16,33 @@
* 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">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedexplorerdatabasemenuinsertxml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">Insert</title>
-<filename>/text/shared/explorer/database/menuinsert.xhp</filename>
+<filename>/text/sdatabase/menuinsert.xhp</filename>
</topic>
</meta>
<body>
<section id="insert">
-<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><link
href="text/shared/explorer/database/menuinsert.xhp">Insert</link></paragraph>
+<h1 id="par_idN1054D"><link
href="text/sdatabase/menuinsert.xhp">Insert</link></h1>
</section>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US">The Insert menu
of a database window.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:DBNewForm" id="bm_id4928739"
localize="false"/><paragraph role="heading" id="par_idN10560" xml-lang="en-US"
level="2">Form</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DBNewForm" id="bm_id4928739"
localize="false"/><h2 id="par_idN10560">Form</h2>
<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US"><ahelp
hid=".">Opens a new text document in form mode.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:DBNewReport" id="bm_id4968413"
localize="false"/><paragraph role="heading" id="par_idN1058B" xml-lang="en-US"
level="2">Report</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DBNewReport" id="bm_id4968413"
localize="false"/><h2 id="par_idN1058B">Report</h2>
<paragraph role="paragraph" id="par_idN1058F" xml-lang="en-US"><ahelp
hid=".">Starts the <link
href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> window
for the selected table, view, or query.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:DBNewQuery" id="bm_id1720023"
localize="false"/><paragraph role="heading" id="par_idN105A0" xml-lang="en-US"
level="2">Query (Design View)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DBNewQuery" id="bm_id1720023"
localize="false"/><h2 id="par_idN105A0">Query (Design View)</h2>
<paragraph role="paragraph" id="par_idN105A4" xml-lang="en-US"><ahelp
hid=".">Opens a new query in design mode.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:DBNewQuerySql" id="bm_id2862636"
localize="false"/><paragraph role="heading" id="par_idN105A7" xml-lang="en-US"
level="2">Query (SQL View)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DBNewQuerySql" id="bm_id2862636"
localize="false"/><h2 id="par_idN105A7">Query (SQL View)</h2>
<paragraph role="paragraph" id="par_idN105AB" xml-lang="en-US"><ahelp
hid=".">Opens a new query in SQL mode.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:DBNewTable" id="bm_id2447279"
localize="false"/><paragraph role="heading" id="par_idN105AE" xml-lang="en-US"
level="2">Table Design</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DBNewTable" id="bm_id2447279"
localize="false"/><h2 id="par_idN105AE">Table Design</h2>
<paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US"><ahelp
hid=".">Opens the table design view.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:DBNewView" id="bm_id49287391"
localize="false"/><paragraph role="heading" id="par_idN105C7" xml-lang="en-US"
level="2">View Design</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DBNewView" id="bm_id49287391"
localize="false"/><h2 id="par_idN105C7">View Design</h2>
<paragraph role="paragraph" id="par_idN10669" xml-lang="en-US"><ahelp
hid=".">Opens a new view in design mode.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:DBNewViewSQL" id="bm_id1669362"
localize="false"/><paragraph role="heading" id="par_idN105E0" xml-lang="en-US"
level="2">View (Simple)</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DBNewViewSQL" id="bm_id1669362"
localize="false"/><h2 id="par_idN105E0">View (Simple)</h2>
<paragraph role="paragraph" id="par_idN105F6" xml-lang="en-US"><ahelp
hid=".">Opens a new view in SQL mode.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:DBNewFolder" id="bm_id17200231"
localize="false"/><paragraph role="heading" id="par_idN105F9" xml-lang="en-US"
level="2">Folder</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DBNewFolder" id="bm_id17200231"
localize="false"/><h2 id="par_idN105F9">Folder</h2>
<paragraph role="paragraph" id="par_idN1060F" xml-lang="en-US"><ahelp
hid=".">Opens a dialog where you can save a new folder in the database
file.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/menutools.xhp
b/source/text/sdatabase/menutools.xhp
similarity index 84%
rename from source/text/shared/explorer/database/menutools.xhp
rename to source/text/sdatabase/menutools.xhp
index 2f9cc8efa..f008b6491 100644
--- a/source/text/shared/explorer/database/menutools.xhp
+++ b/source/text/sdatabase/menutools.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,12 +16,11 @@
* 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="textsharedexplorerdatabasemenutoolsxml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">Tools</title>
-<filename>/text/shared/explorer/database/menutools.xhp</filename>
+<filename>/text/sdatabase/menutools.xhp</filename>
</topic>
<history>
<created date="2004-07-29T14:36:26">UFI: Tools menu of Database</created>
@@ -31,24 +28,24 @@
</meta>
<body>
<section id="tools">
-<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><link
href="text/shared/explorer/database/menutools.xhp">Tools</link></paragraph>
+<h1 id="par_idN1054D"><link
href="text/sdatabase/menutools.xhp">Tools</link></h1>
</section>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US">The Tools menu
of a database window.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBRelationDesign"
id="bm_id2862636" localize="false"/>
-<paragraph role="heading" id="par_idN10560" xml-lang="en-US"
level="2">Relationships</paragraph>
+<h2 id="par_idN10560">Relationships</h2>
<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US"><ahelp
hid=".">Opens the <link href="text/sdatabase/05020000.xhp">Relation
Design</link> view and checks whether the database connection supports
relations.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBUserAdmin" id="bm_id2447279"
localize="false"/>
-<paragraph role="heading" id="par_idN1058A" xml-lang="en-US" level="2">User
Administration</paragraph>
+<h2 id="par_idN1058A">User Administration</h2>
<paragraph role="paragraph" id="par_idN1058E" xml-lang="en-US"><ahelp
hid=".">Opens the User Administration dialog if the database supports this
feature.</ahelp><comment>UFI: where is this specced?</comment></paragraph>
<bookmark xml-lang="en-US"
branch="hid/dbaccess/ui/tablesfilterpage/TablesFilterPage" id="bm_id3153087"
localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DBTableFilter" id="bm_id4928739"
localize="false"/>
-<paragraph role="heading" id="hd_id3153880" xml-lang="en-US" level="2">Table
Filter</paragraph>
+<h2 id="hd_id3153880">Table Filter</h2>
<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US"><ahelp
hid=".">Opens the Table Filter dialog where you can specify which tables of the
database to show or to hide.</ahelp><comment>see text in
shared\explorer\database\11090000.xhp</comment></paragraph>
<paragraph role="paragraph" id="par_id3150670" xml-lang="en-US">Select the
tables that you want to filter in the <emph>Filter</emph> list.</paragraph>
<paragraph role="paragraph" id="par_id3150985" xml-lang="en-US">If you select
the topmost table in a hierarchy, all of the tables in the hierarchy are
selected.</paragraph>
<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US">If you select
a table that is at a lower level in the hierarchy, the tables that occur above
it in the hierarchy are not selected.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBDirectSQL" id="bm_id1669362"
localize="false"/>
-<paragraph role="heading" id="par_idN105BC" xml-lang="en-US"
level="2">SQL</paragraph>
+<h2 id="par_idN105BC">SQL</h2>
<paragraph role="paragraph" id="par_idN105C0" xml-lang="en-US"><ahelp
hid=".">Opens the SQL dialog where you can enter SQL
statements.</ahelp><comment>UFI: may be
shared\02\14030000.xhp</comment></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/menuview.xhp
b/source/text/sdatabase/menuview.xhp
similarity index 76%
rename from source/text/shared/explorer/database/menuview.xhp
rename to source/text/sdatabase/menuview.xhp
index 3502526ad..899b789fa 100644
--- a/source/text/shared/explorer/database/menuview.xhp
+++ b/source/text/sdatabase/menuview.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,12 +16,11 @@
* 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="textsharedexplorerdatabasemenuviewxml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">View</title>
-<filename>/text/shared/explorer/database/menuview.xhp</filename>
+<filename>/text/sdatabase/menuview.xhp</filename>
</topic>
<history>
<created date="2004-07-29T14:32:59">UFI: View menu of Database</created>
@@ -31,47 +28,47 @@
</meta>
<body>
<section id="view">
-<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><link
href="text/shared/explorer/database/menuview.xhp">View</link></paragraph>
+<h1 id="par_idN1054D"><link href="text/sdatabase/menuview.xhp">View</link></h1>
</section>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US">The View menu
of a database window.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBDatabaseObjectsMenu"
id="bm_id2862636a" localize="false"/>
-<paragraph role="heading" id="par_idN10560" xml-lang="en-US"
level="2">Database Objects</paragraph>
+<h2 id="par_idN10560">Database Objects</h2>
<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp
hid=".">Opens a submenu.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBViewForms" id="bm_id2447279"
localize="false"/>
-<paragraph role="heading" id="par_idN10567" xml-lang="en-US"
level="3">Forms</paragraph>
+<h3 id="par_idN10567">Forms</h3>
<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US"><ahelp
hid=".">Selects the forms container and shows all forms in the detail
view.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBViewReports" id="bm_id4928739"
localize="false"/>
-<paragraph role="heading" id="par_idN1056E" xml-lang="en-US"
level="3">Reports</paragraph>
+<h3 id="par_idN1056E">Reports</h3>
<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US"><ahelp
hid=".">Selects the reports container and shows all reports in the detail
view.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBViewQueries" id="bm_id1669362"
localize="false"/>
-<paragraph role="heading" id="par_idN10575" xml-lang="en-US"
level="3">Queries</paragraph>
+<h3 id="par_idN10575">Queries</h3>
<paragraph role="paragraph" id="par_idN10579" xml-lang="en-US"><ahelp
hid=".">Selects the queries container and shows all queries in the detail
view.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBViewTables" id="bm_id1720023"
localize="false"/>
-<paragraph role="heading" id="par_idN1057C" xml-lang="en-US"
level="3">Tables</paragraph>
+<h3 id="par_idN1057C">Tables</h3>
<paragraph role="paragraph" id="par_idN10580" xml-lang="en-US"><ahelp
hid=".">Selects the tables container and shows all tables in the detail
view.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBSort" id="bm_id2862636b"
localize="false"/>
-<paragraph role="heading" id="par_idN10583" xml-lang="en-US"
level="2">Sort</paragraph>
+<h2 id="par_idN10583">Sort</h2>
<paragraph role="paragraph" id="par_idN10587" xml-lang="en-US"><ahelp
hid=".">Opens a submenu.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:Sortup" id="bm_id2862636c"
localize="false"/>
-<paragraph role="heading" id="par_idN1058A" xml-lang="en-US"
level="3">Ascending</paragraph>
+<h3 id="par_idN1058A">Ascending</h3>
<paragraph role="paragraph" id="par_idN1058E" xml-lang="en-US"><ahelp
hid=".">Sorts the entries in the detail view in ascending
order.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:SortDown" id="bm_id2862636d"
localize="false"/>
-<paragraph role="heading" id="par_idN10591" xml-lang="en-US"
level="3">Descending</paragraph>
+<h3 id="par_idN10591">Descending</h3>
<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US"><ahelp
hid=".">Sorts the entries in the detail view in descending
order.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBPreview" id="bm_id24472791"
localize="false"/>
-<paragraph role="heading" id="par_idN10598" xml-lang="en-US"
level="2">Preview</paragraph>
+<h2 id="par_idN10598">Preview</h2>
<paragraph role="paragraph" id="par_idN1059C" xml-lang="en-US"><ahelp
hid=".">Opens a submenu.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBDisablePreview"
id="bm_id49287391" localize="false"/>
-<paragraph role="heading" id="par_idN1059F" xml-lang="en-US"
level="3">None</paragraph>
+<h3 id="par_idN1059F">None</h3>
<paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US"><ahelp
hid=".">Disables the preview in the database window.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBShowDocInfoPreview"
id="bm_id16693621" localize="false"/>
-<paragraph role="heading" id="par_idN105B8" xml-lang="en-US"
level="3">Document Information</paragraph>
+<h3 id="par_idN105B8">Document Information</h3>
<paragraph role="paragraph" id="par_idN105BC" xml-lang="en-US"><ahelp
hid=".">The preview window displays the document information of a form or
report.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBShowDocPreview"
id="bm_id17200231" localize="false"/>
-<paragraph role="heading" id="par_idN105BF" xml-lang="en-US"
level="3">Document</paragraph>
+<h3 id="par_idN105BF">Document</h3>
<paragraph role="paragraph" id="par_idN105C3" xml-lang="en-US"><ahelp
hid=".">The preview displays the document of a form or
report.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DBRefreshTables"
id="bm_id2862636c" localize="false"/>
-<paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2">Refresh
Tables</paragraph>
+<h2 id="par_idN105C6">Refresh Tables</h2>
<paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US"><ahelp
hid=".">Refreshes the tables. </ahelp><comment>what happens? cool drinks?
Icecream?</comment></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/guide/database_main.xhp
b/source/text/shared/guide/database_main.xhp
index 332255e07..3ad0d52be 100644
--- a/source/text/shared/guide/database_main.xhp
+++ b/source/text/shared/guide/database_main.xhp
@@ -42,7 +42,7 @@
<h2 id="hd_id3149047">Data Sources</h2>
<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US"><link
href="text/shared/guide/data_addressbook.xhp" name="address book as data
source">Address book as data source</link></paragraph>
<paragraph role="paragraph" id="par_id3150398" xml-lang="en-US"><link
href="text/shared/01/04180100.xhp" name="View data source contents">View data
source contents</link></paragraph>
-<paragraph role="paragraph" id="par_idN106A4" xml-lang="en-US"><link
href="text/shared/explorer/database/menubar.xhp">Menu bar of a database
file</link></paragraph>
+<paragraph role="paragraph" id="par_idN106A4" xml-lang="en-US"><link
href="text/sdatabase/menubar.xhp">Menu bar of a database file</link></paragraph>
<h2 id="hd_id3154123">Forms and Reports</h2>
<paragraph role="paragraph" id="par_id3154909" xml-lang="en-US"><link
href="text/sdatabase/04030000.xhp" name="Create new form document">Create new
form document</link>, <link href="text/shared/02/01170000.xhp" name="edit form
functions">edit form controls</link>, <link
href="text/shared/autopi/01090000.xhp">Form Wizard</link></paragraph>
<paragraph role="paragraph" id="par_id3152920" xml-lang="en-US"><link
href="text/shared/02/01170500.xhp" name="entering data versus editing
form">Entering data versus editing form</link></paragraph>
