This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 689e0a3 Fixed some mistakes in Help
689e0a3 is described below
commit 689e0a3af82c9dfb6e4dcc94e2914346e2d9bbb2
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Jun 4 21:58:25 2020 +0200
Fixed some mistakes in Help
(cherry picked from commit c470e82fbeb6dce7ca3345d7c01639d696cd7f3e)
---
.../source/text/shared/05/00000150.xhp | 20 ++++++------
.../text/shared/explorer/database/02010100.xhp | 36 ++++++++++------------
2 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/main/helpcontent2/source/text/shared/05/00000150.xhp
b/main/helpcontent2/source/text/shared/05/00000150.xhp
index da369da..7af7090 100644
--- a/main/helpcontent2/source/text/shared/05/00000150.xhp
+++ b/main/helpcontent2/source/text/shared/05/00000150.xhp
@@ -2,7 +2,7 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -10,16 +10,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<helpdocument version="1.0">
@@ -34,14 +34,12 @@
</history>
</meta>
<body>
-
-
+
<bookmark branch="index" xml-lang="en-US"
id="bm_id3153244"><bookmark_value>Help;
bookmarks</bookmark_value><bookmark_value>bookmarks;
Help</bookmark_value></bookmark><paragraph role="paragraph" id="par_id3153244"
l10n="E" xml-lang="en-US" oldref="1" localize="false"/>
<paragraph id="hd_id3154349" role="heading" level="1" oldref="2" l10n="U"
xml-lang="en-US"><variable id="doc_title"><link
href="text/shared/05/00000150.xhp" name="Managing Bookmarks">Managing
Bookmarks</link></variable></paragraph>
<bookmark branch="hid/sfx2:Edit:DLG_HELP_ADDBOOKMARK:ED_BOOKMARK_TITLE"
xml-lang="en-US" id="bm_id3143284"/><paragraph l10n="U" role="paragraph"
id="par_id3154840" xml-lang="en-US" oldref="11"><ahelp
hid="SFX2_EDIT_DLG_HELP_ADDBOOKMARK_ED_BOOKMARK_TITLE"
visibility="hidden">Displays the name of the bookmarked page. You can also type
a new name for the bookmark.</ahelp></paragraph>
<table id="tbl_id3154228">
-
-
+
<tablerow>
<tablecell>
<paragraph l10n="E" role="paragraph" id="par_id3149140" xml-lang="en-US"
oldref=""><image src="sfx2/res/favourite.png" id="img_id3149549"><alt
xml-lang="en-US" id="alt_id3149549">Icon</alt></image></paragraph>
@@ -63,13 +61,13 @@
<paragraph role="paragraph" id="par_id3145382" l10n="U" xml-lang="en-US"
oldref="6">The following commands are on the context menu of a
bookmark:</paragraph>
<list type="unordered">
<listitem>
- <bookmark branch="hid/SFX2_HID_HELP_BOOKMARKS_OPEN" xml-lang="en-US"
id="bm_id3152909"/><paragraph l10n="U" xml-lang="en-US" role="listitem"
id="par_id3147573" oldref="7"><emph>Display</emph> - <ahelp
hid="HID_HELP_BOOKMARKS_OPEN" visibility="visible">displays the selected help
subject</ahelp>.</paragraph>
+ <bookmark branch="hid/SFX2_HID_HELP_BOOKMARKS_OPEN" xml-lang="en-US"
id="bm_id3152909"/><paragraph l10n="U" xml-lang="en-US" role="listitem"
id="par_id3147573" oldref="7"><emph>Display</emph> - <ahelp
hid="HID_HELP_BOOKMARKS_OPEN" visibility="visible">Displays the selected help
subject.</ahelp></paragraph>
</listitem>
<listitem>
- <bookmark branch="hid/SFX2_HID_HELP_BOOKMARKS_RENAME" xml-lang="en-US"
id="bm_id3154380"/><paragraph l10n="U" xml-lang="en-US" role="listitem"
id="par_id3150771" oldref="8"><emph>Rename</emph> - <ahelp
hid="HID_HELP_BOOKMARKS_RENAME" visibility="visible">opens a dialog for
entering another name for the bookmark</ahelp>.</paragraph>
+ <bookmark branch="hid/SFX2_HID_HELP_BOOKMARKS_RENAME" xml-lang="en-US"
id="bm_id3154380"/><paragraph l10n="U" xml-lang="en-US" role="listitem"
id="par_id3150771" oldref="8"><emph>Rename</emph> - <ahelp
hid="HID_HELP_BOOKMARKS_RENAME" visibility="visible">Opens a dialog for
entering another name for the bookmark.</ahelp></paragraph>
</listitem>
<listitem>
- <bookmark branch="hid/SFX2_HID_HELP_BOOKMARKS_DELETE" xml-lang="en-US"
id="bm_id3153665"/><paragraph l10n="U" xml-lang="en-US" role="listitem"
id="par_id3153087" oldref="9"><emph>Delete</emph> - <ahelp
hid="HID_HELP_BOOKMARKS_DELETE" visibility="visible">deletes the bookmark
selected </ahelp>.</paragraph>
+ <bookmark branch="hid/SFX2_HID_HELP_BOOKMARKS_DELETE" xml-lang="en-US"
id="bm_id3153665"/><paragraph l10n="U" xml-lang="en-US" role="listitem"
id="par_id3153087" oldref="9"><emph>Delete</emph> - <ahelp
hid="HID_HELP_BOOKMARKS_DELETE" visibility="visible">Deletes the bookmark
selected.</ahelp></paragraph>
</listitem>
</list>
<section id="relatedtopics">
diff --git
a/main/helpcontent2/source/text/shared/explorer/database/02010100.xhp
b/main/helpcontent2/source/text/shared/explorer/database/02010100.xhp
index de1ee67..ef6f120 100644
--- a/main/helpcontent2/source/text/shared/explorer/database/02010100.xhp
+++ b/main/helpcontent2/source/text/shared/explorer/database/02010100.xhp
@@ -3,7 +3,7 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -11,22 +11,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsharedexplorerdatabase02010100xml" indexer="include"
status="PUBLISH">
<title id="tit" xml-lang="en-US">Query Design</title>
@@ -149,9 +148,9 @@
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_QRYDGN_ROW_ORDER"
id="bm_id3154202" localize="false"/><paragraph role="heading" id="hd_id3154207"
xml-lang="en-US" level="4" l10n="U" oldref="29">Sort</paragraph>
<paragraph role="paragraph" id="par_id3150979" xml-lang="en-US" l10n="CHG"
oldref="30"><ahelp hid="HID_QRYDGN_ROW_ORDER">If you click the cell, you can
select among the sorting options: ascending, descending and not sorted.</ahelp>
Text fields will be sorted alphabetically and numerical fields numerically. For
most databases, administrators can set the sorting options.</paragraph>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_QRYDGN_ROW_VISIBLE"
id="bm_id3149334" localize="false"/><paragraph role="heading" id="hd_id3150384"
xml-lang="en-US" level="4" l10n="U" oldref="31">Visible</paragraph>
-<paragraph role="paragraph" id="par_id3146133" xml-lang="en-US" l10n="U"
oldref="32"><ahelp hid="HID_QRYDGN_ROW_VISIBLE">If you mark the
<emph>Visible</emph> property for a data field, that field will be visible in
the query</ahelp>. If you only use a data field to formulate a condition, you
do not necessarily need to show it.</paragraph>
+<paragraph role="paragraph" id="par_id3146133" xml-lang="en-US" l10n="U"
oldref="32"><ahelp hid="HID_QRYDGN_ROW_VISIBLE">If you mark the
<emph>Visible</emph> property for a data field, that field will be visible in
the query.</ahelp> If you only use a data field to formulate a condition, you
do not necessarily need to show it.</paragraph>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_QRYDGN_ROW_CRIT"
id="bm_id3147130" localize="false"/><paragraph role="heading" id="hd_id3154714"
xml-lang="en-US" level="4" l10n="U" oldref="33">Criteria</paragraph>
-<paragraph role="paragraph" id="par_id3145134" xml-lang="en-US" l10n="U"
oldref="34"><ahelp hid="HID_QRYDGN_ROW_CRIT">Specifies the <link
href="text/shared/explorer/database/02010100.xhp" name="criteria ">criteria
</link>by which the content of the data field should be
filtered.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145134" xml-lang="en-US" l10n="U"
oldref="34"><ahelp hid="HID_QRYDGN_ROW_CRIT">Specifies the <link
href="text/shared/explorer/database/02010100.xhp" name="criteria
">criteria</link> by which the content of the data field should be
filtered.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152477" xml-lang="en-US" level="4"
l10n="U" oldref="35">or</paragraph>
<paragraph role="paragraph" id="par_id3154585" xml-lang="en-US" l10n="U"
oldref="36">Here you can enter one additional criterion for filtering in each
line. Multiple criteria in one column will be connected by an OR
link.</paragraph>
<paragraph role="paragraph" id="par_id3148800" xml-lang="en-US" l10n="U"
oldref="150">You can also use the context menu of the line headers in the lower
area of the query design to insert another line for functions:</paragraph>
@@ -521,7 +520,7 @@
<paragraph role="tablecontent" id="par_id3154809" xml-lang="en-US" l10n="U"
oldref="95">contains a, b, c...</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3148399" xml-lang="en-US" l10n="U"
oldref="96">... the field name contains one of the specified expressions a, b,
c,... Any number of expressions can be specified, and the result of the query
is determined by an Or link. The expressions a, b, c... can be either numbers
or characters</paragraph>
+<paragraph role="tablecontent" id="par_id3148399" xml-lang="en-US" l10n="U"
oldref="96">... the field name contains one of the specified expressions a, b,
c,... Any number of expressions can be specified, and the result of the query
is determined by an Or link. The expressions a, b, c... can be either numbers
or characters.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -578,7 +577,7 @@
</tablecell>
</tablerow>
-<tablerow>
+<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id315379A" xml-lang="en-US" l10n="U"
oldref="118"><'2001-01-10'</paragraph>
</tablecell>
@@ -648,7 +647,7 @@
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="tablehead" id="par_id31537341" xml-lang="en-US" l10n="U"
oldref="253">Date Type Element</paragraph>
-</tablecell>
+</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="tablehead" id="par_id31537342" xml-lang="en-US" l10n="U"
oldref="253">SQL Escape syntax #1 - may be obsolete</paragraph>
</tablecell>
@@ -656,14 +655,14 @@
<paragraph role="tablehead" id="par_id31537343" xml-lang="en-US" l10n="U"
oldref="253">SQL Escape syntax #2</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablehead" id="par_id31537344" xml-lang="en-US" l10n="U"
oldref="253">SQL2 syntax</paragraph>
+<paragraph role="tablehead" id="par_id31537344" xml-lang="en-US" l10n="U"
oldref="253">SQL2 syntax</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id315913111" xml-lang="en-US" l10n="U"
oldref="254">Date</paragraph>
-</tablecell>
+</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id315913112" xml-lang="en-US" l10n="U"
oldref="254">{D'YYYY-MM-DD'}</paragraph>
</tablecell>
@@ -686,8 +685,8 @@
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id31559474" xml-lang="en-US" l10n="U"
oldref="264">'HH:MI:SS[.SS]' </paragraph>
-</tablecell>
-</tablerow>
+</tablecell>
+</tablerow>
<tablerow>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id31509641" xml-lang="en-US" l10n="U"
oldref="257">DateTime</paragraph>
@@ -700,14 +699,13 @@
</tablecell>
<tablecell colspan="" rowspan="">
<paragraph role="paragraph" id="par_id31509644" xml-lang="en-US" l10n="U"
oldref="264">'YYYY-MM-DD HH:MI:SS[.SS]' </paragraph>
-</tablecell>
-</tablerow>
+</tablecell>
+</tablerow>
</table>
-
<paragraph role="paragraph" id="par_id3149539" xml-lang="en-US" l10n="U"
oldref="267">Example: select {d '1999-12-31'} from world.years</paragraph>
<paragraph role="paragraph" xml-lang="en-US" l10n="U">Example: select *
from mytable where years='1999-12-31' </paragraph>
-<paragraph role="paragraph" id="par_id3150510" xml-lang="en-US" l10n="U"
oldref="112">All date expressions (literals) must be enclosed with single
quotation marks. (Consult the reference for the particular database and
connnector you are using for more details.)</paragraph>
+<paragraph role="paragraph" id="par_id3150510" xml-lang="en-US" l10n="U"
oldref="112">All date expressions (literals) must be enclosed with single
quotation marks. (Consult the reference for the particular database and
connector you are using for more details.)</paragraph>
<!--//kls end moved -->
<paragraph role="heading" id="hd_id3150427" xml-lang="en-US" level="3"
l10n="U" oldref="228">Querying Yes/No fields</paragraph>
