1 files changed, 25 insertions, 25 deletions
diff --git a/helpcontent2/source/text/shared/02/01170000.xhp b/helpcontent2/source/text/shared/02/01170000.xhp
index acf1e16f78..a11fd21111 100644
--- a/helpcontent2/source/text/shared/02/01170000.xhp
+++ b/helpcontent2/source/text/shared/02/01170000.xhp
@@ -58,7 +58,7 @@
 <bookmark_value>selecting;controls</bookmark_value>
 <bookmark_value>controls; select mode</bookmark_value>
 </bookmark><comment>MW deleted "option field creation", changed "option button" to "push button" and "selections;" to "selecting;"</comment>
-<bookmark xml-lang="en-US" branch="hid/SID_FM_CONFIG" id="bm_id4029443" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Config" id="bm_id4029443" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Config" id="bm_id3153252" localize="false"/>
 <paragraph role="heading" id="hd_id3154142" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/02/01170000.xhp" name="Form Controls">Form Controls</link></paragraph>
 <paragraph role="paragraph" id="par_id3151378" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="formulartext"><ahelp hid=".uno:Config">The Form Controls toolbar contains tools that you need to create an interactive form.</ahelp>
@@ -130,7 +130,7 @@
 <embed href="text/shared/00/00040501.xhp#syformulareigenschaften"/>
 </section>
 <section id="Section19">
-<bookmark xml-lang="en-US" branch="hid/SID_INSERT_CHECKBOX" id="bm_id8176164" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Checkbox" id="bm_id8176164" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:CheckBox" id="bm_id3150751" localize="false"/>
 <paragraph role="heading" id="hd_id3146914" xml-lang="en-US" level="2" l10n="U" oldref="10">Check Box<comment>controls bar</comment></paragraph>
 <table id="">
@@ -146,7 +146,7 @@
 </table>
 </section>
 <section id="Section16">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_EDIT" id="bm_id7355178" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Edit" id="bm_id7355178" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Edit" id="bm_id3153785" localize="false"/>
 <paragraph role="heading" id="hd_id3153794" xml-lang="en-US" level="2" l10n="U" oldref="16">Text Box<comment>controls bar</comment></paragraph>
 <table id="">
@@ -162,7 +162,7 @@
 </table>
 </section>
 <section id="Section7">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_FORMATTEDFIELD" id="bm_id6606960" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormattedField" id="bm_id6606960" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FormattedField" id="bm_id3155526" localize="false"/>
 <paragraph role="heading" id="hd_id3151218" xml-lang="en-US" level="2" l10n="U" oldref="124">Formatted Field<comment>controls bar</comment></paragraph>
 <table id="">
@@ -181,7 +181,7 @@
 <paragraph role="paragraph" id="par_id3155346" xml-lang="en-US" l10n="U" oldref="126">A formatted field has <link href="text/shared/02/01170002.xhp" name="special control properties">special control properties</link> (choose <emph>Format - Control</emph>).</paragraph>
 </section>
 <section id="Section21">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_PUSHBUTTON" id="bm_id6486131" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Pushbutton" id="bm_id6486131" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Pushbutton" id="bm_id3153878" localize="false"/>
 <paragraph role="heading" id="hd_id3148774" xml-lang="en-US" level="2" l10n="U" oldref="6">Push Button<comment>controls bar</comment></paragraph>
 <table id="tbl_id3154501">
@@ -200,7 +200,7 @@
 
 </section>
 <section id="Section20">
-<bookmark xml-lang="en-US" branch="hid/SID_INSERT_RADIOBUTTON" id="bm_id3862451" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Radiobutton" id="bm_id3862451" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:RadioButton" id="bm_id3153418" localize="false"/>
 <paragraph role="heading" id="hd_id3157844" xml-lang="en-US" level="2" l10n="U" oldref="8">Option Button<comment>controls bar</comment></paragraph>
 <table id="tbl_id3151318">
@@ -219,7 +219,7 @@
 
 </section>
 <section id="Section15">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_LISTBOX" id="bm_id7238352" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ListBox" id="bm_id7238352" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ListBox" id="bm_id3154475" localize="false"/>
 <paragraph role="heading" id="hd_id3156064" xml-lang="en-US" level="2" l10n="U" oldref="18">List Box<comment>controls bar</comment></paragraph>
 <table id="">
@@ -237,7 +237,7 @@
 
 </section>
 <section id="Section14">
-<bookmark xml-lang="en-US" branch="hid/SID_INSERT_COMBOBOX" id="bm_id5504530" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Combobox" id="bm_id5504530" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ComboBox" id="bm_id3156169" localize="false"/>
 <paragraph role="heading" id="hd_id3147171" xml-lang="en-US" level="2" l10n="U" oldref="20">Combo Box<comment>controls bar</comment></paragraph>
 <table id="">
@@ -255,7 +255,7 @@
 
 </section>
 <section id="Section18">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_FIXEDTEXT" id="bm_id7047484" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Label" id="bm_id7047484" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Label" id="bm_id3154255" localize="false"/>
 <paragraph role="heading" id="hd_id3145618" xml-lang="en-US" level="2" l10n="U" oldref="12">Label Field<comment>controls bar</comment></paragraph>
 <table id="tbl_id3156712">
@@ -272,11 +272,11 @@
 </table>
 
 </section>
-<bookmark xml-lang="en-US" branch="hid/SID_FM_MORE_CONTROLS" id="bm_id1433643" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:MoreControls" id="bm_id1433643" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:MoreControls" id="bm_id4851832" localize="false"/>
 <paragraph role="heading" id="par_idN10CC6" xml-lang="en-US" level="2" l10n="NEW">More Controls<comment>Controls bar</comment></paragraph>
 <paragraph role="paragraph" id="par_idN10CDC" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the <link href="text/shared/02/more_controls.xhp"><emph>More Controls</emph></link> toolbar.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_FM_FORM_DESIGN_TOOLS" id="bm_id6078501" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:FormDesignTools" id="bm_id6078501" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FormDesignTools" id="bm_id3258766" localize="false"/>
 <paragraph role="heading" id="par_idN10CF7" xml-lang="en-US" level="2" l10n="NEW">Form Design<comment>Controls bar</comment></paragraph>
 <paragraph role="paragraph" id="par_idN10D0D" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the <link href="text/shared/main0226.xhp"><emph>Form Design</emph></link> toolbar.</ahelp></paragraph>
@@ -302,7 +302,7 @@
 <case select="HIDE_HERE"><comment>now the MORE CONTROLS</comment>
 <section id="more_controls">
 <section id="Section22">
-<bookmark xml-lang="en-US" branch="hid/SID_INSERT_SPINBUTTON" id="bm_id8342120" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Spinbutton" id="bm_id8342120" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:SpinButton" id="bm_id5568102" localize="false"/>
 <paragraph role="heading" id="par_idN11A56" xml-lang="en-US" level="2" l10n="NEW">Spin Button<comment>more controls bar</comment></paragraph>
 <table id="">
@@ -321,7 +321,7 @@
 <paragraph role="paragraph" id="par_id710776" xml-lang="en-US" l10n="NEW">If you add a spin button to a Calc spreadsheet, you can use the Data tab page to create a two-way link between the spin button and a cell. As a result, when you change the contents of a cell, the contents of the spin button are updated. Conversely, if you change the value of the spin button, the contents of the cell are updated.<comment>UFI: see spec doc spinbutton_form_control.sxw</comment></paragraph>
 </section>
 <section id="Section23">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_SCROLLBAR" id="bm_id633802" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ScrollBar" id="bm_id633802" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ScrollBar" id="bm_id8119449" localize="false"/>
 <paragraph role="heading" id="par_idN11ABC" xml-lang="en-US" level="2" l10n="NEW">Scrollbar<comment>more controls bar</comment></paragraph>
 <table id="">
@@ -425,7 +425,7 @@
 <paragraph role="paragraph" id="par_idN11D63" xml-lang="en-US" l10n="NEW">In a Calc spreadsheet, you can use the Data tab page to create a two-way link between a scrollbar and a cell.<comment>UFI: see spec doc scrollbar_form_control.sxw</comment></paragraph>
 </section>
 <section id="Section13">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_IMAGEBUTTON" id="bm_id2102401" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Imagebutton" id="bm_id2102401" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Imagebutton" id="bm_id3151373" localize="false"/>
 <paragraph role="heading" id="hd_id3153316" xml-lang="en-US" level="2" l10n="U" oldref="22">Image Button<comment>more controls bar</comment></paragraph>
 <table id="">
@@ -443,7 +443,7 @@
 
 </section>
 <section id="Section12">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_IMAGECONTROL" id="bm_id7383386" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ImageControl" id="bm_id7383386" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ImageControl" id="bm_id3150947" localize="false"/>
 <paragraph role="heading" id="hd_id3159171" xml-lang="en-US" level="2" l10n="U" oldref="49">Image Control<comment>more controls bar</comment></paragraph>
 <table id="">
@@ -462,7 +462,7 @@
 
 </section>
 <section id="Section10">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_DATEFIELD" id="bm_id4810502" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DateField" id="bm_id4810502" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:DateField" id="bm_id3145656" localize="false"/>
 <paragraph role="heading" id="hd_id3156040" xml-lang="en-US" level="2" l10n="U" oldref="29">Date Field<comment>more controls bar</comment></paragraph>
 <table id="">
@@ -483,7 +483,7 @@
 <paragraph role="paragraph" id="par_id3153112" xml-lang="en-US" l10n="U" oldref="132"><link href="text/shared/02/01170003.xhp" name="Specific Remarks on Date Fields">Specific Remarks on Date Fields</link>.</paragraph>
 </section>
 <section id="Section9">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_TIMEFIELD" id="bm_id4739584" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:TimeField" id="bm_id4739584" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:TimeField" id="bm_id3154541" localize="false"/>
 <paragraph role="heading" id="hd_id3152369" xml-lang="en-US" level="2" l10n="U" oldref="31">Time Field<comment>more controls bar</comment></paragraph>
 <table id="">
@@ -502,7 +502,7 @@
 <paragraph role="tip" id="par_id3154764" xml-lang="en-US" l10n="U" oldref="64">Time fields can be easily edited by the user with the up and down arrow keys. Depending on the cursor position, the hours, minutes, or the seconds are increased or decreased using the arrow keys.</paragraph>
 </section>
 <section id="Section11">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_FILECONTROL" id="bm_id1460134" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:FileControl" id="bm_id1460134" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:FileControl" id="bm_id3154859" localize="false"/>
 <paragraph role="heading" id="hd_id3156186" xml-lang="en-US" level="2" l10n="U" oldref="27">File Selection<comment>more controls bar</comment></paragraph>
 <table id="">
@@ -520,7 +520,7 @@
 
 </section>
 <section id="Section8">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_NUMERICFIELD" id="bm_id3301501" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:NumericField" id="bm_id3301501" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:NumericField" id="bm_id3154211" localize="false"/>
 <paragraph role="heading" id="hd_id3154652" xml-lang="en-US" level="2" l10n="U" oldref="33">Numerical Field<comment>more controls bar</comment></paragraph>
 <table id="">
@@ -538,7 +538,7 @@
 
 </section>
 <section id="Section6">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_CURRENCYFIELD" id="bm_id9766539" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:CurrencyField" id="bm_id9766539" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:CurrencyField" id="bm_id3151327" localize="false"/>
 <paragraph role="heading" id="hd_id3153612" xml-lang="en-US" level="2" l10n="U" oldref="35">Currency Field<comment>more controls bar</comment></paragraph>
 <table id="">
@@ -556,7 +556,7 @@
 
 </section>
 <section id="Section5">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_PATTERNFIELD" id="bm_id1317017" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:PatternField" id="bm_id1317017" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:PatternField" id="bm_id3155746" localize="false"/>
 <paragraph role="heading" id="hd_id3148825" xml-lang="en-US" level="2" l10n="U" oldref="37">Pattern Field<comment>more controls bar</comment></paragraph>
 <table id="">
@@ -575,7 +575,7 @@
 <paragraph role="note" id="par_id3152947" xml-lang="en-US" l10n="U" oldref="67">Please note that pattern fields are not exported into HTML format.</paragraph>
 </section>
 <section id="Section17">
-<bookmark xml-lang="en-US" branch="hid/SID_INSERT_GROUPBOX" id="bm_id3430892" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Groupbox" id="bm_id3430892" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:GroupBox" id="bm_id3147364" localize="false"/>
 <paragraph role="heading" id="hd_id3145147" xml-lang="en-US" level="2" l10n="U" oldref="14">Group Box<comment>more controls bar</comment></paragraph>
 <table id="tbl_id3154020">
@@ -598,7 +598,7 @@
 <paragraph role="note" id="par_id3145615" xml-lang="en-US" l10n="U" oldref="66">Group boxes are used only for a visual effect. A functional grouping of option fields can be made through the name definition: under the <link href="text/shared/02/01170101.xhp" name="Name"><emph>Name</emph></link> properties of all option fields, enter the same name in order to group them.</paragraph>
 </section>
 <section id="Section4">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_DBGRID" id="bm_id74623" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Grid" id="bm_id74623" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Grid" id="bm_id3147372" localize="false"/>
 <paragraph role="heading" id="hd_id3157996" xml-lang="en-US" level="2" l10n="U" oldref="39">Table Control<comment>more controls bar</comment></paragraph>
 <table id="tbl_id3153023">
@@ -617,7 +617,7 @@
 <paragraph role="paragraph" id="par_id3154697" xml-lang="en-US" l10n="U" oldref="133"><link href="text/shared/02/01170004.xhp" name="Special Information about Table Controls">Special information about Table Controls</link>.</paragraph>
 </section>
 <section id="Section24">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_NAVIGATIONBAR" id="bm_id8951689" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:NavigationBar" id="bm_id8951689" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:NavigationBar" id="bm_id9112521" localize="false"/>
 <paragraph role="heading" id="par_idN11B1E" xml-lang="en-US" level="2" l10n="NEW">Navigation bar<comment>more controls bar</comment></paragraph>
 <table id="">
@@ -641,7 +641,7 @@
 <switch select="sys">
 <case select="HIDE_HERE"><comment>now the Form Design bar</comment>
 <section id="Section1">
-<bookmark xml-lang="en-US" branch="hid/SID_FM_AUTOCONTROLFOCUS" id="bm_id8170669" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:AutoControlFocus" id="bm_id8170669" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoControlFocus" id="bm_id3149198" localize="false"/>
 <paragraph role="heading" id="hd_id3146815" xml-lang="en-US" level="2" l10n="U" oldref="136">Automatic Control Focus<comment>design bar</comment></paragraph>
 <table id="tbl_id3154633">