update help ids for sort options page

2 files changed, 28 insertions, 41 deletions

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2dc157ee38..2ca3e8dfd3 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 eb4ea30812..aec3e165f3 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>