update help ids for general options page

Change-Id: Id10148434581f1b9398c8d46b2d32ac134688243

2 files changed, 13 insertions, 22 deletions

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a07074c026..dd9013e5f2 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2671,7 +2671,6 @@ HID_OFA_HYPERLINK_TARGET,35053,
 HID_OFA_HYPERLINK_URL,35081,
 HID_OFA_TP_LANGUAGES,35147,
 HID_OFA_TP_MEMORY,35152,
-HID_OFA_TP_MISC,35036,
 HID_OFA_TP_VIEW,35057,
 HID_OLE_CHECKLB,53245,
 HID_OLE_TOOLBOX,54831,
@@ -7499,12 +7498,6 @@ svx_CheckBox_OFA_TP_LANGUAGES_CB_CTLSUPPORT,810566671,
 svx_CheckBox_OFA_TP_LANGUAGES_CB_CURRENT_DOC,810566667,
 svx_CheckBox_OFA_TP_LANGUAGES_CB_DECIMALSEPARATOR,810566684,
 svx_CheckBox_OFA_TP_MEMORY_CB_QUICKLAUNCH,811303963,
-svx_CheckBox_OFA_TP_MISC_CB_DOCSTATUS,810484797,
-svx_CheckBox_OFA_TP_MISC_CB_EXTHELP,810484748,
-svx_CheckBox_OFA_TP_MISC_CB_FILEDLG,810484791,
-svx_CheckBox_OFA_TP_MISC_CB_HELPAGENT,810484749,
-svx_CheckBox_OFA_TP_MISC_CB_PRINTDLG,810484781,
-svx_CheckBox_OFA_TP_MISC_CB_TOOLTIP,810484747,
 svx_CheckBox_OFA_TP_VIEW_CB_FONTANTIALIASING,810517567,
 svx_CheckBox_OFA_TP_VIEW_CB_FONT_HISTORY,810517566,
 svx_CheckBox_OFA_TP_VIEW_CB_FONT_SHOW,810517564,
@@ -7874,7 +7867,6 @@ svx_ListBox_OFA_TP_LANGUAGES_LB_CURRENCY,810569235,
 svx_ListBox_OFA_TP_LANGUAGES_LB_LOCALESETTING,810569233,
 svx_ListBox_OFA_TP_LANGUAGES_LB_USERINTERFACE,810569247,
 svx_ListBox_OFA_TP_LANGUAGES_LB_WEST_LANG,810569222,
-svx_ListBox_OFA_TP_MISC_LB_HELPFORMAT,810487312,
 svx_ListBox_OFA_TP_VIEW_LB_ICONSIZE,810520118,
 svx_ListBox_OFA_TP_VIEW_LB_ICONSTYLE,810520120,
 svx_ListBox_OFA_TP_VIEW_LB_MENU_ICONS,810520105,
@@ -8193,7 +8185,6 @@ svx_NumericField_OFA_TP_MEMORY_ED_UNDO,811309068,
 svx_NumericField_OFA_TP_MEMORY_NF_GRAPHICCACHE,811309074,
 svx_NumericField_OFA_TP_MEMORY_NF_GRAPHICOBJECTCACHE,811309076,
 svx_NumericField_OFA_TP_MEMORY_NF_OLECACHE,811309081,
-svx_NumericField_OFA_TP_MISC_NF_YEARVALUE,810489898,
 svx_NumericField_OFA_TP_VIEW_NF_AA_POINTLIMIT,810522688,
 svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MAX_ENTRIES,809162881,
 svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MIN_WORDLEN,809162880,
@@ -8243,7 +8234,6 @@ svx_PushButton_MD_UPDATE_BASELINKS_PB_BREAK_LINK,1598067238,
 svx_PushButton_MD_UPDATE_BASELINKS_PB_CHANGE_SOURCE,1598067237,
 svx_PushButton_MD_UPDATE_BASELINKS_PB_OPEN_SOURCE,1598067236,
 svx_PushButton_MD_UPDATE_BASELINKS_PB_UPDATE_NOW,1598067235,
-svx_PushButton_OFA_TP_MISC_PB_HELPAGENT_RESET,810488334,
 svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_CREATE,1241813509,
 svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_DEL,1241813512,
 svx_PushButton_RID_DLG_SCRIPTORGANIZER_SF_PB_EDIT,1241813510,
diff --git a/source/text/shared/optionen/01010600.xhp b/source/text/shared/optionen/01010600.xhp
index 005e67c890..5b20613153 100644
--- a/source/text/shared/optionen/01010600.xhp
+++ b/source/text/shared/optionen/01010600.xhp
@@ -32,6 +32,7 @@
       <bookmark_value>years; 2-digit options</bookmark_value>
       <bookmark_value>Help Agent;options</bookmark_value>
 </bookmark>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/OptGeneralPage" id="bm_id3539840" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3155450" role="paragraph" l10n="E" oldref="42"
                  localize="false"/>
       <section id="allg">
@@ -44,27 +45,27 @@
       <paragraph xml-lang="en-US" id="hd_id3148664" role="heading" level="2" l10n="CHG"
                  oldref="25">Help</paragraph>
       <paragraph xml-lang="en-US" id="par_id3153525" role="paragraph" l10n="CHG" oldref="38">Specifies the behavior of the installed help.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP" id="bm_id3539841" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/tooltips" id="bm_id3539841" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN106DB" role="heading" level="3" l10n="NEW">Tips</paragraph>
       <paragraph xml-lang="en-US" id="par_idN106DF" role="paragraph" l10n="CHG"><ahelp hid=".">Displays the icon names and more bubble help information, for example, chapter names when you scroll through a document with chapters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_EXTHELP" id="bm_id1425519" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/exthelp" id="bm_id1425519" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN106F6" role="heading" level="3" l10n="NEW">Extended tips</paragraph>
       <paragraph xml-lang="en-US" id="par_idN106FA" role="paragraph" l10n="NEW"><ahelp hid=".">Displays a help text when you rest the cursor on an icon, a menu command, or a control on a dialog.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT" id="bm_id1998657" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/helpagent" id="bm_id1998657" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154138" role="heading" level="3" l10n="CHG"
                  oldref="26">Help Agent</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3145174" role="paragraph" l10n="CHG" oldref="27"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_HELPAGENT">Specifies that the Help Agent will be displayed automatically in selected situations. Click the Help Agent window to see a Help page with information about the current context.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET" id="bm_id7073885" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3145174" role="paragraph" l10n="CHG" oldref="27"><ahelp hid="cui/ui/optgeneralpage/helpagent">Specifies that the Help Agent will be displayed automatically in selected situations. Click the Help Agent window to see a Help page with information about the current context.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/resethelpagent" id="bm_id7073885" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="3" l10n="CHG"
                  oldref="30">Reset Help Agent</paragraph>
       <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="31">If you have not opened the Help Agent for a particular situation three times in succession, but rather have closed it or let it close automatically, the Help Agent for this situation is not shown again.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="32"><ahelp hid="OFFMGR_PUSHBUTTON_OFA_TP_MISC_PB_HELPAGENT_RESET">Click <emph>Reset Help Agent </emph>to restore the default list of situations for which the Help Agent is displayed.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="32"><ahelp hid="cui/ui/optgeneralpage/resethelpagent">Click <emph>Reset Help Agent </emph>to restore the default list of situations for which the Help Agent is displayed.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="hd_id3152577" role="heading" level="2" l10n="CHG"
                  oldref="34">Open/Save dialogs<comment>UFI: see spec doc "Gnome file selector"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_FILEDLG" id="bm_id7715994" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/filedlg" id="bm_id7715994" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3145366" role="heading" level="3" l10n="CHG"
                  oldref="35">Use $[officename] dialogs</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149260" role="paragraph" l10n="CHG" oldref="36"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_FILEDLG">Specifies whether $[officename] dialogs are used to open and save documents. Otherwise the dialogs of the operating system are used.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149260" role="paragraph" l10n="CHG" oldref="36"><ahelp hid="cui/ui/optgeneralpage/filedlg">Specifies whether $[officename] dialogs are used to open and save documents. Otherwise the dialogs of the operating system are used.</ahelp></paragraph>
 <switch select="sys">
 <case select="WIN">
 <paragraph xml-lang="en-US" id="par_idN10856" role="warning" l10n="NEW">When you open a file by an URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens the remote file.</paragraph>
@@ -73,15 +74,15 @@
 <paragraph xml-lang="en-US" id="par_id3153138" role="paragraph" l10n="CHG" oldref="37">The $[officename] dialogs for <link href="text/shared/01/01020000.xhp" name="opening">opening</link> and <link href="text/shared/01/01070000.xhp" name="saving">saving</link> documents are described in $[officename] Help. </paragraph>
       <paragraph xml-lang="en-US" id="hd_id3148617" role="heading" level="2" l10n="U"
                  oldref="39">Document status</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS" id="bm_id3986632" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/docstatus" id="bm_id3986632" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149299" role="heading" level="3" l10n="U"
                  oldref="40">Printing sets "document modified" status</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3145800" role="paragraph" l10n="U" oldref="41"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MISC_CB_DOCSTATUS">Specifies whether the printing of the document counts as a modification.</ahelp> When this option is marked, the very next time the document is closed you are asked if the changes should be saved. The print date is then entered in the document properties as a change.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145800" role="paragraph" l10n="U" oldref="41"><ahelp hid="cui/ui/optgeneralpage/docstatus">Specifies whether the printing of the document counts as a modification.</ahelp> When this option is marked, the very next time the document is closed you are asked if the changes should be saved. The print date is then entered in the document properties as a change.</paragraph>
 <paragraph xml-lang="en-US" id="hd_id3149399" role="heading" level="3">Allow to save document even when the document is not modified</paragraph>
 <paragraph xml-lang="en-US" id="par_id3145801" role="paragraph">Documents do not only store their content, but also their view properties. A change in the view properties does not trigger document modified status. View properties include things like (in case of a spreadsheet) active sheet, cursor position, zoom level etc. Quite often users want to store the view properties after they have been changed, and always enabling the save action allows this.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:NumericField:OFA_TP_MISC:NF_YEARVALUE" id="bm_id6075624" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optgeneralpage/year" id="bm_id6075624" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153561" role="heading" level="2" l10n="U" oldref="5">Year (two digits)</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3147530" role="paragraph" l10n="U" oldref="6"><ahelp hid="OFFMGR:NUMERICFIELD:OFA_TP_MISC:NF_YEARVALUE">Defines a date range, within which the system recognizes a two-digit year.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147530" role="paragraph" l10n="U" oldref="6"><ahelp hid="cui/ui/optgeneralpage/year">Defines a date range, within which the system recognizes a two-digit year.</ahelp></paragraph>
       <section id="jahreszahlen">
          <paragraph xml-lang="en-US" id="par_id3156343" role="paragraph" l10n="U" oldref="7">In $[officename], years are indicated by four digits, so that the difference between 1/1/99 and 1/1/01 is two years. This <emph>Year (two digits)</emph> setting allows the user to define the years in which two-digit dates are added to 2000. To illustrate, if you specify a date of 1/1/30 or later, the entry "1/1/20" is recognized as 1/1/2020 instead of 1/1/1920.</paragraph>
       </section>