[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst                |    1 -
 source/text/swriter/01/04090006.xhp |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit b1ba04f8f29b92d30d65968e6253d48fbcc168ac
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 25 14:19:22 2014 +0100

    update help ids for print merge querybox .ui conversion
    
    Change-Id: Ibe2bd1e3872d05cbff519fd0466231e080301085

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 0542f80..8009a63 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2179,7 +2179,6 @@ HID_POPUP_FRAME,33840,
 HID_POPUP_LINE,33841,
 HID_POPUP_LINEEND,34072,
 HID_POPUP_LINEEND_CTRL,34073,
-HID_PRINT_AS_MERGE,54949,
 HID_PRINT_OPTIONS,33124,
 HID_PROP_ALIGN,37816,
 HID_PROP_ALLOW_ADDITIONS,37784,
diff --git a/source/text/swriter/01/04090006.xhp b/source/text/swriter/01/04090006.xhp
index 13859ca..ada92b8 100644
--- a/source/text/swriter/01/04090006.xhp
+++ b/source/text/swriter/01/04090006.xhp
@@ -117,7 +117,7 @@
 <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" l10n="U" oldref="29">List of user-defined formats</paragraph>
 <paragraph role="paragraph" id="par_id3150093" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="modules/swriter/ui/flddbpage/format">Lists the available user-defined formats.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_PRINT_AS_MERGE" id="bm_id1835383" localize="false"/>
+<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" l10n="NEW">Printing a form letter</paragraph>
 <paragraph role="paragraph" id="par_idN10803" xml-lang="en-US" l10n="NEW"><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" l10n="NEW">Do not show warning again</paragraph>