summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@gnome.hu>2017-06-07 22:57:40 +0200
committerGabor Kelemen <kelemeng@ubuntu.com>2017-07-13 20:37:03 +0200
commit5e623a924db3b7de6c39419f1a7b764a23de1b96 (patch)
treebaf328238b0c55dd951f05eb16e44b8536939bff
parent0f9722866caf9d5175df3e49170f40b9567f0c16 (diff)
tdf#98799 tdf#102930 Document the logic of the MM wizard 3rd page
On the Insert Address Block page after selecting the 2nd substep one has to match the address elements of the document with fields of the data source. Otherwise one cannot continue to the next step or close the wizard. Try to convey these as warnings on the page. Change-Id: I98fb1c7473fec1d7c2c2b532f3a2f52bb538d606 Reviewed-on: https://gerrit.libreoffice.org/38546 Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com> Tested-by: Gabor Kelemen <kelemeng@ubuntu.com>
-rw-r--r--source/text/swriter/01/mailmerge03.xhp2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/text/swriter/01/mailmerge03.xhp b/source/text/swriter/01/mailmerge03.xhp
index 807d7e5a4..85a45cbf9 100644
--- a/source/text/swriter/01/mailmerge03.xhp
+++ b/source/text/swriter/01/mailmerge03.xhp
@@ -46,6 +46,7 @@
<paragraph role="paragraph" id="par_idN10581" xml-lang="en-US"><ahelp hid=".">Adds an address block to the mail merge document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/settingspreview" id="bm_id934477" localize="false"/>
<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US"><ahelp hid=".">Select the address block layout that you want to use.</ahelp></paragraph>
+<paragraph role="warning" id="par_id7805416" xml-lang="en-US">If you select <emph>This document shall contain an address block</emph>, the third and fourth substeps become enabled on this page. Then you have to match the <link href="text/swriter/01/mailmerge03.xhp">address block elements</link> and the <link href="text/swriter/01/mm_matfie.xhp">field names</link> used in the mail.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/hideempty" id="bm_id59205" localize="false"/>
<paragraph role="heading" id="hd_id9355754" xml-lang="en-US" level="3">Suppress lines with just empty fields</paragraph>
<paragraph role="paragraph" id="par_id3109225" xml-lang="en-US"><ahelp hid=".">Enable to leave empty lines out of the address.</ahelp></paragraph>
@@ -55,6 +56,7 @@
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/assign" id="bm_id8653523" localize="false"/>
<paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="3">Match fields</paragraph>
<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_matfie.xhp">Match Fields</link> dialog.</ahelp></paragraph>
+<paragraph role="warning" id="par_id7805417" xml-lang="en-US">Unless all address elements are matched with a column header, you cannot finish the Mail Merge wizard with the <emph>Finish</emph> button or continue to the <link href="text/swriter/01/mailmerge04.xhp">fourth step</link> of the wizard.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/addresspreview" id="bm_id8653524" localize="false"/>
<paragraph role="paragraph" id="par_idN105A1" xml-lang="en-US"><ahelp hid="." visibility="hidden">Shows a preview of the address block template filled with data.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/prev" id="bm_id2950224" localize="false"/>