source/text/swriter/01/04090006.xhp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 09a1ae513f57e41146f3ce5408d04b3e5c3f624e
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Mon Jan 1 20:17:54 2018 +0100
Fix ahelps on (Insert Field - )Database page
-Drop an unnecessary ahelp
-No more 'Don't show this again' box in the printmergedialog.ui file
Change-Id: I65ee28e091368693cbf4b5cc966c63a15b86b4aa
Reviewed-on: https://gerrit.libreoffice.org/47439
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/swriter/01/04090006.xhp
b/source/text/swriter/01/04090006.xhp
index c83a63d75..bfbd7afc0 100644
--- a/source/text/swriter/01/04090006.xhp
+++ b/source/text/swriter/01/04090006.xhp
@@ -103,7 +103,7 @@
<paragraph role="paragraph" id="par_id3149836" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/flddbpage/recnumber">Enter the number of the record
that you want to insert when the condition that you specify is met.</ahelp> The
record number corresponds to the current selection in the data source view. For
example, if you select the last 5 records in a database containing 10 records,
the number of the first record will be 1, and not 6.</paragraph>
<paragraph role="note" id="par_id3153305" xml-lang="en-US">If you refer to
fields in a different database (or in a different table or query within the
same database), $[officename] determines the record number relative to the
current selection.</paragraph>
<paragraph role="heading" id="hd_id3156109" xml-lang="en-US"
level="2">Format</paragraph>
-<paragraph role="paragraph" id="par_id3156122" xml-lang="en-US"><ahelp
hid=".">Select the format of the field that you want to insert. This option is
available for numerical, boolean, date and time fields.</ahelp><comment>see
#i64135</comment></paragraph>
+<paragraph role="paragraph" id="par_id3156122" xml-lang="en-US">Select the
format of the field that you want to insert. This option is available for
numerical, boolean, date and time fields.<comment>see
#i64135</comment></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/flddbpage/fromdatabasecb" id="bm_id3150915"
localize="false"/>
<paragraph role="heading" id="hd_id3150904" xml-lang="en-US" level="3">From
database</paragraph>
<paragraph role="paragraph" id="par_id3150922" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/flddbpage/fromdatabasecb">Uses the format defined in
the selected database.</ahelp></paragraph>
@@ -116,11 +116,9 @@
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/numformat"
id="bm_id3150084" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/flddbpage/format"
id="bm_id3150087" localize="false"/>
<paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="3">List of
user-defined formats</paragraph>
-<paragraph role="paragraph" id="par_id3150093" xml-lang="en-US"><ahelp
hid="modules/swriter/ui/flddbpage/format">Lists the available user-defined
formats.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150093" xml-lang="en-US"><ahelp
hid=".">Lists the available user-defined formats.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/printmergedialog/PrintMergeDialog"
id="bm_id1835383" localize="false"/>
<paragraph role="heading" id="par_idN107FF" xml-lang="en-US"
level="2">Printing a form letter</paragraph>
<paragraph role="paragraph" id="par_idN10803" xml-lang="en-US"><ahelp
hid=".">When you print a document that contains database fields, a dialog asks
you if you want to print a form letter. If you answer Yes, the <link
href="text/swriter/01/01150000.xhp">Mail Merge</link> dialog opens where you
can select the database records to print.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10812" xml-lang="en-US" level="3">Do not
show warning again</paragraph>
-<paragraph role="paragraph" id="par_idN10816" xml-lang="en-US"><ahelp
hid=".">Suppresses this dialog from now on. There is no easy way to get it
back!</ahelp></paragraph>
</body>
</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
