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

Mon Sep 16 12:34:33 PDT 2013

helpers/help_hid.lst                 |    3 ---
 source/text/swriter/01/mm_copyto.xhp |    5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 397491d21c2c306e9913ca2672ee968153bdcffe
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Mon Sep 16 20:34:03 2013 +0100

    update help ids for copy to (cc) dialog .ui conversion
    
    Change-Id: I5ed5a4ffdfab65a348fffbade5b2d96f3b198b84

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 47fd3f3..cd4ad8c 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2384,7 +2384,6 @@ HID_MM_BODY_LB_FEMALECOLUMN,55031,
 HID_MM_BODY_LB_MALE,55029,
 HID_MM_BODY_PB_FEMALE,55028,
 HID_MM_BODY_PB_MALE,55030,
-HID_MM_COPYTO,54975,
 HID_MM_CREATEADDRESSLIST,54966,
 HID_MM_CUSTOMFIELDS,54986,
 HID_MM_DBTABLEPREVIEWDIALOG,54965,
@@ -7272,8 +7271,6 @@ sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698,
 sw_Edit_DLG_MAILMERGE_ED_ATTACH,1446610977,
 sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969,
 sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960,
-sw_Edit_DLG_MM_COPYTO_ED_BCC,1435387949,
-sw_Edit_DLG_MM_COPYTO_ED_CC,1435387947,
 sw_Edit_DLG_MM_MERGE_PAGE_ED_FIND,898287622,
 sw_Edit_DLG_MM_OUTPUT_PAGE_ED_ATTACHMENT,898304052,
 sw_Edit_DLG_MM_OUTPUT_PAGE_ED_SUBJECT,898304035,
diff --git a/source/text/swriter/01/mm_copyto.xhp b/source/text/swriter/01/mm_copyto.xhp
index 7cb3a96..e22cc15 100644
--- a/source/text/swriter/01/mm_copyto.xhp
+++ b/source/text/swriter/01/mm_copyto.xhp
@@ -31,12 +31,13 @@
 </history>
 </meta>
 <body>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/ccdialog/CCDialog" id="bm_id2162235" localize="false"/>
 <paragraph role="heading" id="par_idN10539" xml-lang="en-US" level="1" l10n="NEW">Copy To</paragraph>
 <paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US" l10n="NEW">Specify additional e-mail recipients for the <link href="text/swriter/01/mailmerge08.xhp">mail merge</link> document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_COPYTO:ED_CC" id="bm_id2162236" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/ccdialog/cc" id="bm_id2162236" localize="false"/>
 <paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="2" l10n="NEW">CC</paragraph>
 <paragraph role="paragraph" id="par_idN10552" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the recipients of e-mail copies, separated by a semicolon (;).</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_MM_COPYTO:ED_BCC" id="bm_id3037202" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/ccdialog/bcc" id="bm_id3037202" localize="false"/>
 <paragraph role="heading" id="par_idN10555" xml-lang="en-US" level="2" l10n="NEW">BCC</paragraph>
 <paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the recipients of e-mail blind copies, separated by a semicolon (;).</ahelp></paragraph>
 </body>
