[Libreoffice-commits] help.git: AllLangHelp_sdatabase.mk AllLangHelp_shared.mk source/text
Olivier Hallot (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jun 9 13:17:14 UTC 2021
AllLangHelp_sdatabase.mk | 3 +++
AllLangHelp_shared.mk | 3 ---
source/text/sdatabase/dabaadvprop.xhp | 11 ++++-------
source/text/sdatabase/dabaadvpropdat.xhp | 15 +++++++++++++--
source/text/sdatabase/dabaadvpropgen.xhp | 19 +++++++++++--------
5 files changed, 31 insertions(+), 20 deletions(-)
New commits:
commit ed18f8e4f9fc516d1a9e117e983cdc8006838ad1
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Tue Jun 8 09:14:19 2021 -0300
Commit: Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Wed Jun 9 15:16:54 2021 +0200
Refactor some database help files
Change-Id: Ia9f3e2844cdf4ac16d7ee3ba70d64415c2bf964d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/116837
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index b2723e0c4..337313b72 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -45,6 +45,9 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
helpcontent2/source/text/sdatabase/11030100 \
helpcontent2/source/text/sdatabase/11080000 \
helpcontent2/source/text/sdatabase/11090000 \
+ helpcontent2/source/text/sdatabase/dabaadvpropdat \
+ helpcontent2/source/text/sdatabase/dabaadvpropgen \
+ helpcontent2/source/text/sdatabase/dabaadvprop \
))
# vim: set noet sw=4 ts=4:
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 65feeac78..6ebe3e7db 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -861,9 +861,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
))
$(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
- helpcontent2/source/text/shared/explorer/database/dabaadvprop \
- helpcontent2/source/text/shared/explorer/database/dabaadvpropdat \
- helpcontent2/source/text/shared/explorer/database/dabaadvpropgen \
helpcontent2/source/text/shared/explorer/database/dabadoc \
helpcontent2/source/text/shared/explorer/database/dabaprop \
helpcontent2/source/text/shared/explorer/database/dabapropadd \
diff --git a/source/text/shared/explorer/database/dabaadvprop.xhp b/source/text/sdatabase/dabaadvprop.xhp
similarity index 80%
rename from source/text/shared/explorer/database/dabaadvprop.xhp
rename to source/text/sdatabase/dabaadvprop.xhp
index ee8535766..fc008f5d5 100644
--- a/source/text/shared/explorer/database/dabaadvprop.xhp
+++ b/source/text/sdatabase/dabaadvprop.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="textsharedexplorerdatabasedabaadvpropxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Advanced Properties</title>
-<filename>/text/shared/explorer/database/dabaadvprop.xhp</filename>
+<filename>/text/sdatabase/dabaadvprop.xhp</filename>
</topic>
<history>
<created date="2004-07-30T11:15:17">Database advanced properties dialog</created>
@@ -31,13 +28,13 @@
</meta>
<body>
<section id="dabaadvprop">
-<paragraph role="heading" id="par_idN10550" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/dabaadvprop.xhp">Advanced Properties</link></paragraph>
+<h1 id="par_idN10550"><link href="text/sdatabase/dabaadvprop.xhp">Advanced Properties</link></h1>
<paragraph role="paragraph" id="par_idN10560" xml-lang="en-US">Specifies advanced properties for the database.</paragraph>
</section>
<section id="howtoget">
<paragraph role="paragraph" id="par_id3998840" xml-lang="en-US">In a database window, choose <emph>Edit - Database - Properties</emph>, click <emph>Advanced Properties</emph> tab</paragraph>
</section>
-<embed href="text/shared/explorer/database/dabaadvpropgen.xhp#generated"/>
-<embed href="text/shared/explorer/database/dabaadvpropdat.xhp#data"/>
+<embed href="text/sdatabase/dabaadvpropgen.xhp#generated"/>
+<embed href="text/sdatabase/dabaadvpropdat.xhp#data"/>
</body>
</helpdocument>
diff --git a/source/text/shared/explorer/database/dabaadvpropdat.xhp b/source/text/sdatabase/dabaadvpropdat.xhp
similarity index 91%
rename from source/text/shared/explorer/database/dabaadvpropdat.xhp
rename to source/text/sdatabase/dabaadvpropdat.xhp
index 399a8693d..0a0e98f94 100644
--- a/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/source/text/sdatabase/dabaadvpropdat.xhp
@@ -21,14 +21,25 @@
<meta>
<topic id="textsharedexplorerdatabasedabaadvpropdatxml" indexer="include">
<title xml-lang="en-US" id="tit">Special Settings</title>
- <filename>/text/shared/explorer/database/dabaadvpropdat.xhp</filename>
+ <filename>/text/sdatabase/dabaadvpropdat.xhp</filename>
</topic>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialsettingspage/SpecialSettingsPage" id="bm_id301592678856867" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/specialsettingspage//@@nowidget@@" id="bm_id971592679640715" localize="false"/>
+ <bookmark xml-lang="en-US" branch="index" id="bm_id81623155177507">
+ <bookmark_value>database;special settings</bookmark_value>
+ <bookmark_value>database settings;SQL92 naming</bookmark_value>
+ <bookmark_value>database settings;keyword AS</bookmark_value>
+ <bookmark_value>database settings;outer join syntax</bookmark_value>
+ <bookmark_value>database settings;special SELECT statements</bookmark_value>
+ <bookmark_value>database settings;ODBC date/time</bookmark_value>
+ <bookmark_value>database settings;support primary keys</bookmark_value>
+ <bookmark_value>database settings;line ends</bookmark_value>
+ <bookmark_value>database settings;version columns</bookmark_value>
+ </bookmark>
<section id="data">
- <h1 id="par_idN10556"><link href="text/shared/explorer/database/dabaadvpropdat.xhp">Special Settings</link></h1>
+ <h1 id="par_idN10556"><link href="text/sdatabase/dabaadvpropdat.xhp">Special Settings</link></h1>
<paragraph xml-lang="en-US" id="par_idN10566" role="paragraph">Specifies the way you can work with data in a database.</paragraph>
</section>
<section id="howtoget">
diff --git a/source/text/shared/explorer/database/dabaadvpropgen.xhp b/source/text/sdatabase/dabaadvpropgen.xhp
similarity index 81%
rename from source/text/shared/explorer/database/dabaadvpropgen.xhp
rename to source/text/sdatabase/dabaadvpropgen.xhp
index 8627519bc..d9312dc5e 100644
--- a/source/text/shared/explorer/database/dabaadvpropgen.xhp
+++ b/source/text/sdatabase/dabaadvpropgen.xhp
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--
* This file is part of the LibreOffice project.
*
@@ -18,31 +16,36 @@
* 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="textsharedexplorerdatabasedabaadvpropgenxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Generated Values</title>
-<filename>/text/shared/explorer/database/dabaadvpropgen.xhp</filename>
+<filename>/text/sdatabase/dabaadvpropgen.xhp</filename>
</topic>
<history>
<created date="2004-07-30T11:20:09">Advanced Properties dialog Generated values tab page</created>
</history>
</meta>
<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id521623154765032">
+ <bookmark_value>database advanced properties;autoincrement values</bookmark_value>
+ <bookmark_value>database advanced properties;automatic generated values</bookmark_value>
+ <bookmark_value>database advanced properties;retrieve generated values</bookmark_value>
+ <bookmark_value>database advanced properties;query generated values</bookmark_value>
+</bookmark>
<section id="generated">
-<paragraph role="heading" id="par_idN10553" xml-lang="en-US" level="1"><link href="text/shared/explorer/database/dabaadvpropgen.xhp">Generated Values</link></paragraph>
+<h1 id="par_idN10553"><link href="text/sdatabase/dabaadvpropgen.xhp">Generated Values</link></h1>
<paragraph role="paragraph" id="par_idN10563" xml-lang="en-US">Specifies the options for automatically generated values for new data records.<comment>UFI: all text copied from shared\explorer\database\11020000.xhp</comment></paragraph>
</section>
<paragraph role="paragraph" id="par_idN10578" xml-lang="en-US" localize="false"><comment>how to get this: Edit Database AdvancedProp ??? I have no idea</comment></paragraph>
<paragraph role="paragraph" id="par_id7684560" xml-lang="en-US">The availability of the following controls depends on the type of database:</paragraph>
-<paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="2">Retrieve generated values</paragraph>
+<h2 id="par_idN1058C">Retrieve generated values</h2>
<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US"><ahelp hid=".">Enables $[officename] support for auto-incremented data fields in the current ODBC or JDBC data source. Select this option if the auto-increment feature in the SDBCX layer of the database is not supported. In general<comment>UFI: this does not mean that something is set by default, but "normally,"</comment>, the auto-increment is selected for the primary key field.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="2">Auto-increment statement</paragraph>
+<h2 id="par_idN10593">Auto-increment statement</h2>
<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US"><ahelp hid=".">Enter the SQL command specifier that instructs the data source to auto-increment a specified Integer data field.</ahelp> For example, the following MySQL statement used the AUTO_INCREMENT statement to increase the "id" field each time the statement creates a data field:</paragraph>
<paragraph role="code" id="par_idN105A0" xml-lang="en-US">CREATE TABLE "table1" ("id" INTEGER AUTO_INCREMENT)</paragraph>
<paragraph role="paragraph" id="par_idN10634" xml-lang="en-US">For this example, you must enter AUTO_INCREMENT into the <emph>Auto-increment statement</emph> box.</paragraph>
-<paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="2">Query of generated values</paragraph>
+<h2 id="par_idN105AA">Query of generated values</h2>
<paragraph role="paragraph" id="par_idN10645" xml-lang="en-US"><ahelp hid=".">Enter an SQL statement that returns the last auto-incremented value for the primary key data field.</ahelp> For example:</paragraph>
<paragraph role="code" id="par_idN105B1" xml-lang="en-US">SELECT LAST_INSERT_D();</paragraph>
</body>
More information about the Libreoffice-commits
mailing list