AllLangHelp_sdatabase.mk | 2 ++
AllLangHelp_shared.mk | 2 --
source/text/sdatabase/02000000.xhp | 25 ++++++++++---------------
source/text/sdatabase/02000002.xhp | 21 ++++++++-------------
source/text/shared/guide/database_main.xhp | 2 +-
5 files changed, 21 insertions(+), 31 deletions(-)
New commits:
commit 971425d46a52037cc1bead7c0a1054d84c10e56b
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Mon Jun 29 16:04:38 2020 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Mon Jun 29 21:08:39 2020 +0200
refactor some database Help files
Change-Id: Ia3ad2896015c335450d0970d8cf51044473e249e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/97456
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index d438789b8..95b1c6b14 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -17,6 +17,8 @@ $(eval $(call gb_AllLangHelp_use_linked_modules,sdatabase,\
$(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
helpcontent2/source/text/sdatabase/main \
+ helpcontent2/source/text/sdatabase/02000000 \
+ helpcontent2/source/text/sdatabase/02000002 \
))
# vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 34fbafb3d..7664dc444 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -854,8 +854,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
))
$(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
- helpcontent2/source/text/shared/explorer/database/02000000 \
- helpcontent2/source/text/shared/explorer/database/02000002 \
helpcontent2/source/text/shared/explorer/database/02010100 \
helpcontent2/source/text/shared/explorer/database/02010101 \
helpcontent2/source/text/shared/explorer/database/04000000 \
diff --git a/source/text/shared/explorer/database/02000000.xhp
b/source/text/sdatabase/02000000.xhp
similarity index 73%
rename from source/text/shared/explorer/database/02000000.xhp
rename to source/text/sdatabase/02000000.xhp
index d73d23d62..2a6c9903a 100644
--- a/source/text/shared/explorer/database/02000000.xhp
+++ b/source/text/sdatabase/02000000.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,13 +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">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedexplorerdatabase02000000xml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">Queries</title>
-<filename>/text/shared/explorer/database/02000000.xhp</filename>
+<filename>/text/sdatabase/02000000.xhp</filename>
</topic>
</meta>
<body>
@@ -34,14 +29,14 @@
<bookmark_value>tables in databases; printing queries (Base)</bookmark_value>
<bookmark_value>printing; queries (Base)</bookmark_value>
<bookmark_value>queries; printing (Base)</bookmark_value>
-</bookmark><comment>mw added "(Base)" to all entries </comment><paragraph
role="heading" id="hd_id3150445" xml-lang="en-US" level="1"><link
href="text/shared/explorer/database/02000000.xhp"
name="Queries">Queries</link></paragraph>
+</bookmark><comment>mw added "(Base)" to all entries </comment><h1
id="hd_id3150445"><link href="text/sdatabase/02000000.xhp"
name="Queries">Queries</link></h1>
<paragraph role="paragraph" id="par_id3150499" xml-lang="en-US">A "query" is a
special view of a table. A query can display chosen records or chosen fields
within records; it can also sort those records. A query can apply to one table
or to multiple tables, if they are linked by common data
fields.<comment>i73680</comment></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000450.xhp#Abfragen"/>
</section>
<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US">Use queries to
find records from data tables based on certain criteria. All queries created
for a database are listed under the <emph>Queries</emph> entry. Since this
entry contains the database queries, it is also called the "query
container".</paragraph>
-<paragraph role="heading" id="hd_id3153750" xml-lang="en-US"
level="2">Printing Queries</paragraph>
+<h2 id="hd_id3153750">Printing Queries</h2>
<paragraph role="paragraph" id="par_id3149183" xml-lang="en-US">To print a
query or table:</paragraph>
<list type="ordered">
<listitem>
@@ -61,17 +56,17 @@
<paragraph role="listitem" id="par_id3150503" xml-lang="en-US">Print the
document by choosing <emph>File - Print</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="tip" id="par_id3153146" xml-lang="en-US">You can also open
the data source view (Ctrl+Shift+F4), select the entire database table in the
data source view (click on the top left corner of the table), and then drag the
selection to a text document or spreadsheet.</paragraph>
-<paragraph role="heading" id="hd_id3148946" xml-lang="en-US" level="2"><link
href="text/shared/main0212.xhp" name="Sorting and Filtering Data">Sorting and
Filtering Data</link></paragraph>
+<tip id="par_id3153146">You can also open the data source view
(Ctrl+Shift+F4), select the entire database table in the data source view
(click on the top left corner of the table), and then drag the selection to a
text document or spreadsheet.</tip>
+<h2 id="hd_id3148946"><link href="text/shared/main0212.xhp" name="Sorting and
Filtering Data">Sorting and Filtering Data</link></h2>
<paragraph role="paragraph" id="par_id3149655" xml-lang="en-US">Allows you to
sort and filter the data in a query table.</paragraph>
-<paragraph role="heading" id="hd_id3153379" xml-lang="en-US" level="2"><link
href="text/shared/explorer/database/02010100.xhp" name="Query Design">Query
Design</link></paragraph>
+<h2 id="hd_id3153379"><link href="text/shared/explorer/database/02010100.xhp"
name="Query Design">Query Design</link></h2>
<paragraph role="paragraph" id="par_id3151211" xml-lang="en-US">With the
<emph>Query Design</emph>, you can create and edit a query or view.</paragraph>
<embed href="text/shared/main0214.xhp#sql"/>
-<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="2"><link
href="text/shared/explorer/database/02010100.xhp" name="Query Through Several
Tables">Query Through Several Tables</link></paragraph>
+<h2 id="hd_id3153968"><link href="text/shared/explorer/database/02010100.xhp"
name="Query Through Several Tables">Query Through Several Tables</link></h2>
<paragraph role="paragraph" id="par_id3151043" xml-lang="en-US">The query
result can contain data from several tables if these are linked to each other
by suitable data fields.</paragraph>
-<paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="2"><link
href="text/shared/explorer/database/02010100.xhp" name="Formulating Query
Criteria">Formulating Query Criteria</link></paragraph>
+<h2 id="hd_id3159149"><link href="text/shared/explorer/database/02010100.xhp"
name="Formulating Query Criteria">Formulating Query Criteria</link></h2>
<paragraph role="paragraph" id="par_id3154910" xml-lang="en-US">You can find
out which operators and commands can be used to formulate the filter conditions
for a query.</paragraph>
-<paragraph role="heading" id="hd_id3156212" xml-lang="en-US" level="2"><link
href="text/shared/explorer/database/02010100.xhp" name="Executing
Functions">Executing Functions</link></paragraph>
+<h2 id="hd_id3156212"><link href="text/shared/explorer/database/02010100.xhp"
name="Executing Functions">Executing Functions</link></h2>
<paragraph role="paragraph" id="par_id3144762" xml-lang="en-US">You can
perform calculations with the data of a table and store the results as a query
result.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/02000002.xhp
b/source/text/sdatabase/02000002.xhp
similarity index 81%
rename from source/text/shared/explorer/database/02000002.xhp
rename to source/text/sdatabase/02000002.xhp
index 9237c7d6b..5181290fb 100644
--- a/source/text/shared/explorer/database/02000002.xhp
+++ b/source/text/sdatabase/02000002.xhp
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -19,32 +16,30 @@
* 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="textsharedexplorerdatabase02000002xml" indexer="exclude"
status="PUBLISH">
<title id="tit" xml-lang="en-US">Missing Element</title>
-<filename>/text/shared/explorer/database/02000002.xhp</filename>
+<filename>/text/sdatabase/02000002.xhp</filename>
</topic>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index"
id="bm_id3150445"><bookmark_value>queries; missing elements
(Base)</bookmark_value>
-</bookmark><comment>mw added "(Base)"</comment><paragraph role="heading"
id="hd_id3150445" xml-lang="en-US" level="1">Missing Element</paragraph>
+</bookmark><comment>mw added "(Base)"</comment><h1 id="hd_id3150445">Missing
Element</h1>
<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US">If a query in
which tables or fields no longer exist is opened, the<emph> Missing Element
</emph>dialog appears. This dialog names the missing table or the field which
cannot be interpreted and allows you to decide how to continue with the
procedure.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000450.xhp#FehlendesElement"/>
</section>
-<paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="2">How to
continue?</paragraph>
+<h2 id="hd_id3145072">How to continue?</h2>
<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US">There are
three options available for answering this question:</paragraph>
-<paragraph role="heading" id="hd_id3147576" xml-lang="en-US" level="3">Do you
really want to open the query in the graphic view?</paragraph>
+<h3 id="hd_id3147576">Do you really want to open the query in the graphic
view?</h3>
<paragraph role="paragraph" id="par_id3166461" xml-lang="en-US"><ahelp
hid=".">Allows you to open the query in the <link
href="text/shared/explorer/database/02010100.xhp" name="Design View">Design
View</link> in spite of missing elements.</ahelp> This option also allows you
to specify if other errors need to be ignored.</paragraph>
<paragraph role="paragraph" id="par_id3153031" xml-lang="en-US">The query is
opened in the Design View (the graphical interface). Missing tables appear
blank and invalid fields appear with their (invalid) names in the list of
fields. This lets you work with exactly those fields that caused the
error.</paragraph>
-<paragraph role="heading" id="hd_id3149578" xml-lang="en-US" level="3">Open
the query in the SQL View</paragraph>
+<h3 id="hd_id3149578">Open the query in the SQL View</h3>
<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US"><ahelp
hid=".">Allows you to open the query design in the <link
href="text/shared/explorer/database/02010100.xhp" name="SQL Mode">SQL
Mode</link> and to interpret the query as a <link
href="text/shared/02/14030000.xhp" name="Native SQL">Native SQL</link>.</ahelp>
You can only quit the native SQL mode when the $[officename] statement is
completely interpreted (only possible if the used tables or fields in the query
really exist).</paragraph>
-<paragraph role="heading" id="hd_id3150984" xml-lang="en-US" level="3">Do not
open the query</paragraph>
+<h3 id="hd_id3150984">Do not open the query</h3>
<paragraph role="paragraph" id="par_id3156329" xml-lang="en-US"><ahelp
hid=".">Allows you to cancel the procedure and specify that the query should
not be opened.</ahelp> This option corresponds to the function of the
<emph>Cancel</emph> dialog button.</paragraph>
-<paragraph role="heading" id="hd_id3148492" xml-lang="en-US" level="3">Also
ignore similar errors</paragraph>
+<h3 id="hd_id3148492">Also ignore similar errors</h3>
<paragraph role="paragraph" id="par_id3154285" xml-lang="en-US"><ahelp
hid=".">If you selected the first option, but you still want to open the query
in the graphics view in spite of missing elements, you can specify whether
other errors are ignored.</ahelp> Therefore, in the current opening process, no
error message will be displayed if the query can not be correctly
interpreted.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/guide/database_main.xhp
b/source/text/shared/guide/database_main.xhp
index 3fd3fdbd8..612e8ee32 100644
--- a/source/text/shared/guide/database_main.xhp
+++ b/source/text/shared/guide/database_main.xhp
@@ -52,7 +52,7 @@
<paragraph role="paragraph" id="par_id3151380" xml-lang="en-US"><link
href="text/shared/autopi/01100000.xhp" name="Report AutoPilot">Report
Wizard</link></paragraph>
<embed href="text/shared/guide/data_report.xhp#data_report"/>
<paragraph role="heading" id="hd_id3145606" xml-lang="en-US"
level="2">Queries</paragraph>
-<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US"><link
href="text/shared/explorer/database/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_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_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>
<paragraph role="heading" id="hd_id3147287" xml-lang="en-US"
level="2">Tables</paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
