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

Tue Mar 18 09:29:50 PDT 2014

helpers/help_hid.lst                   |    7 -------
 source/text/swriter/01/mailmerge05.xhp |   12 ++++++------
 2 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit 606dd47bed30f5ae77352f497323108df4550bf2
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Tue Mar 18 16:19:22 2014 +0000

    update help ids for wizard layout page .ui conversion
    
    Change-Id: Ib31da1cd8a961f89330a06df31214a7fb561ea45

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 8fe7150..c22036f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2305,7 +2305,6 @@ HID_MM_HEADER_6,55041,
 HID_MM_HEADER_7,55042,
 HID_MM_HEADER_8,55043,
 HID_MM_HEADER_9,55044,
-HID_MM_LAYOUT_PAGE,54974,
 HID_MM_MAILBODY,54982,
 HID_MM_MAILSTATUS_TLB,54988,
 HID_MM_MERGEPAGE,54960,
@@ -6358,7 +6357,6 @@ sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_RTF,1446609942,
 sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_SW,1446609940,
 sw_CheckBox_DLG_MAILMERGE_CB_SINGLE_JOBS,1446609938,
 sw_CheckBox_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE,1446609961,
-sw_CheckBox_DLG_MM_LAYOUT_PAGE_CB_ALIGN,898499596,
 sw_CheckBox_DLG_MM_MAILBODY_CB_GREETINGLINE,1435403279,
 sw_CheckBox_DLG_MM_MERGE_PAGE_CB_BACKWARDS,898286601,
 sw_CheckBox_DLG_MM_MERGE_PAGE_CB_MATCHCASE,898286602,
@@ -6411,7 +6409,6 @@ sw_ListBox_DLG_MAILMERGE_LB_ADDRESSFLD,1446612494,
 sw_ListBox_DLG_MAILMERGE_LB_COLUMN,1446612510,
 sw_ListBox_DLG_MAILMERGE_LB_FILTER,1446612524,
 sw_ListBox_DLG_MM_ASSIGNFIELDS_CT_FIELDS_LB_FIELDS,1074908678,
-sw_ListBox_DLG_MM_LAYOUT_PAGE_LB_ZOOM,898502159,
 sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_MAILTO,898305568,
 sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_PRINT,898305558,
 sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_SENDAS,898305573,
@@ -6433,8 +6430,6 @@ sw_ListBox_TP_TABLE_TEXTFLOW_LB_PAGECOLL,878513801,
 sw_ListBox_TP_TABLE_TEXTFLOW_LB_TEXTORIENTATION,878513708,
 sw_ListBox_TP_TABLE_TEXTFLOW_LB_VERTORIENT,878513815,
 sw_MenuButton_DLG_GLOSSARY_PB_EDIT,1428647988,
-sw_MetricField_DLG_MM_LAYOUT_PAGE_MF_LEFT,898505220,
-sw_MetricField_DLG_MM_LAYOUT_PAGE_MF_TOP,898505222,
 sw_MetricField_DLG_PAGEPREVIEW_PRINTOPTIONS_MF_BMARGIN,1411291667,
 sw_MetricField_DLG_PAGEPREVIEW_PRINTOPTIONS_MF_HMARGIN,1411291669,
 sw_MetricField_DLG_PAGEPREVIEW_PRINTOPTIONS_MF_LMARGIN,1411291661,
@@ -6499,8 +6494,6 @@ sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEW,1435243011,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEXT,1435243019,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_PREV,1435243017,
 sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_START,1435243016,
-sw_PushButton_DLG_MM_LAYOUT_PAGE_MF_UP,898503177,
-sw_PushButton_DLG_MM_LAYOUT_PAGE_PB_DOWN,898503179,
 sw_PushButton_DLG_MM_MERGE_PAGE_PB_EDIT,898290179,
 sw_PushButton_DLG_MM_MERGE_PAGE_PB_FIND,898290183,
 sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_COPYTO,898306593,
diff --git a/source/text/swriter/01/mailmerge05.xhp b/source/text/swriter/01/mailmerge05.xhp
index 595298b..65c8cfb 100644
--- a/source/text/swriter/01/mailmerge05.xhp
+++ b/source/text/swriter/01/mailmerge05.xhp
@@ -35,22 +35,22 @@
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge05.xhp">Mail Merge Wizard - Adjust Layout</link></paragraph>
 <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the position of the address blocks and salutations on the documents.</paragraph>
 </section>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_MM_LAYOUT_PAGE:CB_ALIGN" id="bm_id7631458" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/align" id="bm_id7631458" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Align to text body</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Aligns the frame that contains the address block to the left page margin.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_LEFT" id="bm_id7862483" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/left" id="bm_id7862483" localize="false"/>
 <paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">From left</paragraph>
 <paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the amount of space to leave between the left edge of the page and the left edge of the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_TOP" id="bm_id1113010" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/top" id="bm_id1113010" localize="false"/>
 <paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">From top</paragraph>
 <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the amount of space to leave between the top edge of the page and the top edge of the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_LAYOUT_PAGE:MF_UP" id="bm_id656758" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/up" id="bm_id656758" localize="false"/>
 <paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2" l10n="NEW">Up</paragraph>
 <paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the salutation up.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_MM_LAYOUT_PAGE:PB_DOWN" id="bm_id3112582" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/down" id="bm_id3112582" localize="false"/>
 <paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Down</paragraph>
 <paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the salutation down.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_MM_LAYOUT_PAGE:LB_ZOOM" id="bm_id628070" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/zoom" id="bm_id628070" localize="false"/>
 <paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="2" l10n="NEW">Zoom</paragraph>
 <paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a magnification for the page preview.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN106AF" xml-lang="en-US" l10n="NEW">Use the commands in the context menu of the preview to move the view up and down.</paragraph>
