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

Mon Aug 12 06:23:40 PDT 2013

helpers/help_hid.lst               |   10 ---------
 source/text/shared/01/01010202.xhp |   40 ++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 30 deletions(-)

New commits:
commit 7926472574c504fa0aed097ae6631927fd5e5fb6
Author: CaolÃ¡n McNamara <caolanm at redhat.com>
Date:   Mon Aug 12 14:23:03 2013 +0100

    update help ids for label format .ui conversion
    
    Change-Id: I95f70e012cfc5d8fa9d35bbf48e3da8e7822a48c

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 8c9f687..7b56f7f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2295,7 +2295,6 @@ HID_JOINSH_ADDTAB_CLOSE,38852,
 HID_JOINSH_ADDTAB_QUERYLIST,38857,
 HID_JOINSH_ADDTAB_TABLELIST,38853,
 HID_LABEL_INSERT,54839,
-HID_LAB_FMT,53185,
 HID_LETTER_PAGE1,53269,
 HID_LETTER_PAGE2,53270,
 HID_LETTER_PAGE3,53271,
@@ -7790,12 +7789,6 @@ sw_MetricField_TP_FRM_STD_ED_AT_HORZ_POS,878172708,
 sw_MetricField_TP_FRM_STD_ED_AT_VERT_POS,878172713,
 sw_MetricField_TP_FRM_STD_ED_HEIGHT,878172702,
 sw_MetricField_TP_FRM_STD_ED_WIDTH,878172700,
-sw_MetricField_TP_LAB_FMT_FLD_HDIST,909711875,
-sw_MetricField_TP_LAB_FMT_FLD_HEIGHT,909711881,
-sw_MetricField_TP_LAB_FMT_FLD_LEFT,909711883,
-sw_MetricField_TP_LAB_FMT_FLD_UPPER,909711885,
-sw_MetricField_TP_LAB_FMT_FLD_VDIST,909711877,
-sw_MetricField_TP_LAB_FMT_FLD_WIDTH,909711879,
 sw_MetricField_TP_LINENUMBERING_MF_OFFSET,878893577,
 sw_MetricField_TP_TABLE_COLUMN_COL_MF_1,888494700,
 sw_MetricField_TP_TABLE_COLUMN_COL_MF_2,888494702,
@@ -7826,8 +7819,6 @@ sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_COLS,1411291141,
 sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_ROWS,1411291139,
 sw_NumericField_TP_FLD_DOK_ED_DOKDATEOFF,878762041,
 sw_NumericField_TP_FLD_DOK_ED_DOKLEVEL,878762040,
-sw_NumericField_TP_LAB_FMT_FLD_COLUMNS,909711375,
-sw_NumericField_TP_LAB_FMT_FLD_ROWS,909711377,
 sw_NumericField_TP_LINENUMBERING_NF_DIV_INTERVAL,878893073,
 sw_NumericField_TP_LINENUMBERING_NF_NUM_INVERVAL,878893067,
 sw_NumericField_TP_NUMPARA_NF_NEW_START,878860294,
@@ -7908,7 +7899,6 @@ sw_PushButton_TP_FLD_FUNC_PB_LISTREMOVE,878776917,
 sw_PushButton_TP_FLD_FUNC_PB_LISTUP,878776918,
 sw_PushButton_TP_FRM_STD_BT_REALSIZE,878170668,
 sw_PushButton_TP_GRF_EXT_PB_BROWSE,878236213,
-sw_PushButton_TP_LAB_FMT_PB_SAVE,909709843,
 sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT,879350288,
 sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_RESET,879350287,
 sw_PushButton_TP_TOX_ENTRY_PB_ALL_LEVELS,879153732,
diff --git a/source/text/shared/01/01010202.xhp b/source/text/shared/01/01010202.xhp
index e3be8b6..56d886a 100644
--- a/source/text/shared/01/01010202.xhp
+++ b/source/text/shared/01/01010202.xhp
@@ -32,40 +32,40 @@
 </meta>
 <body>
 <section id="format">
-<bookmark xml-lang="en-US" branch="hid/SW_HID_LAB_FMT" id="bm_id3147588" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/labelformatpage/LabelFormatPage" id="bm_id3147588" localize="false"/>
 <paragraph role="heading" id="hd_id3151260" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01010202.xhp" name="Format">Format</link></paragraph>
-<paragraph role="paragraph" id="par_id3153255" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_LAB_FMT">Set paper formatting options.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153255" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="modules/swriter/ui/labelformatpage/LabelFormatPage">Set paper formatting options.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#formateti"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_HDIST" id="bm_id3149180" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/labelformatpage/hori" id="bm_id3149180" localize="false"/>
 <paragraph role="heading" id="hd_id3159194" xml-lang="en-US" level="2" l10n="U" oldref="3">Horizontal pitch</paragraph>
-<paragraph role="paragraph" id="par_id3154186" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_HDIST">Displays the distance between the left edges of adjacent labels or business cards. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_VDIST" id="bm_id3145669" localize="false"/>
+<paragraph role="paragraph" id="par_id3154186" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="modules/swriter/ui/labelformatpage/hori">Displays the distance between the left edges of adjacent labels or business cards. If you are defining a custom format, enter a value here.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/labelformatpage/vert" id="bm_id3145669" localize="false"/>
 <paragraph role="heading" id="hd_id3155555" xml-lang="en-US" level="2" l10n="U" oldref="5">Vertical pitch</paragraph>
-<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_VDIST">Displays the distance between the upper edge of a label or a business card and the upper edge of the label or the business card directly below. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_WIDTH" id="bm_id3156411" localize="false"/>
+<paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="modules/swriter/ui/labelformatpage/vert">Displays the distance between the upper edge of a label or a business card and the upper edge of the label or the business card directly below. If you are defining a custom format, enter a value here.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/labelformatpage/width" id="bm_id3156411" localize="false"/>
 <paragraph role="heading" id="hd_id3147399" xml-lang="en-US" level="2" l10n="U" oldref="7">Width</paragraph>
-<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_WIDTH">Displays the width for the label or the business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_HEIGHT" id="bm_id3150507" localize="false"/>
+<paragraph role="paragraph" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="modules/swriter/ui/labelformatpage/width">Displays the width for the label or the business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/labelformatpage/height" id="bm_id3150507" localize="false"/>
 <paragraph role="heading" id="hd_id3150774" xml-lang="en-US" level="2" l10n="U" oldref="9">Height</paragraph>
-<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_HEIGHT">Displays the height for the label or business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_LEFT" id="bm_id3143267" localize="false"/>
+<paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="modules/swriter/ui/labelformatpage/height">Displays the height for the label or business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/labelformatpage/left" id="bm_id3143267" localize="false"/>
 <paragraph role="heading" id="hd_id3149182" xml-lang="en-US" level="2" l10n="U" oldref="11">Left margin</paragraph>
-<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_LEFT">Displays the distance from the left edge of the page to the left edge of the first label or business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_LAB_FMT:FLD_UPPER" id="bm_id3163802" localize="false"/>
+<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="modules/swriter/ui/labelformatpage/left">Displays the distance from the left edge of the page to the left edge of the first label or business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/labelformatpage/top" id="bm_id3163802" localize="false"/>
 <paragraph role="heading" id="hd_id3156346" xml-lang="en-US" level="2" l10n="U" oldref="13">Upper margin</paragraph>
-<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SW:METRICFIELD:TP_LAB_FMT:FLD_UPPER">Displays distance from the top edge of the page to the top of the first label or business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_LAB_FMT:FLD_COLUMNS" id="bm_id3155830" localize="false"/>
+<paragraph role="paragraph" id="par_id3150355" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="modules/swriter/ui/labelformatpage/top">Displays distance from the top edge of the page to the top of the first label or business card. If you are defining a custom format, enter a value here.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/labelformatpage/cols" id="bm_id3155830" localize="false"/>
 <paragraph role="heading" id="hd_id3147573" xml-lang="en-US" level="2" l10n="U" oldref="15">Columns</paragraph>
-<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:NUMERICFIELD:TP_LAB_FMT:FLD_COLUMNS">Enter the number of labels or business cards that you want to span the width of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_LAB_FMT:FLD_ROWS" id="bm_id3153146" localize="false"/>
+<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="modules/swriter/ui/labelformatpage/cols">Enter the number of labels or business cards that you want to span the width of the page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/labelformatpage/rows" id="bm_id3153146" localize="false"/>
 <paragraph role="heading" id="hd_id3154143" xml-lang="en-US" level="2" l10n="U" oldref="17">Rows</paragraph>
-<paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SW:NUMERICFIELD:TP_LAB_FMT:FLD_ROWS">Enter the number of labels or business cards that you want to span the height of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_LAB_FMT:PB_SAVE" id="bm_id3153716" localize="false"/>
+<paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="modules/swriter/ui/labelformatpage/rows">Enter the number of labels or business cards that you want to span the height of the page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/labelformatpage/save" id="bm_id3153716" localize="false"/>
 <paragraph role="heading" id="hd_id3147336" xml-lang="en-US" level="2" l10n="U" oldref="19">Save</paragraph>
-<paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW_PUSHBUTTON_TP_LAB_FMT_PB_SAVE">Saves the current label or business card format.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="modules/swriter/ui/labelformatpage/save">Saves the current label or business card format.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/savelabeldialog/SaveLabelDialog" id="bm_id3158431" localize="false"/>
 <paragraph role="heading" id="hd_id3146773" xml-lang="en-US" level="2" l10n="U" oldref="21">Save Label Format</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/savelabeldialog/brand" id="bm_id3158430" localize="false"/>
