summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2021-12-24 11:32:32 -0300
committerOlivier Hallot <olivier.hallot@libreoffice.org>2021-12-24 17:57:56 +0100
commit215707177c272f9fcf73a79b9150fe677b991716 (patch)
tree4142878c8fd6c183b74f51249f1b0ebc97fddac1
parenta35f8b648fd4bac70bbde0554a2d4051c7633cde (diff)
Refactor database files
Change-Id: If6acf26ea094234d06522c26c8bb8274c0abdaa5 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/127430 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
-rw-r--r--AllLangHelp_sdatabase.mk9
-rw-r--r--AllLangHelp_shared.mk9
-rw-r--r--source/text/sdatabase/querywizard00.xhp (renamed from source/text/shared/explorer/database/querywizard00.xhp)28
-rw-r--r--source/text/sdatabase/querywizard01.xhp (renamed from source/text/shared/explorer/database/querywizard01.xhp)16
-rw-r--r--source/text/sdatabase/querywizard02.xhp (renamed from source/text/shared/explorer/database/querywizard02.xhp)17
-rw-r--r--source/text/sdatabase/querywizard03.xhp (renamed from source/text/shared/explorer/database/querywizard03.xhp)19
-rw-r--r--source/text/sdatabase/querywizard04.xhp (renamed from source/text/shared/explorer/database/querywizard04.xhp)21
-rw-r--r--source/text/sdatabase/querywizard05.xhp (renamed from source/text/shared/explorer/database/querywizard05.xhp)14
-rw-r--r--source/text/sdatabase/querywizard06.xhp (renamed from source/text/shared/explorer/database/querywizard06.xhp)19
-rw-r--r--source/text/sdatabase/querywizard07.xhp (renamed from source/text/shared/explorer/database/querywizard07.xhp)11
-rw-r--r--source/text/sdatabase/querywizard08.xhp (renamed from source/text/shared/explorer/database/querywizard08.xhp)17
-rw-r--r--source/text/shared/guide/data_queries.xhp2
-rw-r--r--source/text/shared/guide/database_main.xhp2
-rw-r--r--source/text/shared/guide/main.xhp2
14 files changed, 84 insertions, 102 deletions
diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index 736b1abb48..6d607cb603 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -75,6 +75,15 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
helpcontent2/source/text/sdatabase/menuview \
helpcontent2/source/text/sdatabase/migrate_macros \
helpcontent2/source/text/sdatabase/password \
+ helpcontent2/source/text/sdatabase/querywizard00 \
+ helpcontent2/source/text/sdatabase/querywizard01 \
+ helpcontent2/source/text/sdatabase/querywizard02 \
+ helpcontent2/source/text/sdatabase/querywizard03 \
+ helpcontent2/source/text/sdatabase/querywizard04 \
+ helpcontent2/source/text/sdatabase/querywizard05 \
+ helpcontent2/source/text/sdatabase/querywizard06 \
+ helpcontent2/source/text/sdatabase/querywizard07 \
+ helpcontent2/source/text/sdatabase/querywizard08 \
helpcontent2/source/text/sdatabase/tablewizard00 \
helpcontent2/source/text/sdatabase/tablewizard01 \
helpcontent2/source/text/sdatabase/tablewizard02 \
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 6e19148d10..03f5e3d5bb 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -870,15 +870,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
))
$(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
- helpcontent2/source/text/shared/explorer/database/querywizard00 \
- helpcontent2/source/text/shared/explorer/database/querywizard01 \
- helpcontent2/source/text/shared/explorer/database/querywizard02 \
- helpcontent2/source/text/shared/explorer/database/querywizard03 \
- helpcontent2/source/text/shared/explorer/database/querywizard04 \
- helpcontent2/source/text/shared/explorer/database/querywizard05 \
- helpcontent2/source/text/shared/explorer/database/querywizard06 \
- helpcontent2/source/text/shared/explorer/database/querywizard07 \
- helpcontent2/source/text/shared/explorer/database/querywizard08 \
helpcontent2/source/text/shared/explorer/database/rep_datetime \
helpcontent2/source/text/shared/explorer/database/rep_insertfield \
helpcontent2/source/text/shared/explorer/database/rep_main \
diff --git a/source/text/shared/explorer/database/querywizard00.xhp b/source/text/sdatabase/querywizard00.xhp
index ffe7474007..314f14c932 100644
--- a/source/text/shared/explorer/database/querywizard00.xhp
+++ b/source/text/sdatabase/querywizard00.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,32 +18,32 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textsharedexplorerdatabasequerywizard00xml" indexer="include">
<title id="tit" xml-lang="en-US">Query Wizard</title>
-<filename>/text/shared/explorer/database/querywizard00.xhp</filename>
+<filename>/text/sdatabase/querywizard00.xhp</filename>
</topic>
</meta>
<body>
<section id="querywizard"><comment>mw deleted 2 index entries</comment>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD" id="bm_id1895159" localize="false"/>
-<paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/querywizard00.xhp">Query Wizard</link></paragraph>
+<h1 id="par_idN1054C"><link href="text/sdatabase/querywizard00.xhp">Query Wizard</link></h1>
<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US"><ahelp hid=".">The Query Wizard helps you to design a database query.</ahelp> The saved query can be called later, either from the graphical user interface, or using the automatically created SQL language command.</paragraph>
</section>
-<embed href="text/shared/explorer/database/querywizard01.xhp#fieldselection"/>
-<embed href="text/shared/explorer/database/querywizard02.xhp#sortingorder"/>
-<embed href="text/shared/explorer/database/querywizard03.xhp#searchconditions"/>
-<embed href="text/shared/explorer/database/querywizard04.xhp#detail"/>
-<embed href="text/shared/explorer/database/querywizard05.xhp#grouping"/>
-<embed href="text/shared/explorer/database/querywizard06.xhp#groupingconditions"/>
-<embed href="text/shared/explorer/database/querywizard07.xhp#aliases"/>
-<embed href="text/shared/explorer/database/querywizard08.xhp#overview"/>
+<embed href="text/sdatabase/querywizard01.xhp#fieldselection"/>
+<embed href="text/sdatabase/querywizard02.xhp#sortingorder"/>
+<embed href="text/sdatabase/querywizard03.xhp#searchconditions"/>
+<embed href="text/sdatabase/querywizard04.xhp#detail"/>
+<embed href="text/sdatabase/querywizard05.xhp#grouping"/>
+<embed href="text/sdatabase/querywizard06.xhp#groupingconditions"/>
+<embed href="text/sdatabase/querywizard07.xhp#aliases"/>
+<embed href="text/sdatabase/querywizard08.xhp#overview"/>
<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"/>
-<paragraph role="paragraph" id="par_idN105D2" xml-lang="en-US"><link href="text/shared/explorer/database/querywizard01.xhp" name="Query Wizard - Field Selection">Query Wizard - Field selection</link></paragraph>
+<paragraph role="paragraph" id="par_idN105D2" xml-lang="en-US"><link href="text/sdatabase/querywizard01.xhp" name="Query Wizard - Field Selection">Query Wizard - Field selection</link></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/querywizard01.xhp b/source/text/sdatabase/querywizard01.xhp
index 16eb42baa1..7570c3daae 100644
--- a/source/text/shared/explorer/database/querywizard01.xhp
+++ b/source/text/sdatabase/querywizard01.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,21 +18,21 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textsharedexplorerdatabasequerywizard01xml" indexer="include">
<title id="tit" xml-lang="en-US">Query Wizard - Field Selection</title>
-<filename>/text/shared/explorer/database/querywizard01.xhp</filename>
+<filename>/text/sdatabase/querywizard01.xhp</filename>
</topic>
</meta>
<body>
<section id="fieldselection">
-<paragraph role="heading" id="par_idN10546" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/querywizard01.xhp">Query Wizard - Field Selection</link></paragraph>
+<h1 id="par_idN10546"><link href="text/sdatabase/querywizard01.xhp">Query Wizard - Field Selection</link></h1>
<paragraph role="paragraph" id="par_idN10556" xml-lang="en-US">Specifies the table to create the query, and specifies which fields you wish to include in the query.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTTABLES" id="bm_id8819849" localize="false"/>
-<paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2">Tables</paragraph>
+<h2 id="par_idN10559">Tables</h2>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US"><ahelp hid=".">Specifies the table for which the query is to be created.</ahelp></paragraph>
<embed href="text/shared/autopi/01090100.xhp#available_fields"/>
<embed href="text/shared/autopi/01090100.xhp#take"/>
@@ -41,8 +41,8 @@
<embed href="text/shared/autopi/01090100.xhp#remove_all"/>
<embed href="text/shared/autopi/01090100.xhp#updown"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTSELFIELDS" id="bm_id5718253" localize="false"/>
-<paragraph role="heading" id="par_idN10590" xml-lang="en-US" level="2">Fields in the Query</paragraph>
+<h2 id="par_idN10590">Fields in the Query</h2>
<paragraph role="paragraph" id="par_idN10594" xml-lang="en-US"><ahelp hid=".">Displays all fields that will be included in the new query.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US"><link href="text/shared/explorer/database/querywizard02.xhp" name="Query Wizard - Sorting order">Query Wizard - Sorting order</link></paragraph>
+<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US"><link href="text/sdatabase/querywizard02.xhp" name="Query Wizard - Sorting order">Query Wizard - Sorting order</link></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/querywizard02.xhp b/source/text/sdatabase/querywizard02.xhp
index 10d4ed3339..897d480e53 100644
--- a/source/text/shared/explorer/database/querywizard02.xhp
+++ b/source/text/sdatabase/querywizard02.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="textsharedexplorerdatabasequerywizard02xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Query Wizard - Sorting Order</title>
-<filename>/text/shared/explorer/database/querywizard02.xhp</filename>
+<filename>/text/sdatabase/querywizard02.xhp</filename>
</topic>
<history>
<created date="2004-07-05T16:52:34">UFI: new Query Wizard page 2</created>
@@ -31,29 +28,29 @@
</meta>
<body>
<section id="sortingorder">
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/querywizard02.xhp">Query Wizard - Sorting Order</link></paragraph>
+<h1 id="par_idN10543"><link href="text/sdatabase/querywizard02.xhp">Query Wizard - Sorting Order</link></h1>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US">Specifies the sorting order for the data records in your query.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_SORT1" id="bm_id1624805" localize="false"/>
-<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2">Sort by</paragraph>
+<h2 id="par_idN10556">Sort by</h2>
<paragraph role="paragraph" id="par_idN105B2" xml-lang="en-US"><ahelp hid=".">Specifies the field by which the created query is sorted.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTASCEND1" id="bm_id7582934" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTASCEND2" id="bm_id5498825" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTASCEND3" id="bm_id9416486" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTASCEND4" id="bm_id3401287" localize="false"/>
-<paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="3">Ascending</paragraph>
+<h3 id="par_idN1055C">Ascending</h3>
<paragraph role="paragraph" id="par_idN105BF" xml-lang="en-US"><ahelp hid=".">Click to sort in alphabetically or numerically ascending order.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTDESCEND1" id="bm_id4680013" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTDESCEND2" id="bm_id9574571" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTDESCEND3" id="bm_id5775933" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTDESCEND4" id="bm_id5564439" localize="false"/>
-<paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="3">Descending</paragraph>
+<h3 id="par_idN10562">Descending</h3>
<paragraph role="paragraph" id="par_idN105CC" xml-lang="en-US"><ahelp hid=".">Click to sort in alphabetically or numerically descending order.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_SORT2" id="bm_id9547715" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_SORT3" id="bm_id5757316" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_SORT4" id="bm_id6009094" localize="false"/>
-<paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2">And then by</paragraph>
+<h2 id="par_idN10568">And then by</h2>
<paragraph role="paragraph" id="par_idN105D9" xml-lang="en-US"><ahelp hid=".">Specifies additional fields by which the created query is sorted, if previous sort fields are equal.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN1056E" xml-lang="en-US"><link href="text/shared/explorer/database/querywizard03.xhp" name="Query Wizard - Search conditions">Query Wizard - Search conditions</link></paragraph>
+<paragraph role="paragraph" id="par_idN1056E" xml-lang="en-US"><link href="text/sdatabase/querywizard03.xhp" name="Query Wizard - Search conditions">Query Wizard - Search conditions</link></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/querywizard03.xhp b/source/text/sdatabase/querywizard03.xhp
index bc4c9c1661..f8215fe7f7 100644
--- a/source/text/shared/explorer/database/querywizard03.xhp
+++ b/source/text/sdatabase/querywizard03.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="textsharedexplorerdatabasequerywizard03xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Query Wizard - Search Conditions</title>
-<filename>/text/shared/explorer/database/querywizard03.xhp</filename>
+<filename>/text/sdatabase/querywizard03.xhp</filename>
</topic>
<history>
<created date="2004-07-05T16:59:50">UFI: new Query Wizard page 3</created>
@@ -31,30 +28,30 @@
</meta>
<body>
<section id="searchconditions">
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/querywizard03.xhp">Query Wizard - Search Conditions</link></paragraph>
+<h1 id="par_idN10543"><link href="text/sdatabase/querywizard03.xhp">Query Wizard - Search Conditions</link></h1>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US">Specifies the search conditions to filter the query. </paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTMATCHALL" id="bm_id7941526" localize="false"/>
-<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2">Match all of the following</paragraph>
+<h2 id="par_idN10556">Match all of the following</h2>
<paragraph role="paragraph" id="par_idN105B2" xml-lang="en-US"><ahelp hid=".">Select to filter the query by all the conditions using a logical AND.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTMATCHANY" id="bm_id8292489" localize="false"/>
-<paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2">Match any of the following</paragraph>
+<h2 id="par_idN1055C">Match any of the following</h2>
<paragraph role="paragraph" id="par_idN105BF" xml-lang="en-US"><ahelp hid=".">Select to filter the query by any of the conditions using a logical OR.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_1" id="bm_id3359477" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_2" id="bm_id3269447" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_3" id="bm_id6917630" localize="false"/>
-<paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="3">Field</paragraph>
+<h3 id="par_idN10562">Field</h3>
<paragraph role="paragraph" id="par_idN105CC" xml-lang="en-US"><ahelp hid=".">Select the field name for the filter condition.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_1" id="bm_id1973937" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_2" id="bm_id9367046" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_3" id="bm_id8345286" localize="false"/>
-<paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="3">Condition</paragraph>
+<h3 id="par_idN10568">Condition</h3>
<paragraph role="paragraph" id="par_idN105D9" xml-lang="en-US"><ahelp hid=".">Select the condition for the filter.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTVALUE_1" id="bm_id1222266" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTVALUE_2" id="bm_id2625812" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTVALUE_3" id="bm_id251167" localize="false"/>
-<paragraph role="heading" id="par_idN1056E" xml-lang="en-US" level="3">Value</paragraph>
+<h3 id="par_idN1056E">Value</h3>
<paragraph role="paragraph" id="par_idN105E6" xml-lang="en-US"><ahelp hid=".">Enter the value for the filter condition.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10574" xml-lang="en-US"><link href="text/shared/explorer/database/querywizard04.xhp" name="Query Wizard - Detail or Summary">Query Wizard - Detail or summary</link></paragraph>
+<paragraph role="paragraph" id="par_idN10574" xml-lang="en-US"><link href="text/sdatabase/querywizard04.xhp" name="Query Wizard - Detail or Summary">Query Wizard - Detail or summary</link></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/querywizard04.xhp b/source/text/sdatabase/querywizard04.xhp
index d22a8d98b6..6d891a748c 100644
--- a/source/text/shared/explorer/database/querywizard04.xhp
+++ b/source/text/sdatabase/querywizard04.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="textsharedexplorerdatabasequerywizard04xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Query Wizard - Detail or Summary</title>
-<filename>/text/shared/explorer/database/querywizard04.xhp</filename>
+<filename>/text/sdatabase/querywizard04.xhp</filename>
</topic>
<history>
<created date="2004-07-06T08:38:05">UFI: new Query Wizard page 4</created>
@@ -31,29 +28,29 @@
</meta>
<body>
<section id="detail">
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/querywizard04.xhp">Query Wizard - Detail or Summary</link></paragraph>
+<h1 id="par_idN10543"><link href="text/sdatabase/querywizard04.xhp">Query Wizard - Detail or Summary</link></h1>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US">Specifies whether to display all records of the query, or only the results of aggregate functions. </paragraph>
<paragraph role="paragraph" id="par_idN10556" xml-lang="en-US">This page is only displayed when there are numerical fields in the query that allow the use of aggregate functions.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY" id="bm_id3563035" localize="false"/>
-<paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2">Detailed query</paragraph>
+<h2 id="par_idN10559">Detailed query</h2>
<paragraph role="paragraph" id="par_idN105BD" xml-lang="en-US"><ahelp hid=".">Select to show all records of the query.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY" id="bm_id9215063" localize="false"/>
-<paragraph role="heading" id="par_idN105C2" xml-lang="en-US" level="2">Summary query</paragraph>
+<h2 id="par_idN105C2">Summary query</h2>
<paragraph role="paragraph" id="par_idN105C8" xml-lang="en-US"><ahelp hid=".">Select to show only results of aggregate functions.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN105D7" xml-lang="en-US">Select the aggregate function and the field name of the numeric field in the list box. You can enter as many aggregate functions as you want, one in each row of controls.</paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1" id="bm_id4928128" localize="false"/>
-<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="3">Aggregate function</paragraph>
+<h3 id="par_idN1055D">Aggregate function</h3>
<paragraph role="paragraph" id="par_idN105E4" xml-lang="en-US"><ahelp hid=".">Select the aggregate function.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1" id="bm_id8988921" localize="false"/>
-<paragraph role="heading" id="par_idN105DD" xml-lang="en-US" level="3">Field name</paragraph>
+<h3 id="par_idN105DD">Field name</h3>
<paragraph role="paragraph" id="par_idN10656" xml-lang="en-US"><ahelp hid=".">Select the numeric field name.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEPLUS" id="bm_id2591631" localize="false"/>
-<paragraph role="heading" id="par_idN105E7" xml-lang="en-US" level="3">+</paragraph>
+<h3 id="par_idN105E7">+</h3>
<paragraph role="paragraph" id="par_idN105FE" xml-lang="en-US"><ahelp hid=".">Appends a new row of controls.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS" id="bm_id3288674" localize="false"/>
-<paragraph role="heading" id="par_idN105F1" localize="false" level="3">−</paragraph>
+<h3 id="par_idN105F1">−</h3>
<paragraph role="paragraph" id="par_idN1060B" xml-lang="en-US"><ahelp hid=".">Removes the last row of controls.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN1060E" xml-lang="en-US"><link href="text/shared/explorer/database/querywizard05.xhp" name="Query Wizard - Grouping">Query Wizard - Grouping</link></paragraph>
+<paragraph role="paragraph" id="par_idN1060E" xml-lang="en-US"><link href="text/sdatabase/querywizard05.xhp" name="Query Wizard - Grouping">Query Wizard - Grouping</link></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/querywizard05.xhp b/source/text/sdatabase/querywizard05.xhp
index 058d394201..d4c8a5a33b 100644
--- a/source/text/shared/explorer/database/querywizard05.xhp
+++ b/source/text/sdatabase/querywizard05.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,17 +18,17 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textsharedexplorerdatabasequerywizard05xml" indexer="include">
<title id="tit" xml-lang="en-US">Query Wizard - Grouping</title>
-<filename>/text/shared/explorer/database/querywizard05.xhp</filename>
+<filename>/text/sdatabase/querywizard05.xhp</filename>
</topic>
</meta>
<body>
<section id="grouping">
-<paragraph role="heading" id="par_idN10546" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/querywizard05.xhp">Query Wizard - Grouping</link></paragraph>
+<h1 id="par_idN10546"><link href="text/sdatabase/querywizard05.xhp">Query Wizard - Grouping</link></h1>
<paragraph role="paragraph" id="par_idN10556" xml-lang="en-US">Specifies whether to group the query. The data source must support the SQL statement "Group by clauses" to enable this page of the Wizard.</paragraph>
</section>
<embed href="text/shared/autopi/01090100.xhp#available_fields"/>
@@ -36,8 +36,8 @@
<embed href="text/shared/autopi/01090100.xhp#remove"/>
<embed href="text/shared/autopi/01090100.xhp#updown"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTERSELFIELDS" id="bm_id1776482" localize="false"/>
-<paragraph role="heading" id="par_idN10589" xml-lang="en-US" level="2">Group by</paragraph>
+<h2 id="par_idN10589">Group by</h2>
<paragraph role="paragraph" id="par_idN1058D" xml-lang="en-US"><ahelp hid=".">Displays all fields that are to be used to group the query.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US"><link href="text/shared/explorer/database/querywizard06.xhp" name="Query Wizard - Grouping conditions">Query Wizard - Grouping conditions</link></paragraph>
+<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US"><link href="text/sdatabase/querywizard06.xhp" name="Query Wizard - Grouping conditions">Query Wizard - Grouping conditions</link></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/querywizard06.xhp b/source/text/sdatabase/querywizard06.xhp
index 0f5c69f341..6d76dcd9ef 100644
--- a/source/text/shared/explorer/database/querywizard06.xhp
+++ b/source/text/sdatabase/querywizard06.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="textsharedexplorerdatabasequerywizard06xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Query Wizard - Grouping Conditions</title>
-<filename>/text/shared/explorer/database/querywizard06.xhp</filename>
+<filename>/text/sdatabase/querywizard06.xhp</filename>
</topic>
<history>
<created date="2004-07-06T10:00:57">UFI: new Query Wizard page 6</created>
@@ -31,30 +28,30 @@
</meta>
<body>
<section id="groupingconditions">
-<paragraph role="heading" id="par_idN10546" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/querywizard06.xhp">Query Wizard - Grouping Conditions</link></paragraph>
+<h1 id="par_idN10546"><link href="text/sdatabase/querywizard06.xhp">Query Wizard - Grouping Conditions</link></h1>
<paragraph role="paragraph" id="par_idN10556" xml-lang="en-US">Specifies the conditions to group the query. The data source must support the SQL statement "Group by clauses" to enable this page of the Wizard.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHALL" id="bm_id8115176" localize="false"/>
-<paragraph role="heading" id="par_idN10559" xml-lang="en-US" level="2">Match all of the following</paragraph>
+<h2 id="par_idN10559">Match all of the following</h2>
<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US"><ahelp hid=".">Select to group the query by all the conditions using a logical AND.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTGROUPMATCHANY" id="bm_id8760948" localize="false"/>
-<paragraph role="heading" id="par_idN10560" xml-lang="en-US" level="2">Match any of the following</paragraph>
+<h2 id="par_idN10560">Match any of the following</h2>
<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp hid=".">Select to group the query by any of the conditions using a logical OR.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_1" id="bm_id9920041.00000001" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_2" id="bm_id9279457" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDNAME_3" id="bm_id1897946" localize="false"/>
-<paragraph role="heading" id="par_idN10567" xml-lang="en-US" level="3">Field name</paragraph>
+<h3 id="par_idN10567">Field name</h3>
<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US"><ahelp hid=".">Select the field name for the grouping condition.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_1" id="bm_id6163823" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_2" id="bm_id2742088" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_LSTFILTEROPERATOR_3" id="bm_id465102" localize="false"/>
-<paragraph role="heading" id="par_idN1056E" xml-lang="en-US" level="3">Condition</paragraph>
+<h3 id="par_idN1056E">Condition</h3>
<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US"><ahelp hid=".">Select the condition for the grouping.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_1" id="bm_id1756340" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_2" id="bm_id8361766" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTFILTERVALUE_3" id="bm_id2075563" localize="false"/>
-<paragraph role="heading" id="par_idN10575" xml-lang="en-US" level="3">Value</paragraph>
+<h3 id="par_idN10575">Value</h3>
<paragraph role="paragraph" id="par_idN10579" xml-lang="en-US"><ahelp hid=".">Enter the value for the grouping condition.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US"><link href="text/shared/explorer/database/querywizard07.xhp" name="Query Wizard - Aliases">Query Wizard - Aliases</link></paragraph>
+<paragraph role="paragraph" id="par_idN1057C" xml-lang="en-US"><link href="text/sdatabase/querywizard07.xhp" name="Query Wizard - Aliases">Query Wizard - Aliases</link></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/querywizard07.xhp b/source/text/sdatabase/querywizard07.xhp
index 449c11b4f0..b62e10a0ec 100644
--- a/source/text/shared/explorer/database/querywizard07.xhp
+++ b/source/text/sdatabase/querywizard07.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="textsharedexplorerdatabasequerywizard07xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Query Wizard - Aliases</title>
-<filename>/text/shared/explorer/database/querywizard07.xhp</filename>
+<filename>/text/sdatabase/querywizard07.xhp</filename>
</topic>
<history>
<created date="2004-07-06T10:12:16">UFI: new Query Wizard page 7</created>
@@ -31,12 +28,12 @@
</meta>
<body>
<section id="aliases">
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/querywizard07.xhp">Query Wizard - Aliases</link></paragraph>
+<h1 id="par_idN10543"><link href="text/sdatabase/querywizard07.xhp">Query Wizard - Aliases</link></h1>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US">Assigns aliases to field names. Aliases are optional, and can provide more user-friendly names, which are displayed in place of field names. For example, an alias can be used when fields from different tables have the same name.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTTITLE_1" id="bm_id2467421" localize="false"/>
-<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2">Alias</paragraph>
+<h2 id="par_idN10556">Alias</h2>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US"><ahelp hid=".">Enter the alias for the field name.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US"><link href="text/shared/explorer/database/querywizard08.xhp" name="Query Wizard - Overview">Query Wizard - Overview</link></paragraph>
+<paragraph role="paragraph" id="par_idN1055D" xml-lang="en-US"><link href="text/sdatabase/querywizard08.xhp" name="Query Wizard - Overview">Query Wizard - Overview</link></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/querywizard08.xhp b/source/text/sdatabase/querywizard08.xhp
index f94b755a7c..a511de4ed3 100644
--- a/source/text/shared/explorer/database/querywizard08.xhp
+++ b/source/text/sdatabase/querywizard08.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="textsharedexplorerdatabasequerywizard08xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Query Wizard - Overview</title>
-<filename>/text/shared/explorer/database/querywizard08.xhp</filename>
+<filename>/text/sdatabase/querywizard08.xhp</filename>
</topic>
<history>
<created date="2004-07-06T10:23:58">UFI: new Query Wizard page 8</created>
@@ -31,21 +28,21 @@
</meta>
<body>
<section id="overview">
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/querywizard08.xhp">Query Wizard - Overview</link></paragraph>
+<h1 id="par_idN10543"><link href="text/sdatabase/querywizard08.xhp">Query Wizard - Overview</link></h1>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US">Enter a name of the query, and specify whether you want to display or to modify the query after the Wizard is finished.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTQUERYTITLE" id="bm_id3238319" localize="false"/>
-<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2">Name of the query</paragraph>
+<h2 id="par_idN10556">Name of the query</h2>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US"><ahelp hid=".">Enter the name of the query.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTDISPLAYQUERY" id="bm_id1403241" localize="false"/>
-<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2">Display query</paragraph>
+<h2 id="par_idN1055D">Display query</h2>
<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US"><ahelp hid=".">Select to save and display the query.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_OPTMODIFYQUERY" id="bm_id2776268" localize="false"/>
-<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2">Modify query</paragraph>
+<h2 id="par_idN10564">Modify query</h2>
<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US"><ahelp hid=".">Select to save the query and open it for editing.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_QUERYWIZARD_TXTSUMMARY" id="bm_id4912869" localize="false"/>
-<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2">Overview</paragraph>
+<h2 id="par_idN1056B">Overview</h2>
<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US"><ahelp hid=".">Displays a summary of the query.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US"><link href="text/shared/explorer/database/querywizard00.xhp" name="Query Wizard">Query Wizard</link></paragraph>
+<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US"><link href="text/sdatabase/querywizard00.xhp" name="Query Wizard">Query Wizard</link></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/guide/data_queries.xhp b/source/text/shared/guide/data_queries.xhp
index b7347fffcc..82ab190591 100644
--- a/source/text/shared/guide/data_queries.xhp
+++ b/source/text/shared/guide/data_queries.xhp
@@ -41,7 +41,7 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US">If you often want to access only a subset of your data that can be well defined by a filter condition, you can define a query. This is basically a name for the new view at the filtered data. You open the query and see the current data in the table layout that you defined.</paragraph>
<paragraph role="heading" id="par_idN1061A" xml-lang="en-US" level="2">Creating a New Query With the Query Wizard</paragraph>
-<paragraph role="paragraph" id="par_idN1061E" xml-lang="en-US">In %PRODUCTNAME you can create a new query using the <link href="text/shared/explorer/database/querywizard00.xhp">Query Wizard</link>:</paragraph>
+<paragraph role="paragraph" id="par_idN1061E" xml-lang="en-US">In %PRODUCTNAME you can create a new query using the <link href="text/sdatabase/querywizard00.xhp">Query Wizard</link>:</paragraph>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_idN10632" xml-lang="en-US">Open the database file where you want to create the new query.</paragraph>
diff --git a/source/text/shared/guide/database_main.xhp b/source/text/shared/guide/database_main.xhp
index 6a142d0005..ec874dc4e4 100644
--- a/source/text/shared/guide/database_main.xhp
+++ b/source/text/shared/guide/database_main.xhp
@@ -50,7 +50,7 @@
<embed href="text/shared/guide/data_report.xhp#data_report"/>
<h2 id="hd_id3145606">Queries</h2>
<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US"><link href="text/sdatabase/02000000.xhp" name="Create new query or table view, edit query structure">Create new query or table view, edit query structure</link></paragraph>
-<paragraph role="paragraph" id="par_idN1072A" xml-lang="en-US"><link href="text/shared/explorer/database/querywizard00.xhp">Query Wizard</link></paragraph>
+<paragraph role="paragraph" id="par_idN1072A" xml-lang="en-US"><link href="text/sdatabase/querywizard00.xhp">Query Wizard</link></paragraph>
<paragraph role="paragraph" id="par_id3155430" xml-lang="en-US"><link href="text/shared/01/05340400.xhp" name="Enter, edit and copy records">Enter, edit and copy records</link></paragraph>
<h2 id="hd_id3147287">Tables</h2>
<paragraph role="paragraph" id="par_id3163713" xml-lang="en-US"><link href="text/sdatabase/05010000.xhp" name="Create new table, edit table structure">Create new table, edit table structure</link>, <link href="text/sdatabase/05010100.xhp" name="index">index</link>, <link href="text/sdatabase/05020000.xhp" name="relations">relations</link></paragraph>
diff --git a/source/text/shared/guide/main.xhp b/source/text/shared/guide/main.xhp
index c962100ac7..a3f45acf2e 100644
--- a/source/text/shared/guide/main.xhp
+++ b/source/text/shared/guide/main.xhp
@@ -115,7 +115,7 @@
<h2 id="hd_id3152576" xml-lang="en-US">Data Sources</h2>
<paragraph id="par_idN10826" role="paragraph" xml-lang="en-US"><link href="text/sdatabase/main.xhp">Working with databases in %PRODUCTNAME</link></paragraph>
<paragraph id="par_idN10841" role="paragraph" xml-lang="en-US"><link href="text/sdatabase/tablewizard00.xhp">Table Wizard</link></paragraph>
-<paragraph id="par_idN1085B" role="paragraph" xml-lang="en-US"><link href="text/shared/explorer/database/querywizard00.xhp">Query Wizard</link></paragraph>
+<paragraph id="par_idN1085B" role="paragraph" xml-lang="en-US"><link href="text/sdatabase/querywizard00.xhp">Query Wizard</link></paragraph>
<paragraph id="par_idN10875" role="paragraph" xml-lang="en-US"><link href="text/shared/autopi/01090000.xhp">Forms Wizard</link></paragraph>
<paragraph id="par_id3154011" role="paragraph" xml-lang="en-US"><link href="text/shared/autopi/01100000.xhp">Report Wizard</link></paragraph>
<embed href="text/shared/guide/database_main.xhp#database_main"/>