[Libreoffice-commits] help.git: 2 commits - AllLangHelp_swriter.mk source/text
Gabor Kelemen
kelemeng at gnome.hu
Sun Apr 2 20:59:18 UTC 2017
AllLangHelp_swriter.mk | 1
source/text/shared/02/12090100.xhp | 11 ++++---
source/text/swriter/01/mm_cusaddfie.xhp | 48 --------------------------------
3 files changed, 6 insertions(+), 54 deletions(-)
New commits:
commit 20abdd0a447ec3a330326ccd84257a0af6ce6f95
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Fri Mar 31 00:11:37 2017 +0200
tdf#102930 Mail Merge Wizard: Drop duplicated page
This is the same as the mm_newaddblo.xhp file
Change-Id: Iafa9297c54042ba10a7bfff41a5ac4de13ada25d
Reviewed-on: https://gerrit.libreoffice.org/35950
Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index a657fbcfb..61d27f466 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -185,7 +185,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
helpcontent2/source/text/swriter/01/mailmerge07 \
helpcontent2/source/text/swriter/01/mailmerge08 \
helpcontent2/source/text/swriter/01/mm_copyto \
- helpcontent2/source/text/swriter/01/mm_cusaddfie \
helpcontent2/source/text/swriter/01/mm_cusaddlis \
helpcontent2/source/text/swriter/01/mm_cusgrelin \
helpcontent2/source/text/swriter/01/mm_emabod \
diff --git a/source/text/swriter/01/mm_cusaddfie.xhp b/source/text/swriter/01/mm_cusaddfie.xhp
deleted file mode 100644
index c14c965f6..000000000
--- a/source/text/swriter/01/mm_cusaddfie.xhp
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 regarding copyright
- * ownership. The ASF licenses this file 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 .
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter01mm_cusaddfiexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">New Address Block</title>
-<filename>/text/swriter/01/mm_cusaddfie.xhp</filename>
-</topic>
-<history>
-<created date="2004-07-08T11:31:39">UFI: New Address Block dialog for mail merge</created>
-</history>
-</meta>
-<body>
-<paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1" l10n="NEW">New Address Block</paragraph>
-<paragraph role="paragraph" id="par_idN10546" xml-lang="en-US" l10n="NEW"><comment>UFI: was Custom Address Field in the mockup, so wrong file name...</comment>Specify the placement of address data fields in an address block of a <link href="text/swriter/01/mm_seladdblo.xhp">mail merge</link> document.</paragraph>
-<paragraph role="heading" id="par_idN10569" xml-lang="en-US" level="2" l10n="NEW">Address Elements</paragraph>
-<paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a field and drag the field to the other list.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10570" xml-lang="en-US" level="2" l10n="NEW">></paragraph>
-<paragraph role="paragraph" id="par_idN10574" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds the selected field from the Address Elements list to the other list. You can add the same field more than once.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10577" xml-lang="en-US" level="2" l10n="NEW"><</paragraph>
-<paragraph role="paragraph" id="par_idN1057B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Removes the selected field from the other list.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="2" l10n="NEW">Drag address element to the field below</paragraph>
-<paragraph role="paragraph" id="par_idN10582" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Arrange the fields by drag-and-drop or use the arrow buttons.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Preview</paragraph>
-<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a preview of the first database record with the current address block layout.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="2" l10n="NEW">(Arrow Buttons)</paragraph>
-<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an item in the list and click an arrow button to move the item.</ahelp></paragraph>
-</body>
-</helpdocument>
commit 5bffaa7cecbcb102764ce195be2cb5fd03de4d6b
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Thu Mar 30 23:57:55 2017 +0200
tdf#102930 Mail Merge Wizard: Standard Filter dialog ahelps
Appears from the Select Address List dialog, Filter button.
ahelps need to be the literal dot to work with multiple bookmarks
Change-Id: Id906881098601f49643e0298949d7bcbbd618d57
Reviewed-on: https://gerrit.libreoffice.org/35949
Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
diff --git a/source/text/shared/02/12090100.xhp b/source/text/shared/02/12090100.xhp
index 9b80d0db9..4e2833962 100644
--- a/source/text/shared/02/12090100.xhp
+++ b/source/text/shared/02/12090100.xhp
@@ -29,8 +29,9 @@
<body>
<bookmark xml-lang="en-US" branch="hid/.uno:DataFilterStandardFilter" id="bm_id9065823" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/StandardFilterDialog" id="bm_id3154232" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/queryfilterdialog/QueryFilterDialog" id="bm_id3155888" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151097" role="heading" level="1" l10n="U" oldref="1">Standard Filter</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149716" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:DataFilterStandardFilter">Specifies the logical conditions to filter your table data.</ahelp> This dialog is available for spreadsheet documents, database tables and database forms. The dialog for databases does not contain the <emph>More Options</emph> button.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149716" role="paragraph" l10n="U" oldref="2"><ahelp hid=".">Specifies the logical conditions to filter your table data.</ahelp> This dialog is available for spreadsheet documents, database tables and database forms. The dialog for databases does not contain the <emph>More Options</emph> button.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000409.xhp#dnfitdf"/>
</section>
@@ -48,7 +49,7 @@
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/queryfilterdialog/op2" id="bm_id3155892" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/queryfilterdialog/op3" id="bm_id3150774" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149751" role="heading" level="2" l10n="U" oldref="5">Operator</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="6"><ahelp hid="dbaccess/ui/queryfilterdialog/op3">For the following arguments, you can choose between the logical operators AND / OR.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="6"><ahelp hid=".">For the following arguments, you can choose between the logical operators AND / OR.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/field1" id="bm_id3153682" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/field2" id="bm_id3155942" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/field3" id="bm_id3150693" localize="false"/>
@@ -56,7 +57,7 @@
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/queryfilterdialog/field2" id="bm_id3155535" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/queryfilterdialog/field3" id="bm_id3148538" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149182" role="heading" level="2" l10n="U" oldref="7">Field name</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149398" role="paragraph" l10n="U" oldref="8"><ahelp hid="dbaccess/ui/queryfilterdialog/field3">Specifies the field names from the current table to set them in the argument.</ahelp> You will see the column identifiers if no text is available for the field names.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149398" role="paragraph" l10n="U" oldref="8"><ahelp hid=".">Specifies the field names from the current table to set them in the argument.</ahelp> You will see the column identifiers if no text is available for the field names.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/cond1" id="bm_id3149811" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/cond2" id="bm_id3153760" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/cond3" id="bm_id3153126" localize="false"/>
@@ -64,7 +65,7 @@
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/queryfilterdialog/cond2" id="bm_id3148990" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/queryfilterdialog/cond3" id="bm_id3153252" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147653" role="heading" level="2" l10n="U" oldref="9">Condition</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150254" role="paragraph" l10n="U" oldref="10"><ahelp hid="dbaccess/ui/queryfilterdialog/cond3">Specifies the <link href="text/shared/02/12090101.xhp" name="comparative operators">comparative operators</link> through which the entries in the <emph>Field name</emph> and <emph>Value</emph> fields can be linked.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150254" role="paragraph" l10n="U" oldref="10"><ahelp hid=".">Specifies the <link href="text/shared/02/12090101.xhp" name="comparative operators">comparative operators</link> through which the entries in the <emph>Field name</emph> and <emph>Value</emph> fields can be linked.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/val1" id="bm_id3155136" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/val2" id="bm_id3148492" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/standardfilterdialog/val3" id="bm_id3150276" localize="false"/>
@@ -73,7 +74,7 @@
<bookmark xml-lang="en-US" branch="hid/dbaccess/ui/queryfilterdialog/value3" id="bm_id3159400" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149166" role="heading" level="2" l10n="U"
oldref="11">Value</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="12"><ahelp hid="dbaccess/ui/queryfilterdialog/value3">Specifies a value to filter the field.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="12"><ahelp hid=".">Specifies a value to filter the field.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3150976" role="paragraph" l10n="U" oldref="14">The<emph> Value </emph>list box contains all possible values for the specified <emph>Field name</emph> . Choose the value to be used in the filter. You can also choose the <emph>- empty -</emph> or <emph>-not empty -</emph> entries..</paragraph>
<paragraph xml-lang="en-US" id="par_id3156118" role="paragraph" l10n="U" oldref="15">If you use the filter function in database tables or forms, then type the value in the <emph>Value </emph>text box to be used for filtering.</paragraph>
<switch select="appl">
More information about the Libreoffice-commits
mailing list