[Libreoffice-commits] .: 6 commits - helpers/help_hid.lst source/text
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 3 07:36:46 PST 2012
helpers/help_hid.lst | 55 -----------------------------------
source/text/scalc/01/12030200.xhp | 56 ++++++++++++++++++------------------
source/text/shared/01/06050600.xhp | 32 ++++++++++----------
source/text/swriter/01/02150000.xhp | 10 ++----
source/text/swriter/01/04030000.xhp | 28 ++++++++----------
source/text/swriter/01/04040000.xhp | 10 +++---
source/text/swriter/01/04200000.xhp | 28 ++++++++----------
source/text/swriter/01/06060100.xhp | 34 ++++++++++-----------
8 files changed, 96 insertions(+), 157 deletions(-)
New commits:
commit 9a488450c8fec4ec520541d50683b07b9bd86b22
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 3 14:57:53 2012 +0000
update help ids for insert script .ui conversion
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2ca3e8d..625f1d2 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -9076,8 +9076,6 @@ sw_Edit_DLG_FLD_INPUT_ED_LABEL,1419528199,
sw_Edit_DLG_GLOSSARY_ED_NAME,1428637700,
sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698,
sw_Edit_DLG_INSERT_CHART_ED_RANGE,2499119105,
-sw_Edit_DLG_JAVAEDIT_ED_TYPE,1419610123,
-sw_Edit_DLG_JAVAEDIT_ED_URL,1419610132,
sw_Edit_DLG_MAILMERGE_ED_ATTACH,1446610977,
sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969,
sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960,
@@ -9186,8 +9184,6 @@ sw_ImageButton_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ALL_TO,1435053589,
sw_ImageButton_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ONE_FROM,1435053591,
sw_ImageButton_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ONE_TO,1435053590,
sw_ImageButton_DLG_AP_INSERT_DB_SEL_IB_DBCOL_TOEDIT,1435053584,
-sw_ImageButton_DLG_JAVAEDIT_BTN_NEXT,1419619856,
-sw_ImageButton_DLG_JAVAEDIT_BTN_PREV,1419619855,
sw_ImageButton_DLG_MM_ADDRESSBLOCK_PAGE_IB_NEXTSET,898248204,
sw_ImageButton_DLG_MM_ADDRESSBLOCK_PAGE_IB_PREVSET,898248203,
sw_ImageButton_DLG_MM_CUSTOMIZEADDRESSBLOCK_IB_DOWN,1435315765,
@@ -9424,11 +9420,9 @@ sw_MetricField_TP_TEXTGRID_PAGE_MF_TEXTSIZE,879319563,
sw_MetricField_TP_TOX_ENTRY_MF_TABPOS,879155764,
sw_ModalDialog_DLG_CHANGE_DB,1419591680,
sw_ModalDialog_DLG_DBSELECTION,1435009024,
-sw_ModalDialog_DLG_JAVAEDIT,1419608064,
sw_ModalDialog_DLG_MAILMERGEWIZARD,1435058176,
sw_MultiLineEdit_DLG_AP_INSERT_DB_SEL_ED_DB_TEXT,1435044369,
sw_MultiLineEdit_DLG_FLD_INPUT_ED_EDIT,1419528707,
-sw_MultiLineEdit_DLG_JAVAEDIT_ED_EDIT,1419610637,
sw_MultiLineEdit_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDWARNING_ED_DETAILS,1972357645,
sw_MultiLineEdit_DLG_MM_CUSTOMIZEADDRESSBLOCK_ED_DRAG,1435306545,
sw_MultiLineEdit_DLG_MM_MAILBODY_MLE_BODY,1435404831,
@@ -9487,7 +9481,6 @@ sw_PushButton_DLG_GLOSSARY_PB_PATH,1428640312,
sw_PushButton_DLG_INSERT_CHART_BT_FINISH,2499121668,
sw_PushButton_DLG_INSERT_CHART_BT_NEXT,2499121667,
sw_PushButton_DLG_INSERT_CHART_BT_PREV,2499121673,
-sw_PushButton_DLG_JAVAEDIT_PB_URL,1419612693,
sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_CLOSE,1972294214,
sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_DETAILS,1972294210,
sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_STOP,1972294213,
@@ -9588,8 +9581,6 @@ sw_RadioButton_DLG_AP_INSERT_DB_SEL_RB_HEADL_EMPTY,1435042334,
sw_RadioButton_DLG_ASCII_FILTER_RB_CR,1404846602,
sw_RadioButton_DLG_ASCII_FILTER_RB_CRLF,1404846601,
sw_RadioButton_DLG_ASCII_FILTER_RB_LF,1404846603,
-sw_RadioButton_DLG_JAVAEDIT_RB_EDIT,1419608588,
-sw_RadioButton_DLG_JAVAEDIT_RB_URL,1419608595,
sw_RadioButton_DLG_MAILMERGE_RB_ALL,1446609410,
sw_RadioButton_DLG_MAILMERGE_RB_FILE,1446609431,
sw_RadioButton_DLG_MAILMERGE_RB_FROM,1446609412,
diff --git a/source/text/swriter/01/04200000.xhp b/source/text/swriter/01/04200000.xhp
index bc84f12..0010187 100644
--- a/source/text/swriter/01/04200000.xhp
+++ b/source/text/swriter/01/04200000.xhp
@@ -38,8 +38,7 @@
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/sw:ModalDialog:DLG_JAVAEDIT" id="bm_id3083451" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertScript" id="bm_id106266" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertscript/InsertScriptDialog" id="bm_id3083451" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertScript" id="bm_id3146320" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147402" role="heading" level="1" l10n="U" oldref="1">Insert Script</paragraph>
<paragraph xml-lang="en-US" id="par_id3155620" role="paragraph" l10n="U" oldref="2"><variable id="scripttext"><ahelp hid=".uno:InsertScript">Inserts a script at the current cursor position in an HTML or text document.</ahelp>
@@ -49,32 +48,32 @@
</section>
<paragraph xml-lang="en-US" id="par_id3149880" role="paragraph" l10n="CHG" oldref="4">An inserted script is indicated by a small green rectangle. If you do not see the rectangle, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - <link href="text/shared/optionen/01040200.xhp" name="View">View</link></emph>, and select the <emph>Comments</emph> check box. To edit a script, double-click the green rectangle.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150572" role="paragraph" l10n="U" oldref="5">If your document contains more than one script, the <emph>Edit Script</emph> dialog contains previous and next buttons to jump from script to script.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_JAVAEDIT:BTN_PREV" id="bm_id3149710" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertscript/previous" id="bm_id3149710" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0903200802541668" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Previous Script.</ahelp></paragraph>
<embed href="text/swriter/00/00000004.xhp#nopfli"/>
-<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_JAVAEDIT:BTN_NEXT" id="bm_id3150761" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertscript/next" id="bm_id3150761" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0903200802541770" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Next Script.</ahelp></paragraph>
<embed href="text/swriter/00/00000004.xhp#nopfre"/>
<paragraph xml-lang="en-US" id="hd_id3154644" role="heading" level="2" l10n="U" oldref="7">Contents</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_JAVAEDIT:ED_TYPE" id="bm_id3151177" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertscript/scripttype" id="bm_id3151177" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U" oldref="9">Script Type</paragraph>
- <paragraph xml-lang="en-US" id="par_id3145413" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:EDIT:DLG_JAVAEDIT:ED_TYPE">Enter the type of script that you want to insert.</ahelp> The script is identified in the HTML source code by the tag <SCRIPT LANGUAGE="JavaScript">.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_JAVAEDIT:RB_URL" id="bm_id3149800" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_JAVAEDIT:ED_URL" id="bm_id3149803" localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id3145413" role="paragraph" l10n="U" oldref="10"><ahelp hid="modules/swriter/ui/insertscript/scripttype">Enter the type of script that you want to insert.</ahelp> The script is identified in the HTML source code by the tag <SCRIPT LANGUAGE="JavaScript">.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertscript/url" id="bm_id3149800" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertscript/urlentry" id="bm_id3149803" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154097" role="heading" level="2" l10n="U"
oldref="13">URL</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149810" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="SW:EDIT:DLG_JAVAEDIT:ED_URL">Adds a link to a script file. Click the <emph>URL </emph>radio button, and then enter the link in the box. You can also click the browse button (<emph>...</emph>), locate the file, and then click <emph>Insert</emph>.</ahelp> The linked script file is identified in the HTML source code by the following tags:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149810" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="modules/swriter/ui/insertscript/urlentry">Adds a link to a script file. Click the <emph>URL </emph>radio button, and then enter the link in the box. You can also click the browse button (<emph>...</emph>), locate the file, and then click <emph>Insert</emph>.</ahelp> The linked script file is identified in the HTML source code by the following tags:</paragraph>
<paragraph xml-lang="en-US" id="par_id3152963" role="paragraph" l10n="U" oldref="15"><SCRIPT LANGUAGE="JavaScript" SRC="url"></paragraph>
<paragraph xml-lang="en-US" id="par_id3153678" role="paragraph" l10n="U" oldref="16">/* ignore all text here */</paragraph>
<paragraph xml-lang="en-US" id="par_id3154574" role="paragraph" l10n="U" oldref="17"></SCRIPT></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_JAVAEDIT:PB_URL" id="bm_id3149692" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertscript/browse" id="bm_id3149692" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155903" role="heading" level="2" l10n="U"
oldref="19">...</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154188" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:PUSHBUTTON:DLG_JAVAEDIT:PB_URL">Locate the script file that you want to link to, and then click <emph>Insert</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MultiLineEdit:DLG_JAVAEDIT:ED_EDIT" id="bm_id3149489" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_JAVAEDIT:RB_EDIT" id="bm_id3149493" localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id3154188" role="paragraph" l10n="U" oldref="20"><ahelp hid="modules/swriter/ui/insertscript/browse">Locate the script file that you want to link to, and then click <emph>Insert</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertscript/textentry" id="bm_id3149489" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertscript/text" id="bm_id3149493" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155184" role="heading" level="2" l10n="U"
oldref="11">Text</paragraph>
- <paragraph xml-lang="en-US" id="par_id3143272" role="paragraph" l10n="U" oldref="12"><ahelp hid="SW:RADIOBUTTON:DLG_JAVAEDIT:RB_EDIT">Enter the script code that you want to insert.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3143272" role="paragraph" l10n="U" oldref="12"><ahelp hid="modules/swriter/ui/insertscript/text">Enter the script code that you want to insert.</ahelp></paragraph>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
commit 4e5f401564958994e3b3b2e9a522a3fe591dea65
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 3 14:50:17 2012 +0000
update help ids for sort options page
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2dc157e..2ca3e8d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3348,7 +3348,6 @@ HID_SCPAGE_OPREDLINE,58933,
HID_SCPAGE_PRINT,58884,
HID_SCPAGE_PROTECTION,58877,
HID_SCPAGE_SORT_FIELDS,58873,
-HID_SCPAGE_SORT_OPTIONS,58874,
HID_SCPAGE_SUBT_GROUP,58876,
HID_SCPAGE_SUBT_GROUP1,58885,
HID_SCPAGE_SUBT_GROUP2,58886,
@@ -6798,11 +6797,6 @@ sc_CheckBox_RID_SCPAGE_LAYOUT_CB_REPLWARN,958202959,
sc_CheckBox_RID_SCPAGE_LAYOUT_CB_TEXTFMT,958202958,
sc_CheckBox_RID_SCPAGE_PRINT_BTN_SELECTEDSHEETS,957481988,
sc_CheckBox_RID_SCPAGE_PRINT_BTN_SKIPEMPTYPAGES,957481986,
-sc_CheckBox_RID_SCPAGE_SORT_OPTIONS_BTN_CASESENSITIVE,956449800,
-sc_CheckBox_RID_SCPAGE_SORT_OPTIONS_BTN_COPYRESULT,956449803,
-sc_CheckBox_RID_SCPAGE_SORT_OPTIONS_BTN_FORMATS,956449802,
-sc_CheckBox_RID_SCPAGE_SORT_OPTIONS_BTN_LABEL,956449801,
-sc_CheckBox_RID_SCPAGE_SORT_OPTIONS_BTN_SORT_USER,956449799,
sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_CASE,956810262,
sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_FORMATS,956810273,
sc_CheckBox_RID_SCPAGE_SUBT_OPTIONS_BTN_PAGEBREAK,956810261,
@@ -6896,7 +6890,6 @@ sc_Edit_RID_SCDLG_TABOP_ED_ROWCELL,2567899138,
sc_Edit_RID_SCDLG_TABPROTECTION_ED_PASSWORD1,1495631878,
sc_Edit_RID_SCDLG_TABPROTECTION_ED_PASSWORD2,1495631880,
sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637,
-sc_Edit_RID_SCPAGE_SORT_OPTIONS_ED_OUTAREA,956450820,
sc_Edit_RID_SCPAGE_USERLISTS_ED_COPYFROM,956844035,
sc_Edit_TP_VALIDATION_ERROR_EDT_TITLE,548309005,
sc_Edit_TP_VALIDATION_INPUTHELP_EDT_TITLE,548292621,
@@ -7029,10 +7022,6 @@ sc_ListBox_RID_SCPAGE_OPREDLINE_CLB_REMOVE,958369282,
sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972,
sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973,
sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
-sc_ListBox_RID_SCPAGE_SORT_OPTIONS_LB_ALGORITHM,956452371,
-sc_ListBox_RID_SCPAGE_SORT_OPTIONS_LB_LANGUAGE,956452369,
-sc_ListBox_RID_SCPAGE_SORT_OPTIONS_LB_OUTAREA,956452355,
-sc_ListBox_RID_SCPAGE_SORT_OPTIONS_LB_SORT_USER,956452354,
sc_ListBox_RID_SCPAGE_SUBT_OPTIONS_LB_USERDEF,956812835,
sc_ListBox_RID_SCPAGE_TABLE_LB_SCALEMODE,957042207,
sc_ListBox_RID_SCPAGE_USERLISTS_LB_LISTS,956845569,
@@ -7202,8 +7191,6 @@ sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_DOWN3,956432908,
sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP1,956432903,
sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP2,956432904,
sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP3,956432905,
-sc_RadioButton_RID_SCPAGE_SORT_OPTIONS_BTN_LEFT_RIGHT,956449293,
-sc_RadioButton_RID_SCPAGE_SORT_OPTIONS_BTN_TOP_DOWN,956449292,
sc_RadioButton_RID_SCPAGE_SUBT_OPTIONS_BTN_ASCENDING,956809759,
sc_RadioButton_RID_SCPAGE_SUBT_OPTIONS_BTN_DESCENDING,956809760,
sc_RadioButton_RID_SCPAGE_TABLE_BTN_LEFTRIGHT,957039125,
diff --git a/source/text/scalc/01/12030200.xhp b/source/text/scalc/01/12030200.xhp
index eb4ea30..aec3e16 100644
--- a/source/text/scalc/01/12030200.xhp
+++ b/source/text/scalc/01/12030200.xhp
@@ -52,55 +52,55 @@ YJ: checked again</lastedited>
<bookmark_value>phonebook sorting rules</bookmark_value>
<bookmark_value>natural sort algorithm</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_SCPAGE_SORT_OPTIONS" id="bm_id3151044" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortpage/SortPage" id="bm_id3151044" localize="false"/>
<paragraph role="heading" id="hd_id3147228" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/12030200.xhp" name="Options"> Options</link></paragraph>
-<paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_SORT_OPTIONS"> Sets additional sorting options.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="modules/scalc/ui/sortpage/SortPage"> Sets additional sorting options.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/scalc/00/00000412.xhp#dnstot"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_CASESENSITIVE" id="bm_id3149664" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortpage/case" id="bm_id3149664" localize="false"/>
<paragraph role="heading" id="hd_id3146976" xml-lang="en-US" level="2" l10n="U" oldref="3"> Case Sensitivity</paragraph>
-<paragraph role="paragraph" id="par_id3153091" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_CASESENSITIVE"> Sorts first by uppercase letters and then by lowercase letters. For Asian languages, special handling applies.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153091" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="modules/scalc/ui/sortpage/case"> Sorts first by uppercase letters and then by lowercase letters. For Asian languages, special handling applies.</ahelp></paragraph>
<paragraph role="note" id="par_idN10637" xml-lang="en-US" l10n="NEW"> Note for Asian languages: Check <emph>Case Sensitivity</emph> to apply multi-level collation. With multi-level collation, entries are first compared in their primitive forms with their cases and diacritics ignored. If they evaluate as the same, their diacritics are taken into account for the second-level comparison. If they still evaluate as the same, their cases, character widths, and Japanese Kana difference are considered for the third-level comparison.<comment>UFI: see #112590# and #112507#</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_LABEL" id="bm_id3145271" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortpage/header" id="bm_id3145271" localize="false"/>
<paragraph role="heading" id="hd_id3155856" xml-lang="en-US" level="2" l10n="U" oldref="5"> Range contains column/row labels</paragraph>
-<paragraph role="paragraph" id="par_id3154014" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_LABEL"> Omits the first row or the first column in the selection from the sort.</ahelp> The <emph>Direction</emph> setting at the bottom of the dialog defines the name and function of this check box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_FORMATS" id="bm_id3149410" localize="false"/>
+<paragraph role="paragraph" id="par_id3154014" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="modules/scalc/ui/sortpage/header"> Omits the first row or the first column in the selection from the sort.</ahelp> The <emph>Direction</emph> setting at the bottom of the dialog defines the name and function of this check box.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortpage/formats" id="bm_id3149410" localize="false"/>
<paragraph role="heading" id="hd_id3147436" xml-lang="en-US" level="2" l10n="U" oldref="7"> Include formats</paragraph>
-<paragraph role="paragraph" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_FORMATS"> Preserves the current cell formatting.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_NATURALSORT" id="bm_id3149412" localize="false"/>
+<paragraph role="paragraph" id="par_id3149377" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="modules/scalc/ui/sortpage/formats"> Preserves the current cell formatting.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortpage/naturalsort" id="bm_id3149412" localize="false"/>
<paragraph role="heading" id="hd_id3147438" xml-lang="en-US" level="2" l10n="U">Enable natural sort</paragraph>
-<paragraph role="paragraph" id="par_id3149378" xml-lang="en-US" l10n="U"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_NATURALSORT">Natural sort is a sort algorithm that sorts string-prefixed numbers based on the value of the numerical element in each sorted number, instead of the traditional way of sorting them as ordinary strings.</ahelp> For instance, let's assume you have a series of values such as, A1, A2, A3, A4, A5, A6, ..., A19, A20, A21. When you put these values into a range of cells and run the sort, it will become A1, A11, A12, A13, ..., A19, A2, A20, A21, A3, A4, A5, ..., A9. While this sorting behavior may make sense to those who understand the underlying sorting mechanism, to the rest of the population it seems completely bizarre, if not outright inconvenient. With the natural sort feature enabled, values such as the ones in the above example get sorted "properly", which improves the convenience of sorting operations in general.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_COPYRESULT" id="bm_id3147124" localize="false"/>
+<paragraph role="paragraph" id="par_id3149378" xml-lang="en-US" l10n="U"><ahelp hid="modules/scalc/ui/sortpage/naturalsort">Natural sort is a sort algorithm that sorts string-prefixed numbers based on the value of the numerical element in each sorted number, instead of the traditional way of sorting them as ordinary strings.</ahelp> For instance, let's assume you have a series of values such as, A1, A2, A3, A4, A5, A6, ..., A19, A20, A21. When you put these values into a range of cells and run the sort, it will become A1, A11, A12, A13, ..., A19, A2, A20, A21, A3, A4, A5, ..., A9. While this sorting behavior may make sense to those who understand the underlying sorting mechanism, to the rest of the population it seems completely bizarre, if not outright inconvenient. With the natural sort feature enabled, values such as the ones in the above example get sorted "properly", which improves the convenience of sorting operations in general.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortpage/copyresult" id="bm_id3147124" localize="false"/>
<paragraph role="heading" id="hd_id3153878" xml-lang="en-US" level="2" l10n="U" oldref="10"> Copy sort results to:</paragraph>
-<paragraph role="paragraph" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_COPYRESULT"> Copies the sorted list to the cell range that you specify.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_OUTAREA" id="bm_id3149403" localize="false"/>
+<paragraph role="paragraph" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="modules/scalc/ui/sortpage/copyresult"> Copies the sorted list to the cell range that you specify.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortpage/outarealb" id="bm_id3149403" localize="false"/>
<paragraph role="heading" id="hd_id3153418" xml-lang="en-US" level="3" l10n="U" oldref="12"> Sort results</paragraph>
-<paragraph role="paragraph" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_OUTAREA"> Select a named <link href="text/scalc/01/12010000.xhp" name="cell range"> cell range</link> where you want to display the sorted list, or enter a cell range in the input box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCPAGE_SORT_OPTIONS:ED_OUTAREA" id="bm_id3153767" localize="false"/>
+<paragraph role="paragraph" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="modules/scalc/ui/sortpage/outarealb"> Select a named <link href="text/scalc/01/12010000.xhp" name="cell range"> cell range</link> where you want to display the sorted list, or enter a cell range in the input box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="modules/scalc/ui/sortpage/outareaed" id="bm_id3153767" localize="false"/>
<paragraph role="heading" id="hd_id3153707" xml-lang="en-US" level="3" l10n="U" oldref="14"> Sort results</paragraph>
-<paragraph role="paragraph" id="par_id3145642" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="SC:EDIT:RID_SCPAGE_SORT_OPTIONS:ED_OUTAREA"> Enter the cell range where you want to display the sorted list, or select a named range from the list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_SORT_USER" id="bm_id3147339" localize="false"/>
+<paragraph role="paragraph" id="par_id3145642" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="modules/scalc/ui/sortpage/outareaed"> Enter the cell range where you want to display the sorted list, or select a named range from the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortpage/sortuser" id="bm_id3147339" localize="false"/>
<paragraph role="heading" id="hd_id3155445" xml-lang="en-US" level="2" l10n="CHG" oldref="16"> Custom sort order</paragraph>
-<paragraph role="paragraph" id="par_id3156385" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_SORT_OPTIONS:BTN_SORT_USER"> Click here and then select the custom sort order that you want.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER" id="bm_id3146917" localize="false"/>
+<paragraph role="paragraph" id="par_id3156385" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="modules/scalc/ui/sortpage/sortuser"> Click here and then select the custom sort order that you want.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortpage/sortuserlb" id="bm_id3146917" localize="false"/>
<paragraph role="heading" id="hd_id3154704" xml-lang="en-US" level="3" l10n="U" oldref="18"> Custom sort order</paragraph>
-<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER"> Select the custom sort order that you want to apply. To define a custom sort order, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060400.xhp" name="%PRODUCTNAME Calc - Sort Lists">%PRODUCTNAME Calc - Sort Lists</link> .</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="modules/scalc/ui/sortpage/sortuserlb"> Select the custom sort order that you want to apply. To define a custom sort order, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060400.xhp" name="%PRODUCTNAME Calc - Sort Lists">%PRODUCTNAME Calc - Sort Lists</link> .</ahelp></paragraph>
<paragraph role="heading" id="hd_id3149257" xml-lang="en-US" level="2" l10n="U" oldref="28"> Language</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_LANGUAGE" id="bm_id3150299" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortpage/language" id="bm_id3150299" localize="false"/>
<paragraph role="heading" id="hd_id3147004" xml-lang="en-US" level="3" l10n="U" oldref="29"> Language</paragraph>
-<paragraph role="paragraph" id="par_id3150787" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="SC_LISTBOX_RID_SCPAGE_SORT_OPTIONS_LB_LANGUAGE"> Select the language for the sorting rules.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_ALGORITHM" id="bm_id3150304" localize="false"/>
+<paragraph role="paragraph" id="par_id3150787" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid="modules/scalc/ui/sortpage/language"> Select the language for the sorting rules.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortpage/algorithmlb" id="bm_id3150304" localize="false"/>
<paragraph role="heading" id="hd_id3150344" xml-lang="en-US" level="3" l10n="U" oldref="30"> Options</paragraph>
-<paragraph role="paragraph" id="par_id3155113" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SC_LISTBOX_RID_SCPAGE_SORT_OPTIONS_LB_ALGORITHM"> Select a sorting option for the language.</ahelp> For example, select the "phonebook" option for German to include the umlaut special character in the sorting.</paragraph>
+<paragraph role="paragraph" id="par_id3155113" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="modules/scalc/ui/sortpage/algorithmlb"> Select a sorting option for the language.</ahelp> For example, select the "phonebook" option for German to include the umlaut special character in the sorting.</paragraph>
<paragraph role="heading" id="hd_id3152580" xml-lang="en-US" level="2" l10n="U" oldref="20"> Direction</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_TOP_DOWN" id="bm_id3155507" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortpage/topdown" id="bm_id3155507" localize="false"/>
<paragraph role="heading" id="hd_id3154201" xml-lang="en-US" level="3" l10n="U" oldref="22"> Top to Bottom (Sort Rows)</paragraph>
-<paragraph role="paragraph" id="par_id3166430" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_OPTIONS:BTN_TOP_DOWN"> Sorts rows by the values in the active columns of the selected range.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_LEFT_RIGHT" id="bm_id3155529" localize="false"/>
+<paragraph role="paragraph" id="par_id3166430" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="modules/scalc/ui/sortpage/topdown"> Sorts rows by the values in the active columns of the selected range.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/sortpage/leftright" id="bm_id3155529" localize="false"/>
<paragraph role="heading" id="hd_id3145588" xml-lang="en-US" level="3" l10n="U" oldref="24"> Left to Right (Sort Columns)</paragraph>
-<paragraph role="paragraph" id="par_id3154370" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_SORT_OPTIONS:BTN_LEFT_RIGHT"> Sorts columns by the values in the active rows of the selected range.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154370" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="modules/scalc/ui/sortpage/leftright"> Sorts columns by the values in the active rows of the selected range.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3156290" xml-lang="en-US" level="2" l10n="U" oldref="26"> Data area</paragraph>
<paragraph role="paragraph" id="par_id3156446" xml-lang="en-US" l10n="U" oldref="27"> Displays the cell range that you want to sort.</paragraph>
</body>
commit 0e4327f816c56fd210a8e44f20f17b6b130a9490
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 3 14:39:24 2012 +0000
update help ids for insert footnote .ui conversion
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a8327b2..2dc157e 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -9089,7 +9089,6 @@ sw_Edit_DLG_FLD_INPUT_ED_LABEL,1419528199,
sw_Edit_DLG_GLOSSARY_ED_NAME,1428637700,
sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698,
sw_Edit_DLG_INSERT_CHART_ED_RANGE,2499119105,
-sw_Edit_DLG_INS_FOOTNOTE_ED_NUMBER_CHAR,1428654083,
sw_Edit_DLG_JAVAEDIT_ED_TYPE,1419610123,
sw_Edit_DLG_JAVAEDIT_ED_URL,1419610132,
sw_Edit_DLG_MAILMERGE_ED_ATTACH,1446610977,
@@ -9200,8 +9199,6 @@ sw_ImageButton_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ALL_TO,1435053589,
sw_ImageButton_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ONE_FROM,1435053591,
sw_ImageButton_DLG_AP_INSERT_DB_SEL_IB_DBCOL_ONE_TO,1435053590,
sw_ImageButton_DLG_AP_INSERT_DB_SEL_IB_DBCOL_TOEDIT,1435053584,
-sw_ImageButton_DLG_INS_FOOTNOTE_BT_NEXT,1428663912,
-sw_ImageButton_DLG_INS_FOOTNOTE_BT_PREV,1428663911,
sw_ImageButton_DLG_JAVAEDIT_BTN_NEXT,1419619856,
sw_ImageButton_DLG_JAVAEDIT_BTN_PREV,1419619855,
sw_ImageButton_DLG_MM_ADDRESSBLOCK_PAGE_IB_NEXTSET,898248204,
@@ -9440,7 +9437,6 @@ sw_MetricField_TP_TEXTGRID_PAGE_MF_TEXTSIZE,879319563,
sw_MetricField_TP_TOX_ENTRY_MF_TABPOS,879155764,
sw_ModalDialog_DLG_CHANGE_DB,1419591680,
sw_ModalDialog_DLG_DBSELECTION,1435009024,
-sw_ModalDialog_DLG_INS_FOOTNOTE,1428652032,
sw_ModalDialog_DLG_JAVAEDIT,1419608064,
sw_ModalDialog_DLG_MAILMERGEWIZARD,1435058176,
sw_MultiLineEdit_DLG_AP_INSERT_DB_SEL_ED_DB_TEXT,1435044369,
@@ -9504,7 +9500,6 @@ sw_PushButton_DLG_GLOSSARY_PB_PATH,1428640312,
sw_PushButton_DLG_INSERT_CHART_BT_FINISH,2499121668,
sw_PushButton_DLG_INSERT_CHART_BT_NEXT,2499121667,
sw_PushButton_DLG_INSERT_CHART_BT_PREV,2499121673,
-sw_PushButton_DLG_INS_FOOTNOTE_BT_NUMBER_CHAR,1428656644,
sw_PushButton_DLG_JAVAEDIT_PB_URL,1419612693,
sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_CLOSE,1972294214,
sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_DETAILS,1972294210,
@@ -9606,10 +9601,6 @@ sw_RadioButton_DLG_AP_INSERT_DB_SEL_RB_HEADL_EMPTY,1435042334,
sw_RadioButton_DLG_ASCII_FILTER_RB_CR,1404846602,
sw_RadioButton_DLG_ASCII_FILTER_RB_CRLF,1404846601,
sw_RadioButton_DLG_ASCII_FILTER_RB_LF,1404846603,
-sw_RadioButton_DLG_INS_FOOTNOTE_RB_NUMBER_AUTO,1428652545,
-sw_RadioButton_DLG_INS_FOOTNOTE_RB_NUMBER_CHAR,1428652546,
-sw_RadioButton_DLG_INS_FOOTNOTE_RB_TYPE_ENDNOTE,1428652552,
-sw_RadioButton_DLG_INS_FOOTNOTE_RB_TYPE_FTN,1428652551,
sw_RadioButton_DLG_JAVAEDIT_RB_EDIT,1419608588,
sw_RadioButton_DLG_JAVAEDIT_RB_URL,1419608595,
sw_RadioButton_DLG_MAILMERGE_RB_ALL,1446609410,
diff --git a/source/text/swriter/01/02150000.xhp b/source/text/swriter/01/02150000.xhp
index 0d4f558..bd33e59 100644
--- a/source/text/swriter/01/02150000.xhp
+++ b/source/text/swriter/01/02150000.xhp
@@ -38,9 +38,7 @@
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="hid/sw:ModalDialog:DLG_INS_FOOTNOTE" id="bm_id3149483" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:EditFootnote" id="bm_id8871205" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:EditFootnote" id="bm_id3149486" localize="false"/>
<paragraph role="heading" id="hd_id3143276" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/02150000.xhp" name="Edit Footnotes">Footnote/Endnote</link></paragraph>
<paragraph role="paragraph" id="par_id3149097" xml-lang="en-US" l10n="U" oldref="2"><variable id="fusstext"><ahelp hid=".uno:EditFootnote">Edits the selected footnote or endnote anchor. Click in front of the footnote or endnote, and then choose this command.</ahelp>
</variable></paragraph>
@@ -64,9 +62,9 @@
<paragraph role="paragraph" id="par_id3156098" xml-lang="en-US" l10n="U" oldref="21">Converts an endnote to a footnote.</paragraph>
<paragraph role="heading" id="hd_id3156111" xml-lang="en-US" level="3" l10n="U" oldref="17">Endnote</paragraph>
<paragraph role="paragraph" id="par_id3155079" xml-lang="en-US" l10n="U" oldref="22">Converts a footnote to an endnote.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_INS_FOOTNOTE:BT_PREV" id="bm_id3154335" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertfootnote/prev" id="bm_id3154335" localize="false"/>
<paragraph role="heading" id="hd_id3154323" xml-lang="en-US" level="2" l10n="U" oldref="23">Arrow left</paragraph>
-<paragraph role="paragraph" id="par_id3154341" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SW:IMAGEBUTTON:DLG_INS_FOOTNOTE:BT_PREV">Moves to the previous footnote or endnote anchor in the document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154341" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="modules/swriter/ui/insertfootnote/prev">Moves to the previous footnote or endnote anchor in the document.</ahelp></paragraph>
<table id="tbl_id3148791">
<tablerow>
<tablecell>
@@ -80,9 +78,9 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/sw:ImageButton:DLG_INS_FOOTNOTE:BT_NEXT" id="bm_id3149631" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertfootnote/next" id="bm_id3149631" localize="false"/>
<paragraph role="heading" id="hd_id3154630" xml-lang="en-US" level="2" l10n="U" oldref="26">Arrow right</paragraph>
-<paragraph role="paragraph" id="par_id3149638" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="SW:IMAGEBUTTON:DLG_INS_FOOTNOTE:BT_NEXT">Moves to the next footnote or endnote anchor in the document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149638" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="modules/swriter/ui/insertfootnote/next">Moves to the next footnote or endnote anchor in the document.</ahelp></paragraph>
<table id="tbl_id3150662">
<tablerow>
<tablecell>
diff --git a/source/text/swriter/01/04030000.xhp b/source/text/swriter/01/04030000.xhp
index bfd57a0..53cc805 100644
--- a/source/text/swriter/01/04030000.xhp
+++ b/source/text/swriter/01/04030000.xhp
@@ -39,9 +39,9 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertFootnoteDialog" id="bm_id1360835" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertFootnoteDialog" id="bm_id3148770" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertFootnote" id="bm_id4793576" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertFootnote" id="bm_id3148773" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertEndnote" id="bm_id5303788" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertfootnote/InsertFootnoteDialog" id="bm_id3148771" localize="false"/>
<paragraph role="heading" id="hd_id3145241" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/04030000.xhp" name="Insert Footnote">Footnote/Endnote</link></paragraph>
<paragraph role="paragraph" id="par_id3147167" xml-lang="en-US" l10n="U" oldref="2"><variable id="fussnoteein"><ahelp hid=".uno:InsertFootnote">Inserts a footnote or an endnote in the document. The anchor for the note is inserted at the current cursor position.</ahelp> You can choose between automatic numbering or a custom symbol.
</variable></paragraph>
@@ -54,29 +54,27 @@
</section>
<paragraph role="heading" id="hd_id3154106" xml-lang="en-US" level="2" l10n="U" oldref="7">Numbering</paragraph>
<paragraph role="paragraph" id="par_id3149812" xml-lang="en-US" l10n="U" oldref="16">Select the type of numbering that you want to use for footnotes and endnotes.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO" id="bm_id3154482" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertfootnote/automatic" id="bm_id3154482" localize="false"/>
<paragraph role="heading" id="hd_id3154470" xml-lang="en-US" level="3" l10n="U" oldref="8">Automatic</paragraph>
-<paragraph role="paragraph" id="par_id3153670" xml-lang="en-US" l10n="U" oldref="17"><variable id="bearbeitenautomatisch"><ahelp hid="SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO">Automatically assigns consecutive numbers to the footnotes or endnotes that you insert.</ahelp> To change the settings for automatic numbering, choose <link href="text/swriter/01/06080000.xhp" name="Tools - Footnotes"><emph>Tools - Footnotes/Endnotes</emph></link>.
+<paragraph role="paragraph" id="par_id3153670" xml-lang="en-US" l10n="U" oldref="17"><variable id="bearbeitenautomatisch"><ahelp hid="modules/swriter/ui/insertfootnote/automatic">Automatically assigns consecutive numbers to the footnotes or endnotes that you insert.</ahelp> To change the settings for automatic numbering, choose <link href="text/swriter/01/06080000.xhp" name="Tools - Footnotes"><emph>Tools - Footnotes/Endnotes</emph></link>.
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_CHAR" id="bm_id3152963" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:DLG_INS_FOOTNOTE:ED_NUMBER_CHAR" id="bm_id3152962" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertfootnote/character" id="bm_id3152963" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertfootnote/characterentry" id="bm_id3152962" localize="false"/>
<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="3" l10n="U" oldref="9">Character</paragraph>
-<paragraph role="paragraph" id="par_id3155901" xml-lang="en-US" l10n="U" oldref="18"><variable id="bearbeitenzeichen"><ahelp hid="SW:EDIT:DLG_INS_FOOTNOTE:ED_NUMBER_CHAR">Choose this option to define a character or symbol for the current footnote.</ahelp> This can be either a letter or number. To assign a special character, click the button at the bottom.
+<paragraph role="paragraph" id="par_id3155901" xml-lang="en-US" l10n="U" oldref="18"><variable id="bearbeitenzeichen"><ahelp hid="modules/swriter/ui/insertfootnote/characterentry">Choose this option to define a character or symbol for the current footnote.</ahelp> This can be either a letter or number. To assign a special character, click the button at the bottom.
</variable></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR" id="bm_id3153519" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertfootnote/choosecharacter" id="bm_id3153519" localize="false"/>
<paragraph role="heading" id="hd_id3155185" xml-lang="en-US" level="3" l10n="U" oldref="10">...</paragraph>
-<paragraph role="paragraph" id="par_id3153526" xml-lang="en-US" l10n="U" oldref="19"><variable id="bearbeitensonderzeichen"><ahelp hid="SW:PUSHBUTTON:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR">Inserts a <link href="text/shared/01/04100000.xhp" name="special character ">special character </link> as a footnote or endnote anchor.</ahelp>
+<paragraph role="paragraph" id="par_id3153526" xml-lang="en-US" l10n="U" oldref="19"><variable id="bearbeitensonderzeichen"><ahelp hid="modules/swriter/ui/insertfootnote/choosecharacter">Inserts a <link href="text/shared/01/04100000.xhp" name="special character ">special character </link> as a footnote or endnote anchor.</ahelp>
</variable></paragraph>
<paragraph role="heading" id="hd_id3149493" xml-lang="en-US" level="2" l10n="U" oldref="11">Type</paragraph>
<paragraph role="paragraph" id="par_id3151256" xml-lang="en-US" l10n="U" oldref="20">Select whether to insert a footnote or an endnote. Endnote numbering is separate from the footnote numbering.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_FTN" id="bm_id3148974" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertfootnote/footnote" id="bm_id3148974" localize="false"/>
<paragraph role="heading" id="hd_id3149104" xml-lang="en-US" level="3" l10n="U" oldref="12">Footnote</paragraph>
-<paragraph role="paragraph" id="par_id3148981" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_FTN">Inserts a footnote anchor at the current cursor position in the document, and adds a footnote to the bottom of the page.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertEndnote" id="bm_id5303788" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertEndnote" id="bm_id3149042" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE" id="bm_id3149046" localize="false"/>
+<paragraph role="paragraph" id="par_id3148981" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="modules/swriter/ui/insertfootnote/footnote">Inserts a footnote anchor at the current cursor position in the document, and adds a footnote to the bottom of the page.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertfootnote/endnote" id="bm_id3149046" localize="false"/>
<paragraph role="heading" id="hd_id3153644" xml-lang="en-US" level="3" l10n="U" oldref="13">Endnote</paragraph>
-<paragraph role="paragraph" id="par_id3152770" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE">Inserts an endnote anchor at the current cursor position in the document, and adds an endnote at the end of the document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3152770" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="modules/swriter/ui/insertfootnote/endnote">Inserts an endnote anchor at the current cursor position in the document, and adds an endnote at the end of the document.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3155135" xml-lang="en-US" l10n="U" oldref="25"><link href="text/swriter/guide/footnote_usage.xhp" name="Tips for working with footnotes">Tips for working with footnotes</link>.</paragraph>
</body>
commit df8db0c3a956f1992c913ac2fbc049b200482481
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 3 14:27:26 2012 +0000
update help ids for insert bookmark .ui conversion
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 113b217..a8327b2 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -9068,7 +9068,6 @@ 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_INSERT_BOOKMARK_CB_BOOKMARK,1428738049,
sw_ComboBox_DLG_MM_CUSTOMIZEADDRESSBLOCK_CB_FIELD,1435308087,
sw_ComboBox_DLG_SAVE_LABEL_CB_MAKE,1446645763,
sw_ComboBox_MD_EDIT_REGION_LB_SUBREG,1405833254,
@@ -9502,7 +9501,6 @@ sw_PushButton_DLG_FLD_DROPDOWN_PB_NEXT,1419645445,
sw_PushButton_DLG_FLD_INPUT_PB_NEXT,1419530760,
sw_PushButton_DLG_GLOSSARY_PB_BIB,1428640310,
sw_PushButton_DLG_GLOSSARY_PB_PATH,1428640312,
-sw_PushButton_DLG_INSERT_BOOKMARK_BT_DELETE,1428738582,
sw_PushButton_DLG_INSERT_CHART_BT_FINISH,2499121668,
sw_PushButton_DLG_INSERT_CHART_BT_NEXT,2499121667,
sw_PushButton_DLG_INSERT_CHART_BT_PREV,2499121673,
diff --git a/source/text/swriter/01/04040000.xhp b/source/text/swriter/01/04040000.xhp
index c93fe16..09f708d 100644
--- a/source/text/swriter/01/04040000.xhp
+++ b/source/text/swriter/01/04040000.xhp
@@ -43,7 +43,7 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id4974211"><bookmark_value>bookmarks;inserting</bookmark_value>
</bookmark><comment>UFI: added "bookmarks;inserting" index</comment>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertBookmark" id="bm_id7360340" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertBookmark" id="bm_id3147517" localize="false"/><paragraph role="heading" id="hd_id3147506" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Bookmark</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertbookmark/InsertBookmarkDialog" id="bm_id3147517" localize="false"/><paragraph role="heading" id="hd_id3147506" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Bookmark</paragraph>
<paragraph role="paragraph" id="par_id3149806" xml-lang="en-US" l10n="U" oldref="2"><variable id="textmarkeein"><ahelp hid=".uno:InsertBookmark">Inserts a bookmark at the cursor position. You can then use the Navigator to quickly jump to the marked location at a later time.</ahelp> In an HTML document, bookmarks are converted to anchors that you can jump to from a hyperlink.
</variable></paragraph>
<section id="howtoget">
@@ -52,10 +52,10 @@
<paragraph role="paragraph" id="par_id3153677" xml-lang="en-US" l10n="U" oldref="3">To jump to a specific bookmark, press F5 to open the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link>, click the plus sign (+) next to the<emph> Bookmark</emph> entry, and then double-click the bookmark.</paragraph>
<paragraph role="paragraph" id="par_id3151308" xml-lang="en-US" l10n="U" oldref="4"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>You can also right-click the <emph>Page Number</emph> field at the left end of the <emph>Status Bar</emph> at the bottom of the document window, and then choose the bookmark that you want to jump to.</defaultinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ComboBox:DLG_INSERT_BOOKMARK:CB_BOOKMARK" id="bm_id3154200" localize="false"/><paragraph role="heading" id="hd_id3154188" xml-lang="en-US" level="2" l10n="U" oldref="5">Bookmarks</paragraph>
-<paragraph role="paragraph" id="par_id3155178" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SW:COMBOBOX:DLG_INSERT_BOOKMARK:CB_BOOKMARK">Type the name of the bookmark that you want to create. The lower list contains all of the bookmarks in the current document. To delete a bookmark, select it in the list, and then click <emph>Delete</emph>.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertbookmark/bookmarks" id="bm_id3154200" localize="false"/><paragraph role="heading" id="hd_id3154188" xml-lang="en-US" level="2" l10n="U" oldref="5">Bookmarks</paragraph>
+<paragraph role="paragraph" id="par_id3155178" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="modules/swriter/ui/insertbookmark/bookmarks">Type the name of the bookmark that you want to create. The lower list contains all of the bookmarks in the current document. To delete a bookmark, select it in the list, and then click <emph>Delete</emph>.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="U" oldref="13">You cannot use the following characters in a bookmark name: / \ @ : * ? " ; , . #</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:DLG_INSERT_BOOKMARK:BT_DELETE" id="bm_id3149095" localize="false"/><paragraph role="heading" id="hd_id3149817" xml-lang="en-US" level="2" l10n="U" oldref="11">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3151251" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SW:PUSHBUTTON:DLG_INSERT_BOOKMARK:BT_DELETE">To delete a bookmark, select the bookmark from the <emph>Insert Bookmark</emph> dialog and click the <emph>Delete</emph> button. No confirmation dialog will follow.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/insertbookmark/delete" id="bm_id3149095" localize="false"/><paragraph role="heading" id="hd_id3149817" xml-lang="en-US" level="2" l10n="U" oldref="11">Delete</paragraph>
+<paragraph role="paragraph" id="par_id3151251" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="modules/swriter/ui/insertbookmark/delete">To delete a bookmark, select the bookmark from the <emph>Insert Bookmark</emph> dialog and click the <emph>Delete</emph> button. No confirmation dialog will follow.</ahelp></paragraph>
</body>
</helpdocument>
commit aaf84f8fd454fc4156b9ed3684863f4f80768a0f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 3 14:17:37 2012 +0000
update help ids for outline position page .ui conversion
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 79f6f21..113b217 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2676,7 +2676,6 @@ HID_NUM_FORMAT_BTN,53003,
HID_NUM_NAMES,52791,
HID_NUM_OUTL_NAMED_NUMS,53036,
HID_NUM_OUTL_NUM_SAVEAS,53037,
-HID_NUM_POSITION,53213,
HID_NUM_RESET,54852,
HID_NUM_TOOLBOX,54836,
HID_OFACTL_AUTOCORR_REPLACE,35032,
@@ -8991,7 +8990,6 @@ sw_CheckBox_TP_LINENUMBERING_CB_NUMBERING_ON,878887937,
sw_CheckBox_TP_LINENUMBERING_CB_RESTART_PAGE,878887959,
sw_CheckBox_TP_MAILCONFIG_CB_REPLYTO,879363078,
sw_CheckBox_TP_MAILCONFIG_CB_SECURE,879363086,
-sw_CheckBox_TP_NUM_POSITION_CB_RELATIVE,878838790,
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,
@@ -9325,9 +9323,6 @@ sw_ListBox_TP_LINENUMBERING_LB_FORMAT,878890501,
sw_ListBox_TP_LINENUMBERING_LB_POS,878890503,
sw_ListBox_TP_NUMPARA_LB_NUMBER_STYLE,878857729,
sw_ListBox_TP_NUMPARA_LB_OUTLINE_LEVEL,878857741,
-sw_ListBox_TP_NUM_POSITION_LB_ALIGN,878841356,
-sw_ListBox_TP_NUM_POSITION_LB_ALIGN_2,878841366,
-sw_ListBox_TP_NUM_POSITION_LB_LABEL_FOLLOWED_BY,878841362,
sw_ListBox_TP_OPTCAPTION_PAGE_BOX_FORMAT,878939664,
sw_ListBox_TP_OPTCAPTION_PAGE_BOX_POS,878939668,
sw_ListBox_TP_OPTCAPTION_PAGE_LB_CHARSTYLE,878939676,
@@ -9426,12 +9421,6 @@ 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_NUM_POSITION_MF_ALIGNED_AT,878844440,
-sw_MetricField_TP_NUM_POSITION_MF_BORDERDIST,878844421,
-sw_MetricField_TP_NUM_POSITION_MF_INDENT,878844424,
-sw_MetricField_TP_NUM_POSITION_MF_INDENT_AT,878844442,
-sw_MetricField_TP_NUM_POSITION_MF_LISTTAB,878844436,
-sw_MetricField_TP_NUM_POSITION_MF_NUMDIST,878844426,
sw_MetricField_TP_OPTLOAD_PAGE_MF_TAB,878975510,
sw_MetricField_TP_OPTTABLE_PAGE_MF_COLINSERT,878582391,
sw_MetricField_TP_OPTTABLE_PAGE_MF_COLMOVE,878582386,
@@ -9465,7 +9454,6 @@ sw_MultiLineEdit_DLG_MM_TESTACCOUNTSETTINGS_ED_ERROR,1427130914,
sw_MultiLineEdit_TP_ENV_ENV_EDT_ADDR,909642242,
sw_MultiLineEdit_TP_ENV_ENV_EDT_SEND,909642251,
sw_MultiLineEdit_TP_LAB_LAB_EDT_WRITING,909691395,
-sw_MultiListBox_TP_NUM_POSITION_LB_LEVEL,878840834,
sw_NumericField_DLG_INSERT_ABSTRACT_NF_LEVEL,1404835845,
sw_NumericField_DLG_INSERT_ABSTRACT_NF_PARA,1404835843,
sw_NumericField_DLG_MAILMERGE_NF_FROM,1446615045,
@@ -9594,7 +9582,6 @@ sw_PushButton_TP_LAB_FMT_PB_SAVE,909709843,
sw_PushButton_TP_LAB_PRT_BTN_PRTSETUP,909726216,
sw_PushButton_TP_MAILCONFIG_PB_AUTHENTICATION,879366672,
sw_PushButton_TP_MAILCONFIG_PB_TEST,879366677,
-sw_PushButton_TP_NUM_POSITION_PB_STANDARD,878842381,
sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT,879350288,
sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_RESET,879350287,
sw_PushButton_TP_STD_FONT_PB_STANDARD,878432869,
diff --git a/source/text/shared/01/06050600.xhp b/source/text/shared/01/06050600.xhp
index 9845b18..7ef2676 100644
--- a/source/text/shared/01/06050600.xhp
+++ b/source/text/shared/01/06050600.xhp
@@ -39,7 +39,7 @@
</meta>
<body>
<section id="position_s">
-<paragraph role="heading" id="hd_id3150467" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050600.xhp" name="Position">Position</link></paragraph>
+<bookmark branch="hid/modules/swriter/ui/outlinepositionpage/OutlinePositionPage" xml-lang="en-US" id="bm_id3150280"/><paragraph role="heading" id="hd_id3150467" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06050600.xhp" name="Position">Position</link></paragraph>
<paragraph role="paragraph" id="par_id3158397" xml-lang="en-US" l10n="U" oldref="2">Sets the indent, spacing, and alignment options for the numbered or bulleted list.</paragraph>
</section><comment>do we have a how-to for numbering/bullets/outlines with/without styles? seems we really need one</comment>
<section id="howtoget">
@@ -47,9 +47,9 @@
</section>
<paragraph role="note" id="par_id5004119" xml-lang="en-US" l10n="NEW">The Position tab page looks different for documents using the new position and spacing attributes introduced with OpenOffice.org 3.0 (and used in all versions of LibreOffice), or documents using the old attributes from versions before 3.0. The new version of this tab page shows the controls "Numbering followed by", "Numbering alignment", "Aligned at", and "Indent at". The old version of this tab page that can be seen in an old numbered or bulleted list shows the controls "Indent", "Width of numbering", "Minimum space numbering <-> text", and "Numbering alignment".<comment>see http://specs.openoffice.org/writer/numbering/NewListLevelAttrs.odt</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:MultiListBox:RID_SVXPAGE_NUM_POSITION:LB_LEVEL" id="bm_id3149119" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:MultiListBox:TP_NUM_POSITION:LB_LEVEL" id="bm_id3153323" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinepositionpage/levellb" id="bm_id3153323" localize="false"/>
<paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="2" l10n="U" oldref="3">Level</paragraph>
-<paragraph role="paragraph" id="par_id3155755" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:MULTILISTBOX:TP_NUM_POSITION:LB_LEVEL">Select the level(s) that you want to modify.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155755" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="modules/swriter/ui/outlinepositionpage/levellb">Select the level(s) that you want to modify.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY" id="bm_id7650990" localize="false"/>
<paragraph role="heading" id="hd_id6561784" xml-lang="en-US" level="2" l10n="NEW">Numbering followed by</paragraph>
<paragraph role="paragraph" id="par_id423291" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the element that will follow the numbering: a tab stop, a space, or nothing.</ahelp></paragraph>
@@ -57,10 +57,10 @@
<paragraph role="heading" id="hd_id7809686" xml-lang="en-US" level="3" l10n="NEW">at</paragraph>
<paragraph role="paragraph" id="par_id8177434" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If you select a tab stop to follow the numbering, you can enter a non-negative value as the tab stop position.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN" id="bm_id3151246" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_NUM_POSITION:LB_ALIGN" id="bm_id3151245" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinepositionpage/numalignlb" id="bm_id3151245" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2" id="bm_id5262611" localize="false"/>
<paragraph role="heading" id="hd_id3155583" xml-lang="en-US" level="2" l10n="U" oldref="5">Numbering alignment</paragraph>
-<paragraph role="paragraph" id="par_id3153063" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="SW:LISTBOX:TP_NUM_POSITION:LB_ALIGN">Set the alignment of the numbering symbols. Select "Left" to align the numbering symbol to start directly at the "Aligned at" position. Select "Right" to align the symbol to end directly before the "Aligned at" position. Select "Centered" to center the symbol around the "Aligned at" position.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153063" xml-lang="en-US" l10n="CHG" oldref="15"><ahelp hid="modules/swriter/ui/outlinepositionpage/numalignlb">Set the alignment of the numbering symbols. Select "Left" to align the numbering symbol to start directly at the "Aligned at" position. Select "Right" to align the symbol to end directly before the "Aligned at" position. Select "Centered" to center the symbol around the "Aligned at" position.</ahelp></paragraph>
<paragraph role="note" id="par_id3147422" xml-lang="en-US" l10n="U" oldref="22">The <emph>Numbering alignment</emph> option does not set the alignment of the paragraph.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT" id="bm_id8847621" localize="false"/>
<paragraph role="heading" id="hd_id1619617" xml-lang="en-US" level="2" l10n="NEW">Aligned at</paragraph>
@@ -69,28 +69,28 @@
<paragraph role="heading" id="hd_id2336191" xml-lang="en-US" level="2" l10n="NEW">Indent at</paragraph>
<paragraph role="paragraph" id="par_id6081728" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enter the distance from the left page margin to the start of all lines in the numbered paragraph that follow the first line.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_BORDERDIST" id="bm_id3153032" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_NUM_POSITION:MF_BORDERDIST" id="bm_id3155830" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_NUM_POSITION:MF_INDENT" id="bm_id1336405" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinepositionpage/numdistmf" id="bm_id3155830" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinepositionpage/indentmf" id="bm_id1336405" localize="false"/>
<paragraph role="heading" id="hd_id3154422" xml-lang="en-US" level="2" l10n="U" oldref="9">Indent</paragraph>
-<paragraph role="paragraph" id="par_id3144438" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SW:METRICFIELD:TP_NUM_POSITION:MF_BORDERDIST">Enter the amount of space to leave between the left page margin (or the left edge of the text object) and the left edge of the numbering symbol. If the current paragraph style uses an indent, the amount you enter here is added to the indent.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3144438" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="modules/swriter/ui/outlinepositionpage/numdistmf">Enter the amount of space to leave between the left page margin (or the left edge of the text object) and the left edge of the numbering symbol. If the current paragraph style uses an indent, the amount you enter here is added to the indent.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE" id="bm_id3149166" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_NUM_POSITION:CB_RELATIVE" id="bm_id3149164" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinepositionpage/relative" id="bm_id3149164" localize="false"/>
<paragraph role="heading" id="hd_id3155179" xml-lang="en-US" level="3" l10n="U" oldref="7">Relative</paragraph>
-<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SW:CHECKBOX:TP_NUM_POSITION:CB_RELATIVE">Indents the current level relative to the previous level in the list hierarchy.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3146137" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="modules/swriter/ui/outlinepositionpage/relative">Indents the current level relative to the previous level in the list hierarchy.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT" id="bm_id3153349" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_NUM_POSITION:MF_INDENT" id="bm_id3153348" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinepositionpage/indentatmf" id="bm_id3153348" localize="false"/>
<paragraph role="heading" id="hd_id3150245" xml-lang="en-US" level="2" l10n="CHG" oldref="28">Width of numbering<comment>i85347</comment></paragraph>
-<paragraph role="paragraph" id="par_id3150129" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="SW:METRICFIELD:TP_NUM_POSITION:MF_INDENT">Enter the amount of space to leave between the left edge of the numbering symbol and the left edge of the text.</ahelp><comment>UFI: fixed #i31282#</comment></paragraph>
+<paragraph role="paragraph" id="par_id3150129" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="modules/swriter/ui/outlinepositionpage/indentatmf">Enter the amount of space to leave between the left edge of the numbering symbol and the left edge of the text.</ahelp><comment>UFI: fixed #i31282#</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST" id="bm_id3149237" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_NUM_POSITION:MF_NUMDIST" id="bm_id3149235" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinepositionpage/numdistmf" id="bm_id3149235" localize="false"/>
<paragraph role="heading" id="hd_id3156194" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="WRITER">Minimum space numbering <-> text
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3147574" xml-lang="en-US" l10n="CHG" oldref="18"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SW:METRICFIELD:TP_NUM_POSITION:MF_NUMDIST">Enter the minimum amount of space to leave between the right edge of the numbering symbol and the left edge of the text.</ahelp>
+<paragraph role="paragraph" id="par_id3147574" xml-lang="en-US" l10n="CHG" oldref="18"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="modules/swriter/ui/outlinepositionpage/numdistmf">Enter the minimum amount of space to leave between the right edge of the numbering symbol and the left edge of the text.</ahelp>
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_NUM_POSITION:PB_STANDARD" id="bm_id3154138" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sw:PushButton:TP_NUM_POSITION:PB_STANDARD" id="bm_id3151211" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinepositionpage/standard" id="bm_id3151211" localize="false"/>
<paragraph role="heading" id="hd_id3154367" xml-lang="en-US" level="2" l10n="U" oldref="10">Default</paragraph>
-<paragraph role="paragraph" id="par_id3156082" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SW:PUSHBUTTON:TP_NUM_POSITION:PB_STANDARD">Resets the indent and the spacing values to the default values.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156082" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="modules/swriter/ui/outlinepositionpage/standard">Resets the indent and the spacing values to the default values.</ahelp></paragraph>
<embed href="text/shared/00/00000001.xhp#vorschau"/>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="C"><link href="text/shared/01/05030700.xhp" name="Paragraph alignment">Paragraph alignment</link></paragraph>
commit 63e82ba01f9c16d70cf1596f9ac5bfc1125b70a4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 3 14:06:03 2012 +0000
update help ids for outline numbering page .ui conversion
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ac4a167..79f6f21 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -4060,7 +4060,6 @@ HID_TP_BUSINESS_DATA,53248,
HID_TP_COMMONPRINTOPTIONS,33343,
HID_TP_CUSTOMPROPERTIES,33392,
HID_TP_MAILCONFIG,54978,
-HID_TP_OUTLINE_NUM,53227,
HID_TP_PRIVATE_DATA,53247,
HID_TP_TOX_ENTRY,53240,
HID_TP_TOX_SELECT,53239,
@@ -9171,8 +9170,6 @@ sw_Edit_TP_MAILCONFIG_ED_SERVER,879364107,
sw_Edit_TP_OPTCAPTION_PAGE_EDT_TEXT,878938130,
sw_Edit_TP_OPTCAPTION_PAGE_ED_NUM_SEP,878938147,
sw_Edit_TP_OPTCAPTION_PAGE_ED_SEPARATOR,878938137,
-sw_Edit_TP_OUTLINE_NUM_ED_PREFIX,878905481,
-sw_Edit_TP_OUTLINE_NUM_ED_SUFFIX,878905479,
sw_Edit_TP_PRIVATE_DATA_ED_CITY,879216679,
sw_Edit_TP_PRIVATE_DATA_ED_COUNTRY,879216681,
sw_Edit_TP_PRIVATE_DATA_ED_FAX,879216689,
@@ -9339,10 +9336,6 @@ 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_OUTLINE_NUM_LB_CHARFMT,878907021,
-sw_ListBox_TP_OUTLINE_NUM_LB_COLL,878906901,
-sw_ListBox_TP_OUTLINE_NUM_LB_LEVEL,878907011,
-sw_ListBox_TP_OUTLINE_NUM_LB_NUMBER,878906903,
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,
@@ -9500,8 +9493,6 @@ sw_NumericField_TP_LINENUMBERING_NF_NUM_INVERVAL,878893067,
sw_NumericField_TP_MAILCONFIG_NF_PORT,879368205,
sw_NumericField_TP_NUMPARA_NF_NEW_START,878860294,
sw_NumericField_TP_NUMPARA_NF_RESTART_PARA,878860299,
-sw_NumericField_TP_OUTLINE_NUM_ED_START,878909481,
-sw_NumericField_TP_OUTLINE_NUM_NF_ALL_LEVEL,878909549,
sw_NumericField_TP_SECTION_FTNENDNOTES_FLD_END_OFFSET,879253527,
sw_NumericField_TP_SECTION_FTNENDNOTES_FLD_FTN_OFFSET,879253528,
sw_NumericField_TP_TABLE_TEXTFLOW_NF_PAGENUM,878516363,
diff --git a/source/text/swriter/01/06060100.xhp b/source/text/swriter/01/06060100.xhp
index 9ed374e..6a4e68c 100644
--- a/source/text/swriter/01/06060100.xhp
+++ b/source/text/swriter/01/06060100.xhp
@@ -42,22 +42,22 @@
<body>
<section id="numerierung">
<paragraph role="heading" id="hd_id3151387" xml-lang="en-US" level="1" l10n="U" oldref="34"><link href="text/swriter/01/06060100.xhp" name="Numbering">Numbering</link></paragraph>
-<paragraph role="paragraph" id="par_id3155620" xml-lang="en-US" l10n="U" oldref="35">Specifies the number format and the hierarchy for chapter numbering in the current document.</paragraph>
+<bookmark branch="hid/modules/swriter/ui/outlinenumberingpage/OutlineNumberingPage" xml-lang="en-US" id="bm_id3150280"/><paragraph role="paragraph" id="par_id3155620" xml-lang="en-US" l10n="U" oldref="35">Specifies the number format and the hierarchy for chapter numbering in the current document.</paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000406.xhp#kapitelnumerierung1"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OUTLINE_NUM:LB_LEVEL" id="bm_id3154508" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/level" id="bm_id3154508" localize="false"/>
<paragraph role="heading" id="hd_id3153003" xml-lang="en-US" level="2" l10n="U" oldref="3">Level</paragraph>
-<paragraph role="paragraph" id="par_id3150018" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SW:LISTBOX:TP_OUTLINE_NUM:LB_LEVEL">Click the outline level that you want to modify, and then specify the numbering options for the level.</ahelp> To apply the numbering options, except for the paragraph style, to all of the levels, click "1-10".</paragraph>
+<paragraph role="paragraph" id="par_id3150018" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="modules/swriter/ui/outlinenumberingpage/leve">Click the outline level that you want to modify, and then specify the numbering options for the level.</ahelp> To apply the numbering options, except for the paragraph style, to all of the levels, click "1-10".</paragraph>
<paragraph role="heading" id="hd_id3145248" xml-lang="en-US" level="2" l10n="U" oldref="8">Numbering</paragraph>
<paragraph role="paragraph" id="par_id3150930" xml-lang="en-US" l10n="U" oldref="9">Specify the formatting for the select outline level.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OUTLINE_NUM:LB_COLL" id="bm_id3153716" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/style" id="bm_id3153716" localize="false"/>
<paragraph role="heading" id="hd_id3149030" xml-lang="en-US" level="3" l10n="U" oldref="10">Paragraph Style</paragraph>
-<paragraph role="paragraph" id="par_id3153722" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SW:LISTBOX:TP_OUTLINE_NUM:LB_COLL">Select the paragraph style that you want to assign to the selected outline level.</ahelp> If you click "None", the selected outline level is not defined.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OUTLINE_NUM:LB_NUMBER" id="bm_id3150766" localize="false"/>
+<paragraph role="paragraph" id="par_id3153722" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="modules/swriter/ui/outlinenumberingpage/style">Select the paragraph style that you want to assign to the selected outline level.</ahelp> If you click "None", the selected outline level is not defined.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/numbering" id="bm_id3150766" localize="false"/>
<paragraph role="heading" id="hd_id3151272" xml-lang="en-US" level="3" l10n="U" oldref="12">Number</paragraph>
-<paragraph role="paragraph" id="par_id3156319" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SW:LISTBOX:TP_OUTLINE_NUM:LB_NUMBER">Select the numbering style that you want to apply to the selected outline level.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156319" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="modules/swriter/ui/outlinenumberingpage/numbering">Select the numbering style that you want to apply to the selected outline level.</ahelp></paragraph>
<table id="tbl_id3154642">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -137,20 +137,20 @@
</tablerow>
</table>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OUTLINE_NUM:LB_CHARFMT" id="bm_id3147218" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/charstyle" id="bm_id3147218" localize="false"/>
<paragraph role="heading" id="hd_id3147098" xml-lang="en-US" level="3" l10n="U" oldref="40">Character Style</paragraph>
-<paragraph role="paragraph" id="par_id3147224" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SW:LISTBOX:TP_OUTLINE_NUM:LB_CHARFMT">Select the format of the numbering character.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_OUTLINE_NUM:NF_ALL_LEVEL" id="bm_id3149042" localize="false"/>
+<paragraph role="paragraph" id="par_id3147224" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="modules/swriter/ui/outlinenumberingpage/charstyle">Select the format of the numbering character.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/sublevelsnf" id="bm_id3149042" localize="false"/>
<paragraph role="heading" id="hd_id3153643" xml-lang="en-US" level="3" l10n="U" oldref="28">Show sublevels</paragraph>
-<paragraph role="paragraph" id="par_id3147575" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SW:NUMERICFIELD:TP_OUTLINE_NUM:NF_ALL_LEVEL">Select the number of outline levels to include in the chapter numbering. For example, select "3" to display three levels of chapter numbering: 1.1.1</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_OUTLINE_NUM:ED_PREFIX" id="bm_id3155136" localize="false"/>
+<paragraph role="paragraph" id="par_id3147575" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="modules/swriter/ui/outlinenumberingpage/sublevelsnf">Select the number of outline levels to include in the chapter numbering. For example, select "3" to display three levels of chapter numbering: 1.1.1</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="modules/swriter/ui/outlinenumberingpage/prefix" id="bm_id3155136" localize="false"/>
<paragraph role="heading" id="hd_id3152772" xml-lang="en-US" level="3" l10n="U" oldref="30">Separator Before</paragraph>
-<paragraph role="paragraph" id="par_id3155142" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:EDIT:TP_OUTLINE_NUM:ED_PREFIX">Enter the text that you want to display before the chapter number.</ahelp> For example, type "Chapter " to display "Chapter 1".</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:Edit:TP_OUTLINE_NUM:ED_SUFFIX" id="bm_id3153352" localize="false"/>
+<paragraph role="paragraph" id="par_id3155142" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="modules/swriter/ui/outlinenumberingpage/prefix">Enter the text that you want to display before the chapter number.</ahelp> For example, type "Chapter " to display "Chapter 1".</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/suffix" id="bm_id3153352" localize="false"/>
<paragraph role="heading" id="hd_id3154386" xml-lang="en-US" level="3" l10n="U" oldref="32">Separator After</paragraph>
-<paragraph role="paragraph" id="par_id3153358" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SW:EDIT:TP_OUTLINE_NUM:ED_SUFFIX">Enter the text that you want to display after the chapter number.</ahelp> For example, type a period (.) to display "1."</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:NumericField:TP_OUTLINE_NUM:ED_START" id="bm_id3149175" localize="false"/>
+<paragraph role="paragraph" id="par_id3153358" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="modules/swriter/ui/outlinenumberingpage/suffix">Enter the text that you want to display after the chapter number.</ahelp> For example, type a period (.) to display "1."</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/outlinenumberingpage/startat" id="bm_id3149175" localize="false"/>
<paragraph role="heading" id="hd_id3150590" xml-lang="en-US" level="3" l10n="U" oldref="6">Start at</paragraph>
-<paragraph role="paragraph" id="par_id3151023" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="SW:NUMERICFIELD:TP_OUTLINE_NUM:ED_START">Enter the number that you want to restart the chapter numbering at.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151023" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="modules/swriter/ui/outlinenumberingpage/startat">Enter the number that you want to restart the chapter numbering at.</ahelp></paragraph>
</body>
</helpdocument>
More information about the Libreoffice-commits
mailing list