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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Dec 14 03:37:18 PST 2012


 helpers/help_hid.lst                     |   59 ----------------------------
 source/text/shared/01/01110100.xhp       |   65 ++++++++++++++-----------------
 source/text/shared/01/05020300.xhp       |   59 +++++++++++++---------------
 source/text/shared/optionen/01040400.xhp |   61 ++++++++++++-----------------
 source/text/shared/optionen/01041100.xhp |    4 -
 source/text/swriter/01/04060000.xhp      |   25 +++++------
 source/text/swriter/01/04060100.xhp      |   20 ++++-----
 7 files changed, 110 insertions(+), 183 deletions(-)

New commits:
commit 1909df07cbd54bf753514cc6dc4137b7b69af63c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 14 11:07:12 2012 +0000

    update help ids for number format page .ui conversion

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 19a299e..8bcfc42 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2662,12 +2662,6 @@ HID_NID_SRCH_REP,55011,
 HID_NID_TABLE_FORMULA,55013,
 HID_NID_TABLE_FORMULA_ERROR,55014,
 HID_NID_TBL,54996,
-HID_NUMBERFORMAT,33786,
-HID_NUMBERFORMAT_LB_FORMAT,34004,
-HID_NUMBERFORMAT_TBI_ADD,33916,
-HID_NUMBERFORMAT_TBI_INFO,34003,
-HID_NUMBERFORMAT_TBI_REMOVE,33917,
-HID_NUMBERFORMAT_WND_NUMBER_PREVIEW,40075,
 HID_NUMBERINGOPT_SEL_GRF_FROM_FILE,39879,
 HID_NUMPARA,53214,
 HID_NUM_FORMAT_BTN,53003,
@@ -7892,9 +7886,6 @@ svx_CheckBox_RID_SVXPAGE_JSEARCH_OPTIONS_CB_MATCH_VARIANT_FORM_KANJI,714474603,
 svx_CheckBox_RID_SVXPAGE_LINE_CBX_SYNCHRONIZE,701547521,
 svx_CheckBox_RID_SVXPAGE_LINE_CB_SYMBOL_RATIO,701547544,
 svx_CheckBox_RID_SVXPAGE_LINE_DEF_CBX_SYNCHRONIZE,701563905,
-svx_CheckBox_RID_SVXPAGE_NUMBERFORMAT_BTN_NEGRED,701383705,
-svx_CheckBox_RID_SVXPAGE_NUMBERFORMAT_BTN_THOUSAND,701383706,
-svx_CheckBox_RID_SVXPAGE_NUMBERFORMAT_CB_SOURCEFORMAT,701383714,
 svx_CheckBox_RID_SVXPAGE_NUM_OPTIONS_CB_RATIO,704300209,
 svx_CheckBox_RID_SVXPAGE_NUM_OPTIONS_CB_SAME_LEVEL,704300220,
 svx_CheckBox_RID_SVXPAGE_NUM_POSITION_CB_RELATIVE,704316601,
@@ -8042,8 +8033,6 @@ svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_SEARCH_NAME,703334441,
 svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_SEPARATOR,703334448,
 svx_Edit_RID_SVXPAGE_INET_SEARCH_ED_URL,703334446,
 svx_Edit_RID_SVXPAGE_LINEEND_DEF_EDT_NAME,701581313,
-svx_Edit_RID_SVXPAGE_NUMBERFORMAT_ED_COMMENT,701384732,
-svx_Edit_RID_SVXPAGE_NUMBERFORMAT_ED_FORMAT,701384718,
 svx_Edit_RID_SVXPAGE_NUM_OPTIONS_ED_PREFIX,704301212,
 svx_Edit_RID_SVXPAGE_NUM_OPTIONS_ED_SUFFIX,704301216,
 svx_Edit_RID_SVXPAGE_TABULATOR_ED_FILLCHAR_OTHER,700745773,
@@ -8267,9 +8256,6 @@ svx_ListBox_RID_SVXPAGE_LINE_LB_START_STYLE,701550083,
 svx_ListBox_RID_SVXPAGE_MEASURE_LB_UNIT,703352321,
 svx_ListBox_RID_SVXPAGE_MENUS_LB_MENUS,705498935,
 svx_ListBox_RID_SVXPAGE_MENUS_LB_SAVEIN,705498948,
-svx_ListBox_RID_SVXPAGE_NUMBERFORMAT_LB_CATEGORY,701386249,
-svx_ListBox_RID_SVXPAGE_NUMBERFORMAT_LB_CURRENCY,701386273,
-svx_ListBox_RID_SVXPAGE_NUMBERFORMAT_LB_LANGUAGE,701386253,
 svx_ListBox_RID_SVXPAGE_NUM_OPTIONS_LB_ALIGN,704302643,
 svx_ListBox_RID_SVXPAGE_NUM_OPTIONS_LB_BUL_COLOR,704302783,
 svx_ListBox_RID_SVXPAGE_NUM_OPTIONS_LB_CHARFMT,704302760,
@@ -8537,8 +8523,6 @@ svx_NumericField_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_X,703207437,
 svx_NumericField_RID_SVXPAGE_GRID_NUM_FLD_DIVISION_Y,703207438,
 svx_NumericField_RID_SVXPAGE_LINE_DEF_NUM_FLD_1,701569025,
 svx_NumericField_RID_SVXPAGE_LINE_DEF_NUM_FLD_2,701569026,
-svx_NumericField_RID_SVXPAGE_NUMBERFORMAT_ED_DECIMALS,701388822,
-svx_NumericField_RID_SVXPAGE_NUMBERFORMAT_ED_LEADZEROES,701388824,
 svx_NumericField_RID_SVXPAGE_NUM_OPTIONS_ED_START,704305323,
 svx_NumericField_RID_SVXPAGE_NUM_OPTIONS_NF_ALL_LEVEL,704305321,
 svx_NumericField_RID_SVXPAGE_TEXTANIMATION_NUM_FLD_COUNT,703731713,
diff --git a/source/text/shared/01/05020300.xhp b/source/text/shared/01/05020300.xhp
index 2071fc7..c8ab7a0 100644
--- a/source/text/shared/01/05020300.xhp
+++ b/source/text/shared/01/05020300.xhp
@@ -39,20 +39,19 @@
 </bookmark>
   <comment>mw transferred "format codes;" to Calc guide Format_value_userdef.xhp and "numers;" and "cells;" to Calc guide Format_table.xhp. Changed "currencies;"</comment>
   
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_NUMBERFORMAT" id="bm_id3150146" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/NumberFormatPage" id="bm_id3150147" localize="false"/>
   
 <bookmark xml-lang="en-US" branch="hid/.uno:TableNumberFormatDialog" id="bm_id2370759" localize="false"/>
   
-<bookmark xml-lang="en-US" branch="hid/.uno:TableNumberFormatDialog" id="bm_id3148731" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3152942" role="heading" level="1" l10n="U" oldref="1">Numbers / Format</paragraph>
   <paragraph xml-lang="en-US" id="par_id3145071" role="paragraph" l10n="U" oldref="2"><variable id="zahlen"><ahelp hid=".uno:TableNumberFormatDialog">Specify the formatting options for the selected cell(s).</ahelp> 
 </variable></paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00040503.xhp#zahlen"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY" id="bm_id3153312" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/categorylb" id="bm_id3153312" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3155392" role="heading" level="2" l10n="U" oldref="3">Category</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY">Select a category from the list, and then select a formatting style in the <emph>Format </emph>box.</ahelp></paragraph>
+  <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="4"><ahelp hid="cui/ui/numberformatpage/categorylb">Select a category from the list, and then select a formatting style in the <emph>Format </emph>box.</ahelp></paragraph>
   
 <switch select="appl">
   
@@ -63,67 +62,67 @@
   
 </switch>
   
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_NUMBERFORMAT_LB_FORMAT" id="bm_id3155449" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/formatlb" id="bm_id3155449" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3155342" role="heading" level="2" l10n="U" oldref="5">Format</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_NUMBERFORMAT_LB_FORMAT">Select how you want the contents of the selected cell(s) to be displayed.</ahelp> The code for the selected option is displayed in the <emph>Format Code</emph> box.</paragraph>
+  <paragraph xml-lang="en-US" id="par_id3148491" role="paragraph" l10n="U" oldref="6"><ahelp hid="cui/ui/numberformatpage/formatlb">Select how you want the contents of the selected cell(s) to be displayed.</ahelp> The code for the selected option is displayed in the <emph>Format Code</emph> box.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY" id="bm_id3154381" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/currencylb" id="bm_id3154381" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3154811" role="heading" level="3" l10n="U" oldref="97">Currency category list boxes</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3148563" role="paragraph" l10n="U" oldref="98"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY">Select a currency, and then scroll to the top of the <emph>Format</emph> list to view the formatting options for the currency.</ahelp></paragraph>
+  <paragraph xml-lang="en-US" id="par_id3148563" role="paragraph" l10n="U" oldref="98"><ahelp hid="cui/ui/numberformatpage/currencylb">Select a currency, and then scroll to the top of the <emph>Format</emph> list to view the formatting options for the currency.</ahelp></paragraph>
   <section id="waehrungtext">
    
    <paragraph xml-lang="en-US" id="par_id3150866" role="note" l10n="U" oldref="99">The format code for currencies uses the form [$xxx-nnn], where xxx is the currency symbol, and nnn the country code. Special banking symbols, such as EUR (for Euro), do not require the country code. The currency format is not dependent on the language that you select in the<emph> Language</emph> box. </paragraph>
    
   </section>
   
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE" id="bm_id3148797" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/languagelb" id="bm_id3148797" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3154071" role="heading" level="2" l10n="U" oldref="23">Language</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3154138" role="paragraph" l10n="U" oldref="24"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE">Specifies the language setting for the selected <switchinline select="appl"><caseinline select="CALC">cells 
+  <paragraph xml-lang="en-US" id="par_id3154138" role="paragraph" l10n="U" oldref="24"><ahelp hid="cui/ui/numberformatpage/languagelb">Specifies the language setting for the selected <switchinline select="appl"><caseinline select="CALC">cells 
 </caseinline><defaultinline>fields</defaultinline></switchinline>. With the language set to <emph>Automatic</emph>, $[officename] automatically applies the number formats associated with the system default language. Select any language to fix the settings for the selected <switchinline select="appl"><caseinline select="CALC">cells 
 </caseinline><defaultinline>fields</defaultinline></switchinline>.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U" oldref="102">The language setting ensures that date and currency formats are preserved even when the document is opened in an operating system that uses a different default language setting.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT" id="bm_id3145747" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/sourceformat" id="bm_id3145747" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3155995" role="heading" level="2" l10n="U" oldref="104">Source format</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph" l10n="U" oldref="105"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_NUMBERFORMAT_CB_SOURCEFORMAT">Uses the same number format as the cells containing the data for the chart.</ahelp></paragraph>
+  <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph" l10n="U" oldref="105"><ahelp hid="cui/ui/numberformatpage/sourceformat">Uses the same number format as the cells containing the data for the chart.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="hd_id3148451" role="heading" level="2" l10n="U" oldref="7">Options</paragraph>
   <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="8">Specify the options for the selected format.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS" id="bm_id3151178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/decimalsed" id="bm_id3151178" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3153970" role="heading" level="3" l10n="U" oldref="9">Decimal places</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS">Enter the number of decimal places that you want to display.</ahelp></paragraph>
+  <paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U" oldref="10"><ahelp hid="cui/ui/numberformatpage/decimalsed">Enter the number of decimal places that you want to display.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES" id="bm_id3153106" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/leadzerosed" id="bm_id3153106" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3154819" role="heading" level="3" l10n="U" oldref="11">Leading zeroes</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3147352" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SVX:NUMERICFIELD:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES">Enter the maximum number of zeroes to display in front of the decimal point.</ahelp></paragraph>
+  <paragraph xml-lang="en-US" id="par_id3147352" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="cui/ui/numberformatpage/leadzerosed">Enter the maximum number of zeroes to display in front of the decimal point.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED" id="bm_id3157895" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/negnumred" id="bm_id3157895" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3155131" role="heading" level="3" l10n="U" oldref="13">Negative numbers in red</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3159252" role="paragraph" l10n="U" oldref="14"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED">Changes the font color of negative numbers to red.</ahelp></paragraph>
+  <paragraph xml-lang="en-US" id="par_id3159252" role="paragraph" l10n="U" oldref="14"><ahelp hid="cui/ui/numberformatpage/negnumred">Changes the font color of negative numbers to red.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND" id="bm_id3148645" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/thousands" id="bm_id3148645" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3147434" role="heading" level="3" l10n="U" oldref="15">Use thousands separator</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3146148" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND">Inserts a separator between thousands. The type of separator that is used depends on your language settings.</ahelp></paragraph>
+  <paragraph xml-lang="en-US" id="par_id3146148" role="paragraph" l10n="U" oldref="16"><ahelp hid="cui/ui/numberformatpage/thousands">Inserts a separator between thousands. The type of separator that is used depends on your language settings.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT" id="bm_id3150961" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/formated" id="bm_id3150961" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3150103" role="heading" level="2" l10n="U" oldref="17">Format code</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3159156" role="paragraph" l10n="U" oldref="18"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT">Displays the number format code for the selected format. You can also enter a custom format.</ahelp> The following options are only available for user-defined number formats.</paragraph>
+  <paragraph xml-lang="en-US" id="par_id3159156" role="paragraph" l10n="U" oldref="18"><ahelp hid="cui/ui/numberformatpage/formated">Displays the number format code for the selected format. You can also enter a custom format.</ahelp> The following options are only available for user-defined number formats.</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_NUMBERFORMAT_TBI_ADD" id="bm_id3163717" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/add" id="bm_id3163717" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3155311" role="heading" level="3" l10n="U" oldref="19">Add</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3147219" role="paragraph" l10n="U" oldref="20"><ahelp hid="HID_NUMBERFORMAT_TBI_ADD">Adds the number format code that you entered to the user-defined category.</ahelp></paragraph>
+  <paragraph xml-lang="en-US" id="par_id3147219" role="paragraph" l10n="U" oldref="20"><ahelp hid="cui/ui/numberformatpage/add">Adds the number format code that you entered to the user-defined category.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_NUMBERFORMAT_TBI_REMOVE" id="bm_id3159181" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/delete" id="bm_id3159181" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3149263" role="heading" level="3" l10n="U" oldref="21">Delete</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3154150" role="paragraph" l10n="U" oldref="22"><ahelp hid="HID_NUMBERFORMAT_TBI_REMOVE">Deletes the selected number format.</ahelp> The changes are effective after you restart $[officename].</paragraph>
+  <paragraph xml-lang="en-US" id="par_id3154150" role="paragraph" l10n="U" oldref="22"><ahelp hid="cui/ui/numberformatpage/delete">Deletes the selected number format.</ahelp> The changes are effective after you restart $[officename].</paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_NUMBERFORMAT_TBI_INFO" id="bm_id3151119" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/edit" id="bm_id3151119" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3153573" role="heading" level="3" l10n="U" oldref="26">Edit Comment</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3083444" role="paragraph" l10n="U" oldref="27"><ahelp hid="HID_NUMBERFORMAT_TBI_INFO">Adds a comment to the selected number format.</ahelp></paragraph>
+  <paragraph xml-lang="en-US" id="par_id3083444" role="paragraph" l10n="U" oldref="27"><ahelp hid="cui/ui/numberformatpage/edit">Adds a comment to the selected number format.</ahelp></paragraph>
   
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT" id="bm_id3154470" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberformatpage/commented" id="bm_id3154470" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3150332" role="heading" level="3" l10n="U" oldref="95">Name line</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3156060" role="paragraph" l10n="U" oldref="96"><ahelp hid="SVX:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT">Enter a comment for the selected number format, and then click outside this box.</ahelp></paragraph>
+  <paragraph xml-lang="en-US" id="par_id3156060" role="paragraph" l10n="U" oldref="96"><ahelp hid="cui/ui/numberformatpage/commented">Enter a comment for the selected number format, and then click outside this box.</ahelp></paragraph>
   <embed href="text/shared/00/00000001.xhp#vorschau"/>
   <section id="relatedtopics">
    
commit 5799c938c84418f332476644ad84283e24e95cf9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 14 10:53:51 2012 +0000

    update help ids for print options page .ui

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b9ffcc8..19a299e 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2736,7 +2736,6 @@ HID_OPTLOAD_PAGE,53230,
 HID_OPTMAKECHANGES,41151,
 HID_OPTPATH_CTL_PATH,33888,
 HID_OPTPATH_HEADERBAR,34069,
-HID_OPTPRINT_PAGE,53179,
 HID_OPTRECEIVERDATABASE,41144,
 HID_OPTRECEIVERPLACEHOLDER,41143,
 HID_OPTSENDERDEFINE,41136,
@@ -8971,22 +8970,6 @@ sw_CheckBox_TP_OPTCAPTION_PAGE_CB_APPLYBORDER,878937117,
 sw_CheckBox_TP_OPTLOAD_PAGE_CB_AUTO_UPDATE_CHARTS,878969873,
 sw_CheckBox_TP_OPTLOAD_PAGE_CB_AUTO_UPDATE_FIELDS,878969872,
 sw_CheckBox_TP_OPTLOAD_PAGE_CB_USE_SQUARE_PAGE_MODE,878969879,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_BACKGROUND,878085199,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_BLACK_FONT,878085207,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_CTRLFLD,878085189,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_HIDDEN_TEXT,878085213,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_LEFTP,878085184,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_PAPERFROMSETUP,878085190,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_PDRAW,878085183,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_PGRF,878085181,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_PRINTEMPTYPAGES,878085212,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_PROSPECT,878085187,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_PROSPECT_RTL,878085260,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_PTAB,878085182,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_REVERSE,878085186,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_RIGHTP,878085185,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_SINGLEJOBS,878085188,
-sw_CheckBox_TP_OPTPRINT_PAGE_CB_TEXT_PLACEHOLDER,878085214,
 sw_CheckBox_TP_OPTSHDWCRSR_CB_ALLOW_IN_PROT,878806028,
 sw_CheckBox_TP_OPTSHDWCRSR_CB_BREAK,878806027,
 sw_CheckBox_TP_OPTSHDWCRSR_CB_CHAR_HIDDEN,878806077,
@@ -9289,7 +9272,6 @@ sw_ListBox_TP_OPTCAPTION_PAGE_LB_LEVEL,878939671,
 sw_ListBox_TP_OPTCAPTION_PAGE_LB_ORDER,878939680,
 sw_ListBox_TP_OPTCOMPATIBILITY_PAGE_LB_FORMATTING,879349260,
 sw_ListBox_TP_OPTLOAD_PAGE_LB_METRIC,878972435,
-sw_ListBox_TP_OPTPRINT_PAGE_LB_FAX,878087766,
 sw_ListBox_TP_REDLINE_OPT_LB_CHG_ATTR,878874124,
 sw_ListBox_TP_REDLINE_OPT_LB_CHG_COL,878874126,
 sw_ListBox_TP_REDLINE_OPT_LB_DEL_ATTR,878874119,
@@ -9625,10 +9607,6 @@ sw_RadioButton_TP_LAB_PRT_BTN_SINGLE,909722114,
 sw_RadioButton_TP_OPTLOAD_PAGE_RB_ALWAYS,878969356,
 sw_RadioButton_TP_OPTLOAD_PAGE_RB_NEVER,878969358,
 sw_RadioButton_TP_OPTLOAD_PAGE_RB_REQUEST,878969357,
-sw_RadioButton_TP_OPTPRINT_PAGE_RB_END,878084690,
-sw_RadioButton_TP_OPTPRINT_PAGE_RB_NO,878084688,
-sw_RadioButton_TP_OPTPRINT_PAGE_RB_ONLY,878084689,
-sw_RadioButton_TP_OPTPRINT_PAGE_RB_PAGEEND,878084691,
 sw_RadioButton_TP_OPTSHDWCRSR_RB_SHDWCRSFILLINDENT,878805510,
 sw_RadioButton_TP_OPTSHDWCRSR_RB_SHDWCRSFILLMARGIN,878805509,
 sw_RadioButton_TP_OPTSHDWCRSR_RB_SHDWCRSFILLSPACE,878805512,
diff --git a/source/text/shared/optionen/01040400.xhp b/source/text/shared/optionen/01040400.xhp
index 064aa5c..2c68f06 100644
--- a/source/text/shared/optionen/01040400.xhp
+++ b/source/text/shared/optionen/01040400.xhp
@@ -47,9 +47,9 @@
 <bookmark_value>printing; creating individual jobs</bookmark_value>
 <bookmark_value>faxes;selecting a fax machine</bookmark_value>
 </bookmark><comment>mw made "fax machine selection" a two level entry</comment>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_OPTPRINT_PAGE" id="bm_id3153750" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/PrintOptionsPage" id="bm_id3153750" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156414" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040400.xhp" name="Print">Print</link></paragraph>
-<paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTPRINT_PAGE">Specifies print settings within a text or HTML document.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="2"><ahelp hid="modules/swriter/ui/printoptionspage/PrintOptionsPage">Specifies print settings within a text or HTML document.</ahelp></paragraph>
 </section>
       <section id="howtoget">
          <embed href="text/shared/00/00000406.xhp#drucken1"/>
@@ -57,74 +57,67 @@
 <paragraph xml-lang="en-US" id="par_id3153542" role="note" l10n="CHG" oldref="44">The print settings defined on this tab page apply to all subsequent print jobs, until you change the settings again. If you want to change the settings for the current print job only, use the <emph>File - Print</emph> dialog.</paragraph>
 <paragraph xml-lang="en-US" id="hd_id3156330" role="heading" level="2" l10n="U" oldref="3">Contents</paragraph>
 <paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" l10n="U" oldref="4">Specifies which document contents are to be printed. </paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF" id="bm_id3145674" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/graphics" id="bm_id3145674" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox" id="bm_id3145675" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156156" role="heading" level="2" l10n="CHG" oldref="5">Pictures and objects</paragraph>
-<paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="6"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF">Specifies whether the graphics of your text document are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD" id="bm_id3151210" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="6"><ahelp hid="modules/swriter/ui/printoptionspage/graphics">Specifies whether the graphics of your text document are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/formcontrols" id="bm_id3151210" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintControls:CheckBox" id="bm_id3151211" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153525" role="heading" level="2" l10n="CHG" oldref="11">Form controls</paragraph>
- <paragraph xml-lang="en-US" id="par_id3158408" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158408" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="modules/swriter/ui/printoptionspage/formcontrols">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintPageBackground:CheckBox" id="bm_id3154684" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND" id="bm_id3999210" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/background" id="bm_id3999210" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="2" l10n="CHG" oldref="13">Page background</paragraph>
       <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="14"><ahelp hid=".">Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.</ahelp><comment>UFI: fixes #i21977#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT" id="bm_id3144760" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/inblack" id="bm_id3144760" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintBlackFonts:CheckBox" id="bm_id3144761" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3150868" role="heading" level="2" l10n="U" oldref="40">Print black</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149562" role="paragraph" l10n="U" oldref="42"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT">Specifies whether to always print text in black.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_HIDDEN_TEXT" id="bm_id342722" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3149562" role="paragraph" l10n="U" oldref="42"><ahelp hid="modules/swriter/ui/printoptionspage/inblack">Specifies whether to always print text in black.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/hiddentext" id="bm_id342722" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintHiddenText:CheckBox" id="bm_id342723" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id8004394" role="heading" level="2" l10n="NEW">Hidden text</paragraph>
       <paragraph xml-lang="en-US" id="par_id2021546" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text that is marked as hidden.</ahelp> The following hidden text is printed: text that is formatted as hidden by <link href="text/shared/01/05020200.xhp">Format - Character - Font Effects - Hidden</link>, and the text fields <link href="text/swriter/01/04090003.xhp">Hidden text and Hidden paragraphs</link>.<comment>UFI: sorry, due to a bug no links allowed in extended help text</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintTextPlaceholder:CheckBox" id="bm_id5788750" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_TEXT_PLACEHOLDER" id="bm_id9393722" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/textplaceholder" id="bm_id9393722" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id2623981" role="heading" level="2" l10n="NEW">Text placeholder</paragraph>
       <paragraph xml-lang="en-US" id="par_id7242042" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</ahelp><link href="text/swriter/01/04090003.xhp">Text placeholders</link> are fields.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id3151115" role="heading" level="2" l10n="U" oldref="15">Pages</paragraph>
       <paragraph xml-lang="en-US" id="par_id3145365" role="paragraph" l10n="U" oldref="16">Defines the print order for $[officename] Writer documents with multiple pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP" id="bm_id3148618" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/leftpages" id="bm_id3148618" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3150874" role="heading" level="2" l10n="U" oldref="17">Left pages (not for HTML documents)</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149665" role="paragraph" l10n="U" oldref="18"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP">Specifies whether to print all left (even numbered) pages of the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP" id="bm_id3147213" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3149665" role="paragraph" l10n="U" oldref="18"><ahelp hid="modules/swriter/ui/printoptionspage/leftpages">Specifies whether to print all left (even numbered) pages of the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/rightpages" id="bm_id3147213" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3152885" role="heading" level="2" l10n="U" oldref="19">Right pages (not for HTML documents)</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150103" role="paragraph" l10n="U" oldref="20"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP">Specifies whether to print all right (odd numbered) pages of the document.</ahelp></paragraph>
-<comment>
-      <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE" id="bm_id3153142" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3148577" role="heading" level="2" l10n="U" oldref="21">Reversed</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150486" role="paragraph" l10n="U" oldref="22"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE">Specifies whether to reverse the printing order. The last page of the document will then be the first one printed.</ahelp></paragraph>
-</comment>
-      <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT" id="bm_id3155306" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3150103" role="paragraph" l10n="U" oldref="20"><ahelp hid="modules/swriter/ui/printoptionspage/rightpages">Specifies whether to print all right (odd numbered) pages of the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/brochure" id="bm_id3155306" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3147318" role="heading" level="2" l10n="U" oldref="23">Brochure</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="24"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT">Select the<emph> Brochure </emph>option to print your document in brochure format.</ahelp> The brochure format is as follows in $[officename] Writer:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="24"><ahelp hid="modules/swriter/ui/printoptionspage/brochure">Select the<emph> Brochure </emph>option to print your document in brochure format.</ahelp> The brochure format is as follows in $[officename] Writer:</paragraph>
       <section id="brochure">
          <paragraph xml-lang="en-US" id="par_id3149410" role="paragraph" l10n="CHG" oldref="25">If you print a document in portrait on a landscape page, two opposing sides in a brochure will be printed next to each other. If you have a printer with double-sided printing capability, you can create an entire brochure from your document without having to collate the pages later. If you have a printer that only has single-sided printing capability, you can achieve this effect by first printing the front pages with the "Front sides / right pages /odd pages" option marked, then re-inserting the entire paper stack in your printer and printing all the back pages with the "Back pages / left pages / even pages" option marked.</paragraph>
       </section>
 <comment>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PROSPECT_RTL" id="bm_id8632770" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/rtl" id="bm_id8632770" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id9475386" role="heading" level="2" l10n="NEW">Right to left</paragraph>
       <paragraph xml-lang="en-US" id="par_id7894222" role="paragraph" l10n="NEW"><ahelp hid=".">Check to print the pages of the brochure in the correct order for a right-to-left script.</ahelp></paragraph>
 </comment>
       <paragraph xml-lang="en-US" id="hd_id3149300" role="heading" level="2" l10n="U" oldref="26">Comments</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO" id="bm_id3157847" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/none" id="bm_id3157847" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/only" id="bm_id3157950" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/end" id="bm_id3157951" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/endpage" id="bm_id3157952" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" id="bm_id3157848" localize="false"/>
       <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="U" oldref="29"><ahelp hid=".">Specifies whether comments in your document are printed.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="hd_id3148916" role="heading" level="2" l10n="U" oldref="45">Other</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PRINTEMPTYPAGES" id="bm_id2646870" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/blankpages" id="bm_id2646870" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintEmptyPages:CheckBox" id="bm_id2646871" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id4188055" role="heading" level="2" l10n="NEW">Print automatically inserted blank pages</paragraph>
 <paragraph xml-lang="en-US" id="par_id8295541" role="paragraph" l10n="CHG"><ahelp hid=".">If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not.</ahelp></paragraph>
-<comment>issue 116009
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS" id="bm_id3153713" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145642" role="heading" level="2" l10n="CHG" oldref="47">Create single print jobs</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3147338" role="paragraph" l10n="U" oldref="48"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS">Specifies that each new print job will begin on a new page even if you are using a duplex printer.</ahelp> If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages.</paragraph>
-</comment>
-      <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP" id="bm_id3149107" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/papertray" id="bm_id3149107" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156384" role="heading" level="2" l10n="U" oldref="41">Paper tray from printer settings</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="37"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP">For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX" id="bm_id3155336" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="37"><ahelp hid="modules/swriter/ui/printoptionspage/papertray">For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/printoptionspage/fax" id="bm_id3155336" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3147362" role="heading" level="2" l10n="U" oldref="38">Fax</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154703" role="paragraph" l10n="U" oldref="39"><ahelp hid="SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154703" role="paragraph" l10n="U" oldref="39"><ahelp hid="modules/swriter/ui/printoptionspage/fax">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</ahelp></paragraph>
       <section id="relatedtopics">
          <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
       </section>
commit e95b69a618ecc58fbae20f61718524ec70aaba1f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 14 10:27:29 2012 +0000

    update help ids for caption dialog .ui conversion

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index dc9f2ae..b9ffcc8 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1459,7 +1459,6 @@ HID_DLG_ADABAS_TRANSACTIONLOG,37282,
 HID_DLG_ADABAS_TRANSACTIONLOG_SIZE,37287,
 HID_DLG_ADABAS_USR,37276,
 HID_DLG_ADD_IDX_STYLES,53243,
-HID_DLG_CAPTION,52975,
 HID_DLG_CHECKFORONLINEUPDATE,33390,
 HID_DLG_COLWIDTH,38837,
 HID_DLG_CREATE_AUTH_ENTRY,53246,
@@ -9045,7 +9044,6 @@ sw_CheckBox_TP_TOX_SELECT_CB_SEQUENCE,879133818,
 sw_CheckBox_TP_TOX_SELECT_CB_TOXMARKS,879133717,
 sw_CheckBox_TP_TOX_SELECT_CB_USEFF,879133720,
 sw_CheckBox_TP_TOX_SELECT_CB_USE_DASH,879133729,
-sw_ComboBox_DLG_CAPTION_BOX_CATEGORY,1417990149,
 sw_ComboBox_DLG_MM_CUSTOMIZEADDRESSBLOCK_CB_FIELD,1435308087,
 sw_ComboBox_DLG_SAVE_LABEL_CB_MAKE,1446645763,
 sw_ComboBox_MD_EDIT_REGION_LB_SUBREG,1405833254,
@@ -9060,9 +9058,6 @@ sw_ComboBox_TP_STD_FONT_LB_STANDARD,878432347,
 sw_ComboBox_TP_STD_FONT_LB_TITLE,878432349,
 sw_ComboBox_TP_TOX_ENTRY_CB_FILLCHAR,879153198,
 sw_Edit_DLG_BIB_BASE_ED_NAME,1428719626,
-sw_Edit_DLG_CAPTION_EDT_SEP,1417988121,
-sw_Edit_DLG_CAPTION_EDT_TEXT,1417988105,
-sw_Edit_DLG_CAPTION_ED_NUM_SEP,1417988131,
 sw_Edit_DLG_FLD_INPUT_ED_LABEL,1419528199,
 sw_Edit_DLG_GLOSSARY_ED_NAME,1428637700,
 sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698,
@@ -9216,8 +9211,6 @@ sw_ListBox_DLG_ASCII_FILTER_LB_CHARSET,1404849667,
 sw_ListBox_DLG_ASCII_FILTER_LB_FONT,1404849669,
 sw_ListBox_DLG_ASCII_FILTER_LB_LANGUAGE,1404849671,
 sw_ListBox_DLG_BIB_BASE_LB_PATH,1428721160,
-sw_ListBox_DLG_CAPTION_BOX_FORMAT,1417989639,
-sw_ListBox_DLG_CAPTION_BOX_POS,1417989643,
 sw_ListBox_DLG_COLUMN_LB_APPLY_TO,1417874998,
 sw_ListBox_DLG_FLD_DROPDOWN_LB_LISTITEMS,1419644418,
 sw_ListBox_DLG_GLOSSARY_DECIDE_DLG_LB_LIST,1421954565,
@@ -9457,8 +9450,6 @@ sw_PushButton_DLG_AP_INSERT_DB_SEL_PB_TBL_FORMAT,1435046431,
 sw_PushButton_DLG_BIB_BASE_PB_DELETE,1428722180,
 sw_PushButton_DLG_BIB_BASE_PB_NEW,1428722179,
 sw_PushButton_DLG_BIB_BASE_PB_RENAME,1428722187,
-sw_PushButton_DLG_CAPTION_BTN_AUTOCAPTION,1417990679,
-sw_PushButton_DLG_CAPTION_BTN_OPTION,1417990670,
 sw_PushButton_DLG_CHANGE_DB_PB_ADDDB,1419596301,
 sw_PushButton_DLG_FLD_DROPDOWN_PB_EDIT,1419645447,
 sw_PushButton_DLG_FLD_DROPDOWN_PB_NEXT,1419645445,
diff --git a/source/text/shared/optionen/01041100.xhp b/source/text/shared/optionen/01041100.xhp
index 5231d39..b79a969 100644
--- a/source/text/shared/optionen/01041100.xhp
+++ b/source/text/shared/optionen/01041100.xhp
@@ -84,11 +84,9 @@
   <paragraph xml-lang="en-US" id="par_idN106AE" role="heading" level="3" l10n="NEW">Character style</paragraph>
   <paragraph xml-lang="en-US" id="par_idN106B4" role="paragraph" l10n="NEW"><ahelp hid=".">Specifies the character style.</ahelp></paragraph>
   
-<!-- removed HID SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR -->
-  
 <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTCAPTION_PAGE:CB_APPLYBORDER" id="bm_id346995" localize="false"/>
   <paragraph xml-lang="en-US" id="hd_id3143280" role="heading" level="3" l10n="U" oldref="43">Apply border and shadow</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3149826" role="paragraph" l10n="CHG" oldref="44"><ahelp hid="SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR">Applies the border and shadow of the object to the caption frame.</ahelp></paragraph>
+  <paragraph xml-lang="en-US" id="par_id3149826" role="paragraph" l10n="CHG" oldref="44"><ahelp hid="sw:CheckBox:TP_OPTCAPTION_PAGE:CB_APPLYBORDER">Applies the border and shadow of the object to the caption frame.</ahelp></paragraph>
   <section id="relatedtopics">
    
    <embed href="text/swriter/guide/captions.xhp#captions"/>
diff --git a/source/text/swriter/01/04060000.xhp b/source/text/swriter/01/04060000.xhp
index 900c483..fb1aa0a 100644
--- a/source/text/swriter/01/04060000.xhp
+++ b/source/text/swriter/01/04060000.xhp
@@ -32,34 +32,33 @@
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertCaptionDialog" id="bm_id764454" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertCaptionDialog" id="bm_id3150762" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_DLG_CAPTION" id="bm_id3150765" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertcaption/InsertCaptionDialog" id="bm_id3150765" localize="false"/>
 <paragraph role="heading" id="hd_id3147173" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04060000.xhp" name="Caption">Caption</link></paragraph>
-<paragraph role="paragraph" id="par_id3149288" xml-lang="en-US" l10n="U" oldref="2"><variable id="beschrifttext"><ahelp hid="HID_DLG_CAPTION">Adds a numbered caption to a selected graphic, table, frame, text frame, or drawing object.</ahelp> You can also access this command by right-clicking the item that you want to add the caption to. 
+<paragraph role="paragraph" id="par_id3149288" xml-lang="en-US" l10n="U" oldref="2"><variable id="beschrifttext"><ahelp hid="modules/swriter/ui/insertcaption/InsertCaptionDialog">Adds a numbered caption to a selected graphic, table, frame, text frame, or drawing object.</ahelp> You can also access this command by right-clicking the item that you want to add the caption to. 
 </variable></paragraph>
 <section id="howtoget">
   <embed href="text/swriter/00/00000404.xhp#beschriftungein"/>
 </section>
 <paragraph role="heading" id="hd_id3154098" xml-lang="en-US" level="2" l10n="U" oldref="3">Properties</paragraph>
 <paragraph role="paragraph" id="par_id3149804" xml-lang="en-US" l10n="U" oldref="4">Set the caption options for the current selection.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:DLG_CAPTION:BOX_CATEGORY" id="bm_id3154567" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertcaption/category" id="bm_id3154567" localize="false"/>
 <paragraph role="heading" id="hd_id3153533" xml-lang="en-US" level="3" l10n="U" oldref="5">Category</paragraph>
-<paragraph role="paragraph" id="par_id3154574" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:COMBOBOX:DLG_CAPTION:BOX_CATEGORY">Select the caption category, or type a name to create a new category. The category text appears before the caption number in the caption label. Each predefined caption category is formatted with a paragraph style of the same name. </ahelp> For example, the "Illustration" caption category is formatted with the "Illustration" paragraph style.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_CAPTION:BOX_FORMAT" id="bm_id3152956" localize="false"/>
+<paragraph role="paragraph" id="par_id3154574" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="modules/swriter/ui/insertcaption/category">Select the caption category, or type a name to create a new category. The category text appears before the caption number in the caption label. Each predefined caption category is formatted with a paragraph style of the same name. </ahelp> For example, the "Illustration" caption category is formatted with the "Illustration" paragraph style.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertcaption/numbering" id="bm_id3152956" localize="false"/>
 <paragraph role="heading" id="hd_id3153675" xml-lang="en-US" level="3" l10n="U" oldref="7">Numbering</paragraph>
-<paragraph role="paragraph" id="par_id3152962" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_FORMAT">Select the type of numbering that you want to use in the caption.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_CAPTION:EDT_TEXT" id="bm_id3155905" localize="false"/>
+<paragraph role="paragraph" id="par_id3152962" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="modules/swriter/ui/insertcaption/numbering">Select the type of numbering that you want to use in the caption.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertcaption/num_seperator_edit" id="bm_id3155905" localize="false"/>
 <paragraph role="heading" id="hd_id3155893" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Caption</paragraph>
-<paragraph role="paragraph" id="par_id3149688" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_CAPTION:EDT_TEXT">Type the text that you want to appear after the caption number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_CAPTION:EDT_SEP" id="bm_id7607959" localize="false"/>
+<paragraph role="paragraph" id="par_id3149688" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="modules/swriter/ui/insertcaption/num_seperator_edit">Type the text that you want to appear after the caption number.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertcaption/separator_edit" id="bm_id7607959" localize="false"/>
 <paragraph role="heading" id="par_idN1068A" xml-lang="en-US" level="3" l10n="NEW">Separator</paragraph>
 <paragraph role="paragraph" id="par_idN10690" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter optional text characters to appear between the number and the caption text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_CAPTION:BOX_POS" id="bm_id4664754" localize="false"/><comment>moved help id to here</comment>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertcaption/position" id="bm_id4664754" localize="false"/><comment>moved help id to here</comment>
 <paragraph role="heading" id="hd_id3154199" xml-lang="en-US" level="3" l10n="U" oldref="11">Position</paragraph>
-<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SW:LISTBOX:DLG_CAPTION:BOX_POS">Adds the caption above or below the selected item. This option is only available for some objects.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149486" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="modules/swriter/ui/insertcaption/position">Adds the caption above or below the selected item. This option is only available for some objects.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3149043" xml-lang="en-US" level="2" l10n="U" oldref="29"><link href="text/swriter/01/04060100.xhp" name="Options">Options</link></paragraph>
 <embed href="text/swriter/01/04060100.xhp#optionentext"/>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_CAPTION:BTN_AUTOCAPTION" id="bm_id72939" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertcaption/auto" id="bm_id72939" localize="false"/>
 <paragraph role="heading" id="par_idN10744" xml-lang="en-US" level="2" l10n="NEW">AutoCaption</paragraph>
 <paragraph role="paragraph" id="par_idN1074A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Caption dialog. It has the same information as the dialog you get by menu %PRODUCTNAME Writer - AutoCaption in the Options dialog box.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/source/text/swriter/01/04060100.xhp b/source/text/swriter/01/04060100.xhp
index cf626ca..314b1bf 100644
--- a/source/text/swriter/01/04060100.xhp
+++ b/source/text/swriter/01/04060100.xhp
@@ -32,9 +32,9 @@ UFI: edited re spec "Enhance Caption Dialog in Writer"</lastedited>
 </history>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_CAPTION:BTN_OPTION" id="bm_id3151170" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertcaption/options" id="bm_id3151170" localize="false"/>
 <paragraph role="heading" id="hd_id3149287" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Options</paragraph>
-<paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="U" oldref="2"><variable id="optionentext"><ahelp hid="SW:PUSHBUTTON:DLG_CAPTION:BTN_OPTION">Adds the chapter number to the caption label. To use this feature, you must first assign an <link href="text/swriter/guide/chapter_numbering.xhp" name="outline level">outline level</link> to a paragraph style, and then apply the style to the chapter headings in your document.</ahelp>
+<paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="U" oldref="2"><variable id="optionentext"><ahelp hid="modules/swriter/ui/insertcaption/options">Adds the chapter number to the caption label. To use this feature, you must first assign an <link href="text/swriter/guide/chapter_numbering.xhp" name="outline level">outline level</link> to a paragraph style, and then apply the style to the chapter headings in your document.</ahelp>
 </variable></paragraph>
 <section id="howtoget">
   <embed href="text/swriter/00/00000404.xhp#nummernkreisoptionen"/>
commit 915fec85bbe8655bbf90e5f195dd82c94df23e1d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 14 10:14:55 2012 +0000

    update help ids for template management .ui conversion

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 77a758d..dc9f2ae 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -7550,8 +7550,6 @@ sfx2_ListBox_DLG_DOC_TEMPLATE_LB_SECTION,1107398146,
 sfx2_ListBox_DLG_DOC_TEMPLATE_LB_STYLESHEETS,1107398148,
 sfx2_ListBox_DLG_NEW_FILE_LB_REGION,1107381781,
 sfx2_ListBox_DLG_NEW_FILE_LB_TEMPLATE,1107381812,
-sfx2_ListBox_DLG_ORGANIZE_LB_LEFT_TYP,1107414530,
-sfx2_ListBox_DLG_ORGANIZE_LB_RIGHT_TYP,1107414539,
 sfx2_ListBox_RID_STYLECATALOG_BT_FLIST,1097682440,
 sfx2_ListBox_RID_STYLECATALOG_BT_TOOL,1097682442,
 sfx2_ListBox_TP_COMMONPRINTOPTIONS_LB_REDUCEBITMAPS_RESOLUTION,576163363,
@@ -7560,8 +7558,6 @@ sfx2_ListBox_TP_HELP_SEARCH_LB_RESULT,546999824,
 sfx2_ListBox_TP_MANAGE_STYLES_LB_BASE,541249030,
 sfx2_ListBox_TP_MANAGE_STYLES_LB_NEXT,541249028,
 sfx2_ListBox_TP_MANAGE_STYLES_LB_REGION,541249032,
-sfx2_MenuButton_DLG_ORGANIZE_BTN_EDIT,1107423337,
-sfx2_Menu_DLG_ORGANIZE_BTN_EDIT,1075462144,
 sfx2_ModalDialog_DLG_COMMENTS,1112702976,
 sfx2_ModalDialog_DLG_HELP_ADDBOOKMARK,1083899904,
 sfx2_ModalDialog_DLG_VERSIONS,1112686592,
@@ -7580,8 +7576,6 @@ sfx2_PushButton_DLG_COMMENTS_PB_CLOSE,1112707592,
 sfx2_PushButton_DLG_DOC_TEMPLATE_BT_EDIT,1107399180,
 sfx2_PushButton_DLG_DOC_TEMPLATE_BT_ORGANIZE,1107399188,
 sfx2_PushButton_DLG_NEW_FILE_PB_LOAD_FILE,1107382822,
-sfx2_PushButton_DLG_ORGANIZE_BTN_ADDRESSTEMPLATE,1107415556,
-sfx2_PushButton_DLG_ORGANIZE_BTN_FILES,1107415555,
 sfx2_PushButton_DLG_VERSIONS_PB_COMPARE,1112691217,
 sfx2_PushButton_DLG_VERSIONS_PB_DELETE,1112691205,
 sfx2_PushButton_DLG_VERSIONS_PB_OPEN,1112691206,
diff --git a/source/text/shared/01/01110100.xhp b/source/text/shared/01/01110100.xhp
index af12396..f99c1ee 100644
--- a/source/text/shared/01/01110100.xhp
+++ b/source/text/shared/01/01110100.xhp
@@ -45,65 +45,62 @@
 <bookmark_value>exporting; templates</bookmark_value>
 </bookmark>
 <paragraph role="paragraph" id="par_id3148668" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Organizer" id="bm_id7408992" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:Organizer" id="bm_id3154184" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Organizer" id="bm_id7408992" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/TemplateManagementDialog" id="bm_id3154294" localize="false"/>
 <paragraph role="heading" id="hd_id3148585" xml-lang="en-US" level="1" l10n="U" oldref="40"><link href="text/shared/01/01110100.xhp" name="Template Management">Template Management</link></paragraph>
 <paragraph role="paragraph" id="par_id3152924" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Organizer">Opens the <emph>Template Management</emph> dialog where you can organize templates and define default templates.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#verwalten"/>
 </section>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_CTL_ORGANIZER_LEFT" id="bm_id3152425" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_CTL_ORGANIZER_RIGHT" id="bm_id3149346" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/leftorganizer" id="bm_id3152425" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/rightorganizer" id="bm_id3149346" localize="false"/>
 <paragraph role="heading" id="hd_id3152801" xml-lang="en-US" level="2" l10n="U" oldref="3">Left and Right Selection List (Templates / Documents)</paragraph>
-<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="C"><ahelp hid="HID_CTL_ORGANIZER_RIGHT">Displays the available template categories or opened $[officename] files. To change the contents of the list, select <emph>Templates</emph> or <emph>Documents</emph> in the box below.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149177" xml-lang="en-US" l10n="C"><ahelp hid="sfx/ui/templatemanagementdialog/rightorganizer">Displays the available template categories or opened $[officename] files. To change the contents of the list, select <emph>Templates</emph> or <emph>Documents</emph> in the box below.</ahelp></paragraph>
 <paragraph role="note" id="par_id3166410" xml-lang="en-US" l10n="CHG" oldref="34">To change the default template path, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="$[officename] - Paths">$[officename] - Paths</link></emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_ORGANIZE:LB_LEFT_TYP" id="bm_id3145120" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sfx2:ListBox:DLG_ORGANIZE:LB_RIGHT_TYP" id="bm_id3154307" localize="false"/>
-<paragraph role="paragraph" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SFX2:LISTBOX:DLG_ORGANIZE:LB_RIGHT_TYP">Select <emph>Templates</emph> or <emph>Documents</emph> to change the contents that are displayed in the list above.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/leftype" id="bm_id3145120" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/righttype" id="bm_id3154307" localize="false"/>
+<paragraph role="paragraph" id="par_id3154810" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="sfx/ui/templatemanagementdialog/righttype">Select <emph>Templates</emph> or <emph>Documents</emph> to change the contents that are displayed in the list above.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149191" xml-lang="en-US" l10n="U" oldref="36">Template categories are represented by folder icons. To view the template files for a category, double-click a folder.</paragraph>
 <paragraph role="paragraph" id="par_id3159166" xml-lang="en-US" l10n="C">To view the styles that are used in a file, double-click the file name, and then double-click the <emph>Styles</emph> icon.</paragraph>
 <paragraph role="paragraph" id="par_id3155504" xml-lang="en-US" l10n="U" oldref="35">To copy a style, hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and drag the style from one file to another file. To move a style, drag the style from one file to another file.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:MenuButton:DLG_ORGANIZE:BTN_EDIT" id="bm_id3153542" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/commands" id="bm_id3153542" localize="false"/>
 <paragraph role="heading" id="hd_id3149578" xml-lang="en-US" level="2" l10n="U" oldref="8">Commands</paragraph>
-<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SFX2:MENUBUTTON:DLG_ORGANIZE:BTN_EDIT">Contains commands for managing and editing your templates and documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="sfx/ui/templatemanagementdialog/commands">Contains commands for managing and editing your templates and documents.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149575" xml-lang="en-US" l10n="U" oldref="37">Depending on the type of file you select in the list, the following commands are available:</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_ORGANIZE_NEW" id="bm_id3147531" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/new" id="bm_id3147531" localize="false"/>
 <paragraph role="heading" id="hd_id3153062" xml-lang="en-US" level="3" l10n="U" oldref="10">New</paragraph>
-<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="HID_ORGANIZE_NEW">Creates a new template category.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_ORGANIZE_DELETE" id="bm_id3149295" localize="false"/>
+<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="sfx/ui/templatemanagementdialog/new">Creates a new template category.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/delete" id="bm_id3149295" localize="false"/>
 <paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="12">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_ORGANIZE_DELETE">Deletes the current selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_ORGANIZE_EDIT" id="bm_id3161656" localize="false"/>
+<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="sfx/ui/templatemanagementdialog/delete">Deletes the current selection.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/edit" id="bm_id3161656" localize="false"/>
 <paragraph role="heading" id="hd_id3154388" xml-lang="en-US" level="3" l10n="U" oldref="14">Edit</paragraph>
-<paragraph role="paragraph" id="par_id3156435" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="HID_ORGANIZE_EDIT">Opens the selected template for editing.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_ORGANIZE_COPY_FROM" id="bm_id3153524" localize="false"/>
+<paragraph role="paragraph" id="par_id3156435" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="sfx/ui/templatemanagementdialog/edit">Opens the selected template for editing.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/copyfrom" id="bm_id3153524" localize="false"/>
 <paragraph role="heading" id="hd_id3151106" xml-lang="en-US" level="3" l10n="U" oldref="16">Import Templates</paragraph>
-<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="HID_ORGANIZE_COPY_FROM">Imports an additional template. To import a template, select a template folder in the list, click the <emph>Command</emph> button, and then select <emph>Import template</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_ORGANIZE_COPY_TO" id="bm_id3149810" localize="false"/>
+<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="sfx/ui/templatemanagementdialog/copyfrom">Imports an additional template. To import a template, select a template folder in the list, click the <emph>Command</emph> button, and then select <emph>Import template</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/copyto" id="bm_id3149810" localize="false"/>
 <paragraph role="heading" id="hd_id3154821" xml-lang="en-US" level="3" l10n="U" oldref="19">Export Template</paragraph>
-<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="HID_ORGANIZE_COPY_TO">Exports the selected template.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_ORGANIZE_PRINT" id="bm_id3149202" localize="false"/>
+<paragraph role="paragraph" id="par_id3153104" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="sfx/ui/templatemanagementdialog/copyto">Exports the selected template.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/print" id="bm_id3149202" localize="false"/>
 <paragraph role="heading" id="hd_id3150651" xml-lang="en-US" level="3" l10n="U" oldref="26">Print</paragraph>
-<paragraph role="paragraph" id="par_id3154946" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_ORGANIZE_PRINT">Prints the name and properties of the styles that are used in the file.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_ORGANIZE_PRINTER_SETUP" id="bm_id3145204" localize="false"/>
+<paragraph role="paragraph" id="par_id3154946" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="sfx/ui/templatemanagementdialog/print">Prints the name and properties of the styles that are used in the file.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/printersetup" id="bm_id3145204" localize="false"/>
 <paragraph role="heading" id="hd_id3150767" xml-lang="en-US" level="3" l10n="U" oldref="28">Printer Setup</paragraph>
-<paragraph role="paragraph" id="par_id3147086" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="HID_ORGANIZE_PRINTER_SETUP">Changes the printer and its settings for the selected document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_ORGANIZE_RESCAN" id="bm_id3155994" localize="false"/>
+<paragraph role="paragraph" id="par_id3147086" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="printersetup">Changes the printer and its settings for the selected document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/rescan" id="bm_id3155994" localize="false"/>
 <paragraph role="heading" id="hd_id3143231" xml-lang="en-US" level="3" l10n="U" oldref="30">Update</paragraph>
-<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="HID_ORGANIZE_RESCAN">Updates the contents of the lists.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_ORGANIZE_STDTEMPLATE_ADD" id="bm_id3159255" localize="false"/>
+<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="sfx/ui/templatemanagementdialog/rescan">Updates the contents of the lists.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/defaulttemplate" id="bm_id3159255" localize="false"/>
 <paragraph role="heading" id="hd_id3145607" xml-lang="en-US" level="3" l10n="U" oldref="41">Set As Default Template</paragraph>
-<paragraph role="paragraph" id="par_id3147353" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="HID_ORGANIZE_STDTEMPLATE_ADD">Uses the selected template as the default template when you create a new $[officename] document of the same type.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_ORGANIZE_STDTEMPLATE_DEL" id="bm_id3155131" localize="false"/>
-<paragraph role="heading" id="hd_id3153768" xml-lang="en-US" level="3" l10n="U" oldref="43">Reset Default Template</paragraph>
-<paragraph role="paragraph" id="par_id3155432" xml-lang="en-US" l10n="U" oldref="44"><ahelp hid="HID_ORGANIZE_STDTEMPLATE_DEL">Select a $[officename] document type to reset the default template to the original template.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_ORGANIZE:BTN_ADDRESSTEMPLATE" id="bm_id3151351" localize="false"/>
+<paragraph role="paragraph" id="par_id3147353" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="sfx/ui/templatemanagementdialog/defaulttemplate">Uses the selected template as the default template when you create a new $[officename] document of the same type.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/addressbook" id="bm_id3151351" localize="false"/>
 <paragraph role="heading" id="hd_id3159196" xml-lang="en-US" level="2" l10n="U" oldref="38">Address Book</paragraph>
 <paragraph role="paragraph" id="par_id3154472" xml-lang="en-US" l10n="U" oldref="39">Edit the field assignments and the data source for the address book.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:DLG_ORGANIZE:BTN_FILES" id="bm_id3155366" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx/ui/templatemanagementdialog/file" id="bm_id3155366" localize="false"/>
 <paragraph role="heading" id="hd_id3154151" xml-lang="en-US" level="2" l10n="U" oldref="32">File</paragraph>
-<paragraph role="paragraph" id="par_id3156005" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SFX2:PUSHBUTTON:DLG_ORGANIZE:BTN_FILES">Locate a file that you want to add to the document list, and then click<emph> Open</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156005" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="sfx/ui/templatemanagementdialog/file">Locate a file that you want to add to the document list, and then click<emph> Open</emph>.</ahelp></paragraph>
 <switch select="appl">
 <case select="WRITER">
 <section id="relatedtopics">
commit 5a6c12923c9f6ff499a6447d91e680613be7dd2d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 14 10:01:09 2012 +0000

    update help ids for captions options .ui conversion

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1db03c8..77a758d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1508,7 +1508,6 @@ HID_DLG_RENAME,39005,
 HID_DLG_ROWHEIGHT,38836,
 HID_DLG_SAVE_AS,38845,
 HID_DLG_SECURITY_OPTIONS,39896,
-HID_DLG_SEQUENCE_OPTION,53058,
 HID_DLG_SSLWARN_UUI,35846,
 HID_DLG_TEXT,38843,
 HID_DLG_UNKNOWNAUTH_UUI,35845,
@@ -8916,7 +8915,6 @@ sw_CheckBox_DLG_MM_MERGE_PAGE_CB_WHOLEWORDS,898286600,
 sw_CheckBox_DLG_MM_PREPAREMERGE_PAGE_CB_EXCLUDE,898270216,
 sw_CheckBox_DLG_MM_SERVERAUTHENTICATION_CB_AUTHENTICATION,1427145778,
 sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186,
-sw_CheckBox_DLG_SEQUENCE_OPTION_CB_APPLYBAS,1418003486,
 sw_CheckBox_MD_EDIT_REGION_CB_DDE,1405830145,
 sw_CheckBox_MD_EDIT_REGION_CB_PASSWD,1405830153,
 sw_CheckBox_TP_COLUMN_CB_AUTO_WIDTH,877872132,
@@ -9101,7 +9099,6 @@ sw_Edit_DLG_RENAME_GLOS_ED_ON,1428867077,
 sw_Edit_DLG_RENAME_GLOS_ED_OS,1428867078,
 sw_Edit_DLG_RENAME_XNAMED_ED_NEW_NAME,1415972866,
 sw_Edit_DLG_SAVE_LABEL_ED_TYPE,1446643717,
-sw_Edit_DLG_SEQUENCE_OPTION_ED_SEPARATOR,1418004499,
 sw_Edit_MD_EDIT_REGION_ED_CONDITION,1405831181,
 sw_Edit_MD_EDIT_REGION_ED_FILE,1405831184,
 sw_Edit_MD_EDIT_REGION_ED_RANAME,1405831187,
@@ -9244,9 +9241,6 @@ sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_SENDAS,898305573,
 sw_ListBox_DLG_MULTMRK_LB_TOX,1433456132,
 sw_ListBox_DLG_NUM_NAMES_LB_FORM,1428754026,
 sw_ListBox_DLG_SEL_GLOS_LB_GLOS,1436749313,
-sw_ListBox_DLG_SEQUENCE_OPTION_LB_CHARSTYLE,1418006045,
-sw_ListBox_DLG_SEQUENCE_OPTION_LB_LEVEL,1418006033,
-sw_ListBox_DLG_SEQUENCE_OPTION_LB_ORDER,1418006049,
 sw_ListBox_TP_COLUMN_LB_POSITION,877874726,
 sw_ListBox_TP_COLUMN_LB_STYLE,877874722,
 sw_ListBox_TP_COLUMN_LB_TEXTDIRECTION,877874749,
diff --git a/source/text/swriter/01/04060100.xhp b/source/text/swriter/01/04060100.xhp
index 7135531..cf626ca 100644
--- a/source/text/swriter/01/04060100.xhp
+++ b/source/text/swriter/01/04060100.xhp
@@ -39,22 +39,22 @@ UFI: edited re spec "Enhance Caption Dialog in Writer"</lastedited>
 <section id="howtoget">
   <embed href="text/swriter/00/00000404.xhp#nummernkreisoptionen"/>
 </section>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/captionoptions/CaptionOptionsDialog" id="bm_id3151174" localize="false"/>
 <paragraph role="heading" id="hd_id3149805" xml-lang="en-US" level="2" l10n="U" oldref="3">Numbering by chapter</paragraph>
 <paragraph role="paragraph" id="par_id3153532" xml-lang="en-US" l10n="U" oldref="4">When you add chapter numbers to caption labels, the caption numbering is reset when a chapter heading is encountered. For example, if the last figure in chapter 1 is "Figure 1.12", the first figure in the next chapter would be "Figure 2.1".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SEQUENCE_OPTION:LB_LEVEL" id="bm_id3154479" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/captionoptions/level" id="bm_id3154479" localize="false"/>
 <paragraph role="heading" id="hd_id3154574" xml-lang="en-US" level="3" l10n="U" oldref="5">Level</paragraph>
-<paragraph role="paragraph" id="par_id3152954" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SW:LISTBOX:DLG_SEQUENCE_OPTION:LB_LEVEL">Select the number of outline levels from the top of the chapter hierarchy down to include in the caption label.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_SEQUENCE_OPTION:ED_SEPARATOR" id="bm_id3153672" localize="false"/>
+<paragraph role="paragraph" id="par_id3152954" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="modules/swriter/ui/captionoptions/level">Select the number of outline levels from the top of the chapter hierarchy down to include in the caption label.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/captionoptions/separator" id="bm_id3153672" localize="false"/>
 <paragraph role="heading" id="hd_id3151316" xml-lang="en-US" level="3" l10n="U" oldref="7">Separator</paragraph>
-<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SW:EDIT:DLG_SEQUENCE_OPTION:ED_SEPARATOR">Enter the character that you want to insert between the chapter number and the caption number.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="modules/swriter/ui/captionoptions/separator">Enter the character that you want to insert between the chapter number and the caption number.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10633" xml-lang="en-US" level="2" l10n="NEW">Category and frame format</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:DLG_SEQUENCE_OPTION:LB_CHARSTYLE" id="bm_id8001037" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/captionoptions/style" id="bm_id8001037" localize="false"/>
 <paragraph role="heading" id="par_idN10639" xml-lang="en-US" level="3" l10n="NEW">Character style</paragraph>
 <paragraph role="paragraph" id="par_idN1063F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the character style.</ahelp></paragraph>
-<!-- removed HID SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR -->
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:DLG_SEQUENCE_OPTION:CB_APPLYBAS" id="bm_id2826013" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/captionoptions/border_and_shadow" id="bm_id2826013" localize="false"/>
 <paragraph role="heading" id="hd_id3143280" xml-lang="en-US" level="3" l10n="U" oldref="43">Apply border and shadow</paragraph>
-<paragraph role="paragraph" id="par_id3149826" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="SW:CHECKBOX:DLG_CAPTION:CB_COPY_ATTR">Applies the border and shadow of the object to the caption frame.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149826" xml-lang="en-US" l10n="CHG" oldref="44"><ahelp hid="modules/swriter/ui/captionoptions/border_and_shadow">Applies the border and shadow of the object to the caption frame.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/swriter/guide/captions_numbers.xhp#captions_numbers"/>
 <embed href="text/swriter/guide/captions.xhp#captions"/>


More information about the Libreoffice-commits mailing list